dmlib: tools/libgfx.c annotate

annotate tools/libgfx.c @ 2100:81fb21dd3265

Add dmGetNPlanesFromNColors() and use it.

author	Matti Hamalainen <ccr@tnsp.org>
date	Tue, 05 Mar 2019 15:09:18 +0200
parents	e38705223ce4
children	da886b8cbb09

rev	line source
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1 /*
1308 8f71ca1900ea Update header blurps and copyrights. Matti Hamalainen <ccr@tnsp.org> parents: 1307 diff changeset	2 * Functions for reading and converting various graphics file formats
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	3 * Programmed and designed by Matti 'ccr' Hamalainen
1894 2e3f188c6bf0 Bump copyright year. Matti Hamalainen <ccr@tnsp.org> parents: 1892 diff changeset	4 * (C) Copyright 2012-2018 Tecnic Software productions (TNSP)
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	5 *
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	6 * Please read file 'COPYING' for information on license and distribution.
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	7 */
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	8 #include "libgfx.h"
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	9
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	10 #ifdef DM_USE_LIBPNG
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	11 #include <png.h>
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	12 #endif
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	13
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	14
1285 e4bda4909d72 Make libgfx error mode a global variable, at least for now. Matti Hamalainen <ccr@tnsp.org> parents: 1284 diff changeset	15 int dmGFXErrorMode = DM_ERRMODE_FAIL;
e4bda4909d72 Make libgfx error mode a global variable, at least for now. Matti Hamalainen <ccr@tnsp.org> parents: 1284 diff changeset	16
e4bda4909d72 Make libgfx error mode a global variable, at least for now. Matti Hamalainen <ccr@tnsp.org> parents: 1284 diff changeset	17
1309 5ad7d780a09b Move bitstream reading functions to libgfx, as they were only used there. Matti Hamalainen <ccr@tnsp.org> parents: 1308 diff changeset	18 void dmInitBitStreamContext(DMBitStreamContext *ctx)
5ad7d780a09b Move bitstream reading functions to libgfx, as they were only used there. Matti Hamalainen <ccr@tnsp.org> parents: 1308 diff changeset	19 {
5ad7d780a09b Move bitstream reading functions to libgfx, as they were only used there. Matti Hamalainen <ccr@tnsp.org> parents: 1308 diff changeset	20 ctx->outBuf = 0;
5ad7d780a09b Move bitstream reading functions to libgfx, as they were only used there. Matti Hamalainen <ccr@tnsp.org> parents: 1308 diff changeset	21 ctx->outByteCount = 0;
2086 aedadff9e116 Implement dmGetBits() to the DMBitStreamContext API. Also improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2085 diff changeset	22 ctx->outBitCount = 0;
aedadff9e116 Implement dmGetBits() to the DMBitStreamContext API. Also improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2085 diff changeset	23
aedadff9e116 Implement dmGetBits() to the DMBitStreamContext API. Also improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2085 diff changeset	24 ctx->inBuf = 0;
aedadff9e116 Implement dmGetBits() to the DMBitStreamContext API. Also improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2085 diff changeset	25 ctx->inByteCount = 0;
aedadff9e116 Implement dmGetBits() to the DMBitStreamContext API. Also improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2085 diff changeset	26 ctx->inBitCount = 0;
1309 5ad7d780a09b Move bitstream reading functions to libgfx, as they were only used there. Matti Hamalainen <ccr@tnsp.org> parents: 1308 diff changeset	27 }
5ad7d780a09b Move bitstream reading functions to libgfx, as they were only used there. Matti Hamalainen <ccr@tnsp.org> parents: 1308 diff changeset	28
5ad7d780a09b Move bitstream reading functions to libgfx, as they were only used there. Matti Hamalainen <ccr@tnsp.org> parents: 1308 diff changeset	29
2086 aedadff9e116 Implement dmGetBits() to the DMBitStreamContext API. Also improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2085 diff changeset	30 int dmPutBits(DMBitStreamContext *ctx, const unsigned int val, const unsigned int n)
1309 5ad7d780a09b Move bitstream reading functions to libgfx, as they were only used there. Matti Hamalainen <ccr@tnsp.org> parents: 1308 diff changeset	31 {
2086 aedadff9e116 Implement dmGetBits() to the DMBitStreamContext API. Also improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2085 diff changeset	32 for (unsigned int i = 0; i < n; i++)
1309 5ad7d780a09b Move bitstream reading functions to libgfx, as they were only used there. Matti Hamalainen <ccr@tnsp.org> parents: 1308 diff changeset	33 {
5ad7d780a09b Move bitstream reading functions to libgfx, as they were only used there. Matti Hamalainen <ccr@tnsp.org> parents: 1308 diff changeset	34 ctx->outBuf <<= 1;
5ad7d780a09b Move bitstream reading functions to libgfx, as they were only used there. Matti Hamalainen <ccr@tnsp.org> parents: 1308 diff changeset	35
2086 aedadff9e116 Implement dmGetBits() to the DMBitStreamContext API. Also improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2085 diff changeset	36 if (val & (1 << (n - 1 - i)))
aedadff9e116 Implement dmGetBits() to the DMBitStreamContext API. Also improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2085 diff changeset	37 ctx->outBuf \|= 1;
aedadff9e116 Implement dmGetBits() to the DMBitStreamContext API. Also improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2085 diff changeset	38
aedadff9e116 Implement dmGetBits() to the DMBitStreamContext API. Also improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2085 diff changeset	39 ctx->outBitCount++;
aedadff9e116 Implement dmGetBits() to the DMBitStreamContext API. Also improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2085 diff changeset	40 if (ctx->outBitCount == 8)
1309 5ad7d780a09b Move bitstream reading functions to libgfx, as they were only used there. Matti Hamalainen <ccr@tnsp.org> parents: 1308 diff changeset	41 {
2086 aedadff9e116 Implement dmGetBits() to the DMBitStreamContext API. Also improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2085 diff changeset	42 int ret;
aedadff9e116 Implement dmGetBits() to the DMBitStreamContext API. Also improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2085 diff changeset	43 if ((ret = ctx->putByte(ctx)) != DMERR_OK)
aedadff9e116 Implement dmGetBits() to the DMBitStreamContext API. Also improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2085 diff changeset	44 return ret;
aedadff9e116 Implement dmGetBits() to the DMBitStreamContext API. Also improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2085 diff changeset	45
aedadff9e116 Implement dmGetBits() to the DMBitStreamContext API. Also improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2085 diff changeset	46 ctx->outBitCount = 0;
1309 5ad7d780a09b Move bitstream reading functions to libgfx, as they were only used there. Matti Hamalainen <ccr@tnsp.org> parents: 1308 diff changeset	47 ctx->outByteCount++;
5ad7d780a09b Move bitstream reading functions to libgfx, as they were only used there. Matti Hamalainen <ccr@tnsp.org> parents: 1308 diff changeset	48 }
5ad7d780a09b Move bitstream reading functions to libgfx, as they were only used there. Matti Hamalainen <ccr@tnsp.org> parents: 1308 diff changeset	49 }
5ad7d780a09b Move bitstream reading functions to libgfx, as they were only used there. Matti Hamalainen <ccr@tnsp.org> parents: 1308 diff changeset	50
2086 aedadff9e116 Implement dmGetBits() to the DMBitStreamContext API. Also improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2085 diff changeset	51 return DMERR_OK;
aedadff9e116 Implement dmGetBits() to the DMBitStreamContext API. Also improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2085 diff changeset	52 }
aedadff9e116 Implement dmGetBits() to the DMBitStreamContext API. Also improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2085 diff changeset	53
aedadff9e116 Implement dmGetBits() to the DMBitStreamContext API. Also improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2085 diff changeset	54
aedadff9e116 Implement dmGetBits() to the DMBitStreamContext API. Also improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2085 diff changeset	55 int dmGetBits(DMBitStreamContext ctx, unsigned int val, const unsigned int n)
aedadff9e116 Implement dmGetBits() to the DMBitStreamContext API. Also improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2085 diff changeset	56 {
aedadff9e116 Implement dmGetBits() to the DMBitStreamContext API. Also improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2085 diff changeset	57 *val = 0;
aedadff9e116 Implement dmGetBits() to the DMBitStreamContext API. Also improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2085 diff changeset	58
aedadff9e116 Implement dmGetBits() to the DMBitStreamContext API. Also improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2085 diff changeset	59 for (unsigned int i = 0; i < n; i++)
aedadff9e116 Implement dmGetBits() to the DMBitStreamContext API. Also improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2085 diff changeset	60 {
aedadff9e116 Implement dmGetBits() to the DMBitStreamContext API. Also improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2085 diff changeset	61 if (ctx->inBitCount == 0)
aedadff9e116 Implement dmGetBits() to the DMBitStreamContext API. Also improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2085 diff changeset	62 {
aedadff9e116 Implement dmGetBits() to the DMBitStreamContext API. Also improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2085 diff changeset	63 int ret;
aedadff9e116 Implement dmGetBits() to the DMBitStreamContext API. Also improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2085 diff changeset	64 if ((ret = ctx->getByte(ctx)) != DMERR_OK)
aedadff9e116 Implement dmGetBits() to the DMBitStreamContext API. Also improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2085 diff changeset	65 return ret;
aedadff9e116 Implement dmGetBits() to the DMBitStreamContext API. Also improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2085 diff changeset	66
aedadff9e116 Implement dmGetBits() to the DMBitStreamContext API. Also improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2085 diff changeset	67 ctx->inBitCount = 8;
aedadff9e116 Implement dmGetBits() to the DMBitStreamContext API. Also improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2085 diff changeset	68 ctx->inByteCount++;
aedadff9e116 Implement dmGetBits() to the DMBitStreamContext API. Also improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2085 diff changeset	69 }
aedadff9e116 Implement dmGetBits() to the DMBitStreamContext API. Also improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2085 diff changeset	70
aedadff9e116 Implement dmGetBits() to the DMBitStreamContext API. Also improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2085 diff changeset	71 *val <<= 1;
aedadff9e116 Implement dmGetBits() to the DMBitStreamContext API. Also improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2085 diff changeset	72 *val \|= ctx->inBuf >> 7 & 1;
aedadff9e116 Implement dmGetBits() to the DMBitStreamContext API. Also improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2085 diff changeset	73
aedadff9e116 Implement dmGetBits() to the DMBitStreamContext API. Also improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2085 diff changeset	74 ctx->inBuf <<= 1;
aedadff9e116 Implement dmGetBits() to the DMBitStreamContext API. Also improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2085 diff changeset	75 ctx->inBitCount--;
aedadff9e116 Implement dmGetBits() to the DMBitStreamContext API. Also improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2085 diff changeset	76 }
aedadff9e116 Implement dmGetBits() to the DMBitStreamContext API. Also improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2085 diff changeset	77
aedadff9e116 Implement dmGetBits() to the DMBitStreamContext API. Also improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2085 diff changeset	78 return DMERR_OK;
1309 5ad7d780a09b Move bitstream reading functions to libgfx, as they were only used there. Matti Hamalainen <ccr@tnsp.org> parents: 1308 diff changeset	79 }
5ad7d780a09b Move bitstream reading functions to libgfx, as they were only used there. Matti Hamalainen <ccr@tnsp.org> parents: 1308 diff changeset	80
5ad7d780a09b Move bitstream reading functions to libgfx, as they were only used there. Matti Hamalainen <ccr@tnsp.org> parents: 1308 diff changeset	81
5ad7d780a09b Move bitstream reading functions to libgfx, as they were only used there. Matti Hamalainen <ccr@tnsp.org> parents: 1308 diff changeset	82 int dmFlushBitStream(DMBitStreamContext *ctx)
5ad7d780a09b Move bitstream reading functions to libgfx, as they were only used there. Matti Hamalainen <ccr@tnsp.org> parents: 1308 diff changeset	83 {
5ad7d780a09b Move bitstream reading functions to libgfx, as they were only used there. Matti Hamalainen <ccr@tnsp.org> parents: 1308 diff changeset	84 if (ctx == NULL)
5ad7d780a09b Move bitstream reading functions to libgfx, as they were only used there. Matti Hamalainen <ccr@tnsp.org> parents: 1308 diff changeset	85 return DMERR_NULLPTR;
5ad7d780a09b Move bitstream reading functions to libgfx, as they were only used there. Matti Hamalainen <ccr@tnsp.org> parents: 1308 diff changeset	86
2086 aedadff9e116 Implement dmGetBits() to the DMBitStreamContext API. Also improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2085 diff changeset	87 if (ctx->outBitCount > 0)
aedadff9e116 Implement dmGetBits() to the DMBitStreamContext API. Also improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2085 diff changeset	88 return dmPutBits(ctx, 0, 8 - ctx->outBitCount);
1309 5ad7d780a09b Move bitstream reading functions to libgfx, as they were only used there. Matti Hamalainen <ccr@tnsp.org> parents: 1308 diff changeset	89
2083 feed844a5ae1 Return DMERR_OK where appropriate instead of 0. Matti Hamalainen <ccr@tnsp.org> parents: 2082 diff changeset	90 return DMERR_OK;
1309 5ad7d780a09b Move bitstream reading functions to libgfx, as they were only used there. Matti Hamalainen <ccr@tnsp.org> parents: 1308 diff changeset	91 }
5ad7d780a09b Move bitstream reading functions to libgfx, as they were only used there. Matti Hamalainen <ccr@tnsp.org> parents: 1308 diff changeset	92
5ad7d780a09b Move bitstream reading functions to libgfx, as they were only used there. Matti Hamalainen <ccr@tnsp.org> parents: 1308 diff changeset	93
2100 81fb21dd3265 Add dmGetNPlanesFromNColors() and use it. Matti Hamalainen <ccr@tnsp.org> parents: 2098 diff changeset	94 int dmGetNPlanesFromNColors(const int ncolors)
81fb21dd3265 Add dmGetNPlanesFromNColors() and use it. Matti Hamalainen <ccr@tnsp.org> parents: 2098 diff changeset	95 {
81fb21dd3265 Add dmGetNPlanesFromNColors() and use it. Matti Hamalainen <ccr@tnsp.org> parents: 2098 diff changeset	96 if (ncolors <= 0)
81fb21dd3265 Add dmGetNPlanesFromNColors() and use it. Matti Hamalainen <ccr@tnsp.org> parents: 2098 diff changeset	97 return -1;
81fb21dd3265 Add dmGetNPlanesFromNColors() and use it. Matti Hamalainen <ccr@tnsp.org> parents: 2098 diff changeset	98
81fb21dd3265 Add dmGetNPlanesFromNColors() and use it. Matti Hamalainen <ccr@tnsp.org> parents: 2098 diff changeset	99 for (int n = 8; n >= 0;)
81fb21dd3265 Add dmGetNPlanesFromNColors() and use it. Matti Hamalainen <ccr@tnsp.org> parents: 2098 diff changeset	100 {
81fb21dd3265 Add dmGetNPlanesFromNColors() and use it. Matti Hamalainen <ccr@tnsp.org> parents: 2098 diff changeset	101 if ((ncolors - 1) & (1 << n))
81fb21dd3265 Add dmGetNPlanesFromNColors() and use it. Matti Hamalainen <ccr@tnsp.org> parents: 2098 diff changeset	102 return n + 1;
81fb21dd3265 Add dmGetNPlanesFromNColors() and use it. Matti Hamalainen <ccr@tnsp.org> parents: 2098 diff changeset	103 else
81fb21dd3265 Add dmGetNPlanesFromNColors() and use it. Matti Hamalainen <ccr@tnsp.org> parents: 2098 diff changeset	104 n--;
81fb21dd3265 Add dmGetNPlanesFromNColors() and use it. Matti Hamalainen <ccr@tnsp.org> parents: 2098 diff changeset	105 }
81fb21dd3265 Add dmGetNPlanesFromNColors() and use it. Matti Hamalainen <ccr@tnsp.org> parents: 2098 diff changeset	106
81fb21dd3265 Add dmGetNPlanesFromNColors() and use it. Matti Hamalainen <ccr@tnsp.org> parents: 2098 diff changeset	107 return -2;
81fb21dd3265 Add dmGetNPlanesFromNColors() and use it. Matti Hamalainen <ccr@tnsp.org> parents: 2098 diff changeset	108 }
81fb21dd3265 Add dmGetNPlanesFromNColors() and use it. Matti Hamalainen <ccr@tnsp.org> parents: 2098 diff changeset	109
81fb21dd3265 Add dmGetNPlanesFromNColors() and use it. Matti Hamalainen <ccr@tnsp.org> parents: 2098 diff changeset	110
2094 4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	111 BOOL dmCompareColor(const DMColor c1, const DMColor c2, const BOOL alpha)
487 b89598501cec Move dmCompareColor() to libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	112 {
b89598501cec Move dmCompareColor() to libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	113 if (c1->r == c2->r &&
b89598501cec Move dmCompareColor() to libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	114 c1->g == c2->g &&
b89598501cec Move dmCompareColor() to libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	115 c1->b == c2->b)
b89598501cec Move dmCompareColor() to libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	116 return alpha ? (c1->a == c2->a) : TRUE;
b89598501cec Move dmCompareColor() to libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	117 else
b89598501cec Move dmCompareColor() to libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	118 return FALSE;
b89598501cec Move dmCompareColor() to libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	119 }
b89598501cec Move dmCompareColor() to libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	120
b89598501cec Move dmCompareColor() to libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	121
1286 b812fad6f33e Work on libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1285 diff changeset	122 int dmImageGetBytesPerPixel(const int format)
b812fad6f33e Work on libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1285 diff changeset	123 {
b812fad6f33e Work on libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1285 diff changeset	124 switch (format)
b812fad6f33e Work on libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1285 diff changeset	125 {
2092 614b161c0aa5 Initial support for reading PPM/PGM. Matti Hamalainen <ccr@tnsp.org> parents: 2091 diff changeset	126 case DM_COLFMT_GRAYSCALE : return 1;
1801 0562dd55a1f6 s/DM_IFMT_/DM_COLFMT_/g Matti Hamalainen <ccr@tnsp.org> parents: 1800 diff changeset	127 case DM_COLFMT_PALETTE : return 1;
0562dd55a1f6 s/DM_IFMT_/DM_COLFMT_/g Matti Hamalainen <ccr@tnsp.org> parents: 1800 diff changeset	128 case DM_COLFMT_RGB : return 3;
0562dd55a1f6 s/DM_IFMT_/DM_COLFMT_/g Matti Hamalainen <ccr@tnsp.org> parents: 1800 diff changeset	129 case DM_COLFMT_RGBA : return 4;
0562dd55a1f6 s/DM_IFMT_/DM_COLFMT_/g Matti Hamalainen <ccr@tnsp.org> parents: 1800 diff changeset	130 default : return -1;
1286 b812fad6f33e Work on libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1285 diff changeset	131 }
b812fad6f33e Work on libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1285 diff changeset	132 }
b812fad6f33e Work on libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1285 diff changeset	133
b812fad6f33e Work on libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1285 diff changeset	134
2091 3b3acb6b4ba0 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2086 diff changeset	135 int dmImageGetBitsPerPixel(const int format)
3b3acb6b4ba0 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2086 diff changeset	136 {
3b3acb6b4ba0 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2086 diff changeset	137 return dmImageGetBytesPerPixel(format) * 8;
3b3acb6b4ba0 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2086 diff changeset	138 }
3b3acb6b4ba0 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2086 diff changeset	139
3b3acb6b4ba0 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2086 diff changeset	140
1286 b812fad6f33e Work on libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1285 diff changeset	141 DMImage * dmImageAlloc(const int width, const int height, const int format, const int bpp)
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	142 {
928 ebe0d93e03c0 Use dmMalloc0() instead of dmCalloc() here. Matti Hamalainen <ccr@tnsp.org> parents: 902 diff changeset	143 DMImage *img = dmMalloc0(sizeof(DMImage));
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	144 if (img == NULL)
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	145 return NULL;
1102 e06abfde6c39 Cosmetics pass: Remove excess whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	146
1286 b812fad6f33e Work on libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1285 diff changeset	147 img->width = width;
b812fad6f33e Work on libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1285 diff changeset	148 img->height = height;
b812fad6f33e Work on libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1285 diff changeset	149 img->format = format;
2093 d17512dbb4ef Some work on reading >8bpp images. Matti Hamalainen <ccr@tnsp.org> parents: 2092 diff changeset	150 img->bpp = (bpp <= 0) ? dmImageGetBitsPerPixel(format) : bpp;
d17512dbb4ef Some work on reading >8bpp images. Matti Hamalainen <ccr@tnsp.org> parents: 2092 diff changeset	151 img->pitch = (width * img->bpp) / 8;
1628 a549d33d543a Add image aspect ratio information. Matti Hamalainen <ccr@tnsp.org> parents: 1627 diff changeset	152 img->size = img->pitch * img->height;
a549d33d543a Add image aspect ratio information. Matti Hamalainen <ccr@tnsp.org> parents: 1627 diff changeset	153 img->aspect = -1;
930 efbad8817b79 Some cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 929 diff changeset	154
929 e1378398be0f Add size field for allocated data size in DMImage. Matti Hamalainen <ccr@tnsp.org> parents: 928 diff changeset	155 if ((img->data = dmMalloc(img->size)) == NULL)
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	156 {
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	157 dmFree(img);
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	158 return NULL;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	159 }
1102 e06abfde6c39 Cosmetics pass: Remove excess whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	160
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	161 return img;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	162 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	163
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	164
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	165 void dmImageFree(DMImage *img)
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	166 {
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	167 if (img != NULL)
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	168 {
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	169 if (!img->constpal)
2094 4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	170 dmPaletteFree(img->pal);
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	171
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	172 dmFree(img->data);
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	173 dmFree(img);
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	174 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	175 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	176
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	177
2094 4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	178 int dmPaletteAlloc(DMPalette **ppal, const int ncolors, const int ctransp)
451 fdc91f2a0d27 Modularize palette reading and handling code. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	179 {
2094 4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	180 DMPalette *pal;
451 fdc91f2a0d27 Modularize palette reading and handling code. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	181 if (ppal == NULL)
2094 4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	182 return DMERR_NULLPTR;
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	183
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	184 *ppal = NULL;
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	185
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	186 // Allocate palette struct
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	187 if ((pal = dmMalloc0(sizeof(DMPalette))) == NULL)
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	188 return DMERR_MALLOC;
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	189
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	190 pal->ncolors = ncolors;
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	191 pal->ctransp = ctransp;
451 fdc91f2a0d27 Modularize palette reading and handling code. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	192
460 0af039b6c0ae Improve transparent color handling. Matti Hamalainen <ccr@tnsp.org> parents: 453 diff changeset	193 // Allocate desired amount of palette
2094 4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	194 if ((pal->colors = dmCalloc(pal->ncolors, sizeof(DMColor))) == NULL)
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	195 {
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	196 dmFree(pal);
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	197 return DMERR_MALLOC;
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	198 }
460 0af039b6c0ae Improve transparent color handling. Matti Hamalainen <ccr@tnsp.org> parents: 453 diff changeset	199
0af039b6c0ae Improve transparent color handling. Matti Hamalainen <ccr@tnsp.org> parents: 453 diff changeset	200 // Set alpha values to max, except for transparent color
2094 4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	201 for (int i = 0; i < pal->ncolors; i++)
460 0af039b6c0ae Improve transparent color handling. Matti Hamalainen <ccr@tnsp.org> parents: 453 diff changeset	202 {
2094 4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	203 pal->colors[i].a = (i == pal->ctransp) ? 0x00 : 0xff;
460 0af039b6c0ae Improve transparent color handling. Matti Hamalainen <ccr@tnsp.org> parents: 453 diff changeset	204 }
0af039b6c0ae Improve transparent color handling. Matti Hamalainen <ccr@tnsp.org> parents: 453 diff changeset	205
2094 4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	206 *ppal = pal;
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	207
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	208 return DMERR_OK;
451 fdc91f2a0d27 Modularize palette reading and handling code. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	209 }
fdc91f2a0d27 Modularize palette reading and handling code. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	210
fdc91f2a0d27 Modularize palette reading and handling code. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	211
2094 4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	212 int dmPaletteResize(DMPalette **ppal, const int ncolors)
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	213 {
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	214 DMPalette *pal;
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	215
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	216 if (ppal == NULL)
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	217 return DMERR_NULLPTR;
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	218
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	219 if (ncolors <= 0 \|\| ncolors > 256)
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	220 return DMERR_INVALID_ARGS;
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	221
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	222 if (*ppal == NULL)
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	223 return dmPaletteAlloc(ppal, ncolors, -1);
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	224
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	225 pal = *ppal;
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	226
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	227 if (pal->ncolors == ncolors)
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	228 return DMERR_OK;
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	229
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	230 if ((pal->colors = dmRealloc(pal->colors, sizeof(DMColor) * ncolors)) == NULL)
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	231 return DMERR_MALLOC;
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	232
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	233 if (ncolors - pal->ncolors > 0)
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	234 memset(&(pal->colors[pal->ncolors]), 0, sizeof(DMColor) * (ncolors - pal->ncolors));
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	235
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	236 return DMERR_OK;
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	237 }
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	238
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	239
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	240 int dmPaletteCopy(DMPalette *pdst, const DMPalette src)
451 fdc91f2a0d27 Modularize palette reading and handling code. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	241 {
2094 4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	242 DMPalette *pal;
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	243 if (pdst == NULL)
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	244 return DMERR_NULLPTR;
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	245
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	246 *pdst = NULL;
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	247
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	248 // Allocate palette struct
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	249 if ((pal = dmMalloc(sizeof(DMPalette))) == NULL)
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	250 return DMERR_MALLOC;
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	251
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	252 memcpy(pal, src, sizeof(DMPalette));
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	253
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	254 // Allocate desired amount of palette
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	255 if ((pal->colors = dmCalloc(pal->ncolors, sizeof(DMColor))) == NULL)
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	256 {
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	257 dmFree(pal);
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	258 return DMERR_MALLOC;
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	259 }
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	260
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	261 memcpy(pal->colors, src->colors, sizeof(DMColor) * pal->ncolors);
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	262 *pdst = pal;
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	263
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	264 return DMERR_OK;
451 fdc91f2a0d27 Modularize palette reading and handling code. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	265 }
fdc91f2a0d27 Modularize palette reading and handling code. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	266
fdc91f2a0d27 Modularize palette reading and handling code. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	267
2094 4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	268 void dmPaletteFree(DMPalette *pal)
451 fdc91f2a0d27 Modularize palette reading and handling code. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	269 {
2094 4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	270 if (pal != NULL)
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	271 {
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	272 dmFree(pal->colors);
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	273 dmFree(pal);
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	274 }
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	275 }
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	276
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	277
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	278 static int dmPaletteReadData(DMResource fp, DMPalette pal, int ncolors)
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	279 {
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	280 if (pal->ncolors < ncolors)
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	281 return DMERR_INVALID_ARGS;
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	282
1609 c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1583 diff changeset	283 for (int i = 0; i < ncolors; i++)
451 fdc91f2a0d27 Modularize palette reading and handling code. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	284 {
fdc91f2a0d27 Modularize palette reading and handling code. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	285 Uint8 colR, colG, colB;
1609 c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1583 diff changeset	286 if (!dmf_read_byte(fp, &colR) \|\|
c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1583 diff changeset	287 !dmf_read_byte(fp, &colG) \|\|
c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1583 diff changeset	288 !dmf_read_byte(fp, &colB))
2094 4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	289 return DMERR_FREAD;
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	290
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	291 pal->colors[i].r = colR;
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	292 pal->colors[i].g = colG;
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	293 pal->colors[i].b = colB;
451 fdc91f2a0d27 Modularize palette reading and handling code. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	294 }
fdc91f2a0d27 Modularize palette reading and handling code. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	295
2094 4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	296 return DMERR_OK;
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	297 }
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	298
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	299
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	300 static int dmPaletteWriteData(DMResource fp, const DMPalette pal, const int ncolors, const int npad)
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	301 {
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	302 int i;
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	303
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	304 if (pal == NULL \|\| fp == NULL)
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	305 return DMERR_NULLPTR;
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	306
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	307 if (pal->ncolors < ncolors)
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	308 return DMERR_INVALID_ARGS;
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	309
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	310 for (i = 0; i < ncolors; i++)
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	311 {
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	312 DMColor *col = &pal->colors[i];
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	313 if (!dmf_write_byte(fp, col->r) \|\|
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	314 !dmf_write_byte(fp, col->g) \|\|
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	315 !dmf_write_byte(fp, col->b))
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	316 return DMERR_FWRITE;
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	317 }
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	318
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	319 for (; i < npad; i++)
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	320 {
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	321 if (!dmf_write_byte(fp, 0) \|\|
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	322 !dmf_write_byte(fp, 0) \|\|
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	323 !dmf_write_byte(fp, 0))
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	324 return DMERR_FWRITE;
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	325 }
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	326
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	327 return DMERR_OK;
451 fdc91f2a0d27 Modularize palette reading and handling code. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	328 }
fdc91f2a0d27 Modularize palette reading and handling code. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	329
fdc91f2a0d27 Modularize palette reading and handling code. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	330
2091 3b3acb6b4ba0 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2086 diff changeset	331 int dmWriteImageData(const DMImage img, void cbdata,
3b3acb6b4ba0 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2086 diff changeset	332 int (writeRowCB)(void , const Uint8 *, const size_t),
3b3acb6b4ba0 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2086 diff changeset	333 const DMImageConvSpec *spec)
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	334 {
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	335 int x, y, yscale, xscale, res = 0, rowSize, rowWidth;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	336 Uint8 *row = NULL;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	337
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	338 // Allocate memory for row buffer
902 c6c480e8e1c8 Add separate X and Y scaling to gfxconv and libgfx outputters. Matti Hamalainen <ccr@tnsp.org> parents: 858 diff changeset	339 rowWidth = img->width * spec->scaleX;
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	340 rowSize = rowWidth * dmImageGetBytesPerPixel(spec->format);
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	341
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	342 if ((row = dmMalloc(rowSize + 16)) == NULL)
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	343 {
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	344 res = DMERR_MALLOC;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	345 goto done;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	346 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	347
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	348 // Generate the image
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	349 for (y = 0; y < img->height; y++)
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	350 {
436 86f956e4580f Cosmetics, rename a variable. Matti Hamalainen <ccr@tnsp.org> parents: 435 diff changeset	351 Uint8 *ptr1 = row,
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	352 *ptr2 = ptr1 + rowWidth,
1291 2c4acbc3e7bf More work on libgfx etc. Matti Hamalainen <ccr@tnsp.org> parents: 1290 diff changeset	353 *ptr3 = ptr2 + rowWidth,
2c4acbc3e7bf More work on libgfx etc. Matti Hamalainen <ccr@tnsp.org> parents: 1290 diff changeset	354 *ptr4 = ptr3 + rowWidth;
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	355
2098 e38705223ce4 Support grayscale output. Matti Hamalainen <ccr@tnsp.org> parents: 2096 diff changeset	356 if (img->format == DM_COLFMT_GRAYSCALE)
e38705223ce4 Support grayscale output. Matti Hamalainen <ccr@tnsp.org> parents: 2096 diff changeset	357 {
e38705223ce4 Support grayscale output. Matti Hamalainen <ccr@tnsp.org> parents: 2096 diff changeset	358 for (x = 0; x < img->width; x++)
e38705223ce4 Support grayscale output. Matti Hamalainen <ccr@tnsp.org> parents: 2096 diff changeset	359 {
e38705223ce4 Support grayscale output. Matti Hamalainen <ccr@tnsp.org> parents: 2096 diff changeset	360 Uint8 c = img->data[(y * img->pitch) + (x * img->bpp) / 8];
e38705223ce4 Support grayscale output. Matti Hamalainen <ccr@tnsp.org> parents: 2096 diff changeset	361
e38705223ce4 Support grayscale output. Matti Hamalainen <ccr@tnsp.org> parents: 2096 diff changeset	362 switch (spec->format)
e38705223ce4 Support grayscale output. Matti Hamalainen <ccr@tnsp.org> parents: 2096 diff changeset	363 {
e38705223ce4 Support grayscale output. Matti Hamalainen <ccr@tnsp.org> parents: 2096 diff changeset	364 case DM_COLFMT_PALETTE:
e38705223ce4 Support grayscale output. Matti Hamalainen <ccr@tnsp.org> parents: 2096 diff changeset	365 case DM_COLFMT_GRAYSCALE:
e38705223ce4 Support grayscale output. Matti Hamalainen <ccr@tnsp.org> parents: 2096 diff changeset	366 for (xscale = 0; xscale < spec->scaleX; xscale++)
e38705223ce4 Support grayscale output. Matti Hamalainen <ccr@tnsp.org> parents: 2096 diff changeset	367 *ptr1++ = c;
e38705223ce4 Support grayscale output. Matti Hamalainen <ccr@tnsp.org> parents: 2096 diff changeset	368 break;
e38705223ce4 Support grayscale output. Matti Hamalainen <ccr@tnsp.org> parents: 2096 diff changeset	369
e38705223ce4 Support grayscale output. Matti Hamalainen <ccr@tnsp.org> parents: 2096 diff changeset	370 case DM_COLFMT_RGBA:
e38705223ce4 Support grayscale output. Matti Hamalainen <ccr@tnsp.org> parents: 2096 diff changeset	371 if (spec->planar)
e38705223ce4 Support grayscale output. Matti Hamalainen <ccr@tnsp.org> parents: 2096 diff changeset	372 {
e38705223ce4 Support grayscale output. Matti Hamalainen <ccr@tnsp.org> parents: 2096 diff changeset	373 for (xscale = 0; xscale < spec->scaleX; xscale++)
e38705223ce4 Support grayscale output. Matti Hamalainen <ccr@tnsp.org> parents: 2096 diff changeset	374 {
e38705223ce4 Support grayscale output. Matti Hamalainen <ccr@tnsp.org> parents: 2096 diff changeset	375 *ptr1++ = c;
e38705223ce4 Support grayscale output. Matti Hamalainen <ccr@tnsp.org> parents: 2096 diff changeset	376 *ptr2++ = c;
e38705223ce4 Support grayscale output. Matti Hamalainen <ccr@tnsp.org> parents: 2096 diff changeset	377 *ptr3++ = c;
e38705223ce4 Support grayscale output. Matti Hamalainen <ccr@tnsp.org> parents: 2096 diff changeset	378 *ptr4++ = 0xff;
e38705223ce4 Support grayscale output. Matti Hamalainen <ccr@tnsp.org> parents: 2096 diff changeset	379 }
e38705223ce4 Support grayscale output. Matti Hamalainen <ccr@tnsp.org> parents: 2096 diff changeset	380 }
e38705223ce4 Support grayscale output. Matti Hamalainen <ccr@tnsp.org> parents: 2096 diff changeset	381 else
e38705223ce4 Support grayscale output. Matti Hamalainen <ccr@tnsp.org> parents: 2096 diff changeset	382 {
e38705223ce4 Support grayscale output. Matti Hamalainen <ccr@tnsp.org> parents: 2096 diff changeset	383 for (xscale = 0; xscale < spec->scaleX; xscale++)
e38705223ce4 Support grayscale output. Matti Hamalainen <ccr@tnsp.org> parents: 2096 diff changeset	384 {
e38705223ce4 Support grayscale output. Matti Hamalainen <ccr@tnsp.org> parents: 2096 diff changeset	385 *ptr1++ = c;
e38705223ce4 Support grayscale output. Matti Hamalainen <ccr@tnsp.org> parents: 2096 diff changeset	386 *ptr1++ = c;
e38705223ce4 Support grayscale output. Matti Hamalainen <ccr@tnsp.org> parents: 2096 diff changeset	387 *ptr1++ = c;
e38705223ce4 Support grayscale output. Matti Hamalainen <ccr@tnsp.org> parents: 2096 diff changeset	388 *ptr1++ = 0xff;
e38705223ce4 Support grayscale output. Matti Hamalainen <ccr@tnsp.org> parents: 2096 diff changeset	389 }
e38705223ce4 Support grayscale output. Matti Hamalainen <ccr@tnsp.org> parents: 2096 diff changeset	390 }
e38705223ce4 Support grayscale output. Matti Hamalainen <ccr@tnsp.org> parents: 2096 diff changeset	391 break;
e38705223ce4 Support grayscale output. Matti Hamalainen <ccr@tnsp.org> parents: 2096 diff changeset	392
e38705223ce4 Support grayscale output. Matti Hamalainen <ccr@tnsp.org> parents: 2096 diff changeset	393 case DM_COLFMT_RGB:
e38705223ce4 Support grayscale output. Matti Hamalainen <ccr@tnsp.org> parents: 2096 diff changeset	394 if (spec->planar)
e38705223ce4 Support grayscale output. Matti Hamalainen <ccr@tnsp.org> parents: 2096 diff changeset	395 {
e38705223ce4 Support grayscale output. Matti Hamalainen <ccr@tnsp.org> parents: 2096 diff changeset	396 for (xscale = 0; xscale < spec->scaleX; xscale++)
e38705223ce4 Support grayscale output. Matti Hamalainen <ccr@tnsp.org> parents: 2096 diff changeset	397 {
e38705223ce4 Support grayscale output. Matti Hamalainen <ccr@tnsp.org> parents: 2096 diff changeset	398 *ptr1++ = c;
e38705223ce4 Support grayscale output. Matti Hamalainen <ccr@tnsp.org> parents: 2096 diff changeset	399 *ptr2++ = c;
e38705223ce4 Support grayscale output. Matti Hamalainen <ccr@tnsp.org> parents: 2096 diff changeset	400 *ptr3++ = c;
e38705223ce4 Support grayscale output. Matti Hamalainen <ccr@tnsp.org> parents: 2096 diff changeset	401 }
e38705223ce4 Support grayscale output. Matti Hamalainen <ccr@tnsp.org> parents: 2096 diff changeset	402 }
e38705223ce4 Support grayscale output. Matti Hamalainen <ccr@tnsp.org> parents: 2096 diff changeset	403 else
e38705223ce4 Support grayscale output. Matti Hamalainen <ccr@tnsp.org> parents: 2096 diff changeset	404 {
e38705223ce4 Support grayscale output. Matti Hamalainen <ccr@tnsp.org> parents: 2096 diff changeset	405 for (xscale = 0; xscale < spec->scaleX; xscale++)
e38705223ce4 Support grayscale output. Matti Hamalainen <ccr@tnsp.org> parents: 2096 diff changeset	406 {
e38705223ce4 Support grayscale output. Matti Hamalainen <ccr@tnsp.org> parents: 2096 diff changeset	407 *ptr1++ = c;
e38705223ce4 Support grayscale output. Matti Hamalainen <ccr@tnsp.org> parents: 2096 diff changeset	408 *ptr1++ = c;
e38705223ce4 Support grayscale output. Matti Hamalainen <ccr@tnsp.org> parents: 2096 diff changeset	409 *ptr1++ = c;
e38705223ce4 Support grayscale output. Matti Hamalainen <ccr@tnsp.org> parents: 2096 diff changeset	410 }
e38705223ce4 Support grayscale output. Matti Hamalainen <ccr@tnsp.org> parents: 2096 diff changeset	411 }
e38705223ce4 Support grayscale output. Matti Hamalainen <ccr@tnsp.org> parents: 2096 diff changeset	412 break;
e38705223ce4 Support grayscale output. Matti Hamalainen <ccr@tnsp.org> parents: 2096 diff changeset	413
e38705223ce4 Support grayscale output. Matti Hamalainen <ccr@tnsp.org> parents: 2096 diff changeset	414 default:
e38705223ce4 Support grayscale output. Matti Hamalainen <ccr@tnsp.org> parents: 2096 diff changeset	415 res = DMERR_NOT_SUPPORTED;
e38705223ce4 Support grayscale output. Matti Hamalainen <ccr@tnsp.org> parents: 2096 diff changeset	416 goto done;
e38705223ce4 Support grayscale output. Matti Hamalainen <ccr@tnsp.org> parents: 2096 diff changeset	417 }
e38705223ce4 Support grayscale output. Matti Hamalainen <ccr@tnsp.org> parents: 2096 diff changeset	418 }
e38705223ce4 Support grayscale output. Matti Hamalainen <ccr@tnsp.org> parents: 2096 diff changeset	419 }
e38705223ce4 Support grayscale output. Matti Hamalainen <ccr@tnsp.org> parents: 2096 diff changeset	420 else
e38705223ce4 Support grayscale output. Matti Hamalainen <ccr@tnsp.org> parents: 2096 diff changeset	421 if (img->format == DM_COLFMT_PALETTE)
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	422 {
2094 4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	423 for (x = 0; x < img->width; x++)
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	424 {
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	425 Uint8 c = img->data[(y * img->pitch) + (x * img->bpp) / 8],
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	426 qr, qg, qb, qa;
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	427
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	428 if (c >= img->pal->ncolors)
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	429 {
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	430 res = DMERR_INVALID_DATA;
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	431 goto done;
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	432 }
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	433
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	434 switch (spec->format)
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	435 {
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	436 case DM_COLFMT_PALETTE:
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	437 case DM_COLFMT_GRAYSCALE:
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	438 for (xscale = 0; xscale < spec->scaleX; xscale++)
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	439 *ptr1++ = c;
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	440 break;
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	441
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	442 case DM_COLFMT_RGBA:
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	443 qr = img->pal->colors[c].r;
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	444 qg = img->pal->colors[c].g;
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	445 qb = img->pal->colors[c].b;
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	446 qa = img->pal->colors[c].a;
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	447
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	448 if (spec->planar)
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	449 {
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	450 for (xscale = 0; xscale < spec->scaleX; xscale++)
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	451 {
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	452 *ptr1++ = qr;
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	453 *ptr2++ = qg;
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	454 *ptr3++ = qb;
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	455 *ptr4++ = qa;
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	456 }
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	457 }
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	458 else
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	459 {
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	460 for (xscale = 0; xscale < spec->scaleX; xscale++)
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	461 {
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	462 *ptr1++ = qr;
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	463 *ptr1++ = qg;
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	464 *ptr1++ = qb;
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	465 *ptr1++ = qa;
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	466 }
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	467 }
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	468 break;
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	469
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	470 case DM_COLFMT_RGB:
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	471 qr = img->pal->colors[c].r;
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	472 qg = img->pal->colors[c].g;
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	473 qb = img->pal->colors[c].b;
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	474
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	475 if (spec->planar)
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	476 {
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	477 for (xscale = 0; xscale < spec->scaleX; xscale++)
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	478 {
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	479 *ptr1++ = qr;
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	480 *ptr2++ = qg;
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	481 *ptr3++ = qb;
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	482 }
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	483 }
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	484 else
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	485 {
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	486 for (xscale = 0; xscale < spec->scaleX; xscale++)
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	487 {
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	488 *ptr1++ = qr;
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	489 *ptr1++ = qg;
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	490 *ptr1++ = qb;
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	491 }
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	492 }
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	493 break;
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	494
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	495 default:
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	496 res = DMERR_NOT_SUPPORTED;
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	497 goto done;
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	498 }
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	499 }
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	500 }
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	501 else
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	502 if (img->format == DM_COLFMT_RGB \|\|
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	503 img->format == DM_COLFMT_RGBA)
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	504 {
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	505 Uint8 sp = img->data + (y img->pitch);
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	506
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	507 for (x = 0; x < img->width; x++, sp += img->bpp / 8)
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	508 switch (spec->format)
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	509 {
2094 4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	510 case DM_COLFMT_RGBA:
1291 2c4acbc3e7bf More work on libgfx etc. Matti Hamalainen <ccr@tnsp.org> parents: 1290 diff changeset	511 if (spec->planar)
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	512 {
1291 2c4acbc3e7bf More work on libgfx etc. Matti Hamalainen <ccr@tnsp.org> parents: 1290 diff changeset	513 for (xscale = 0; xscale < spec->scaleX; xscale++)
2c4acbc3e7bf More work on libgfx etc. Matti Hamalainen <ccr@tnsp.org> parents: 1290 diff changeset	514 {
2094 4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	515 *ptr1++ = sp[0];
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	516 *ptr2++ = sp[1];
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	517 *ptr3++ = sp[2];
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	518 *ptr4++ = sp[3];
1291 2c4acbc3e7bf More work on libgfx etc. Matti Hamalainen <ccr@tnsp.org> parents: 1290 diff changeset	519 }
2c4acbc3e7bf More work on libgfx etc. Matti Hamalainen <ccr@tnsp.org> parents: 1290 diff changeset	520 }
2c4acbc3e7bf More work on libgfx etc. Matti Hamalainen <ccr@tnsp.org> parents: 1290 diff changeset	521 else
2c4acbc3e7bf More work on libgfx etc. Matti Hamalainen <ccr@tnsp.org> parents: 1290 diff changeset	522 {
2c4acbc3e7bf More work on libgfx etc. Matti Hamalainen <ccr@tnsp.org> parents: 1290 diff changeset	523 for (xscale = 0; xscale < spec->scaleX; xscale++)
2c4acbc3e7bf More work on libgfx etc. Matti Hamalainen <ccr@tnsp.org> parents: 1290 diff changeset	524 {
2094 4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	525 *ptr1++ = sp[0];
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	526 *ptr1++ = sp[1];
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	527 *ptr1++ = sp[2];
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	528 *ptr1++ = sp[3];
1291 2c4acbc3e7bf More work on libgfx etc. Matti Hamalainen <ccr@tnsp.org> parents: 1290 diff changeset	529 }
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	530 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	531 break;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	532
1801 0562dd55a1f6 s/DM_IFMT_/DM_COLFMT_/g Matti Hamalainen <ccr@tnsp.org> parents: 1800 diff changeset	533 case DM_COLFMT_RGB:
1291 2c4acbc3e7bf More work on libgfx etc. Matti Hamalainen <ccr@tnsp.org> parents: 1290 diff changeset	534 if (spec->planar)
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	535 {
1291 2c4acbc3e7bf More work on libgfx etc. Matti Hamalainen <ccr@tnsp.org> parents: 1290 diff changeset	536 for (xscale = 0; xscale < spec->scaleX; xscale++)
2c4acbc3e7bf More work on libgfx etc. Matti Hamalainen <ccr@tnsp.org> parents: 1290 diff changeset	537 {
2094 4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	538 *ptr1++ = sp[0];
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	539 *ptr2++ = sp[1];
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	540 *ptr3++ = sp[2];
1291 2c4acbc3e7bf More work on libgfx etc. Matti Hamalainen <ccr@tnsp.org> parents: 1290 diff changeset	541 }
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	542 }
1291 2c4acbc3e7bf More work on libgfx etc. Matti Hamalainen <ccr@tnsp.org> parents: 1290 diff changeset	543 else
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	544 {
1291 2c4acbc3e7bf More work on libgfx etc. Matti Hamalainen <ccr@tnsp.org> parents: 1290 diff changeset	545 for (xscale = 0; xscale < spec->scaleX; xscale++)
2c4acbc3e7bf More work on libgfx etc. Matti Hamalainen <ccr@tnsp.org> parents: 1290 diff changeset	546 {
2094 4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	547 *ptr1++ = sp[0];
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	548 *ptr1++ = sp[1];
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	549 *ptr1++ = sp[2];
1291 2c4acbc3e7bf More work on libgfx etc. Matti Hamalainen <ccr@tnsp.org> parents: 1290 diff changeset	550 }
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	551 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	552 break;
2094 4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	553
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	554 default:
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	555 res = DMERR_NOT_SUPPORTED;
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	556 goto done;
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	557 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	558 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	559
902 c6c480e8e1c8 Add separate X and Y scaling to gfxconv and libgfx outputters. Matti Hamalainen <ccr@tnsp.org> parents: 858 diff changeset	560 for (yscale = 0; yscale < spec->scaleY; yscale++)
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	561 {
808 f8126fa1df9b Use dmlib error code return value in cases where a plain boolean was used Matti Hamalainen <ccr@tnsp.org> parents: 800 diff changeset	562 if ((res = writeRowCB(cbdata, row, rowSize)) != DMERR_OK)
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	563 goto done;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	564 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	565 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	566
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	567 done:
1102 e06abfde6c39 Cosmetics pass: Remove excess whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	568 dmFree(row);
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	569 return res;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	570 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	571
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	572
1886 1af79412f249 Remove the stdio FILE support from libgfx API, now only DMResource is supported. Matti Hamalainen <ccr@tnsp.org> parents: 1881 diff changeset	573 #define DMCOL(x) (((x) >> 4) & 0xf)
1af79412f249 Remove the stdio FILE support from libgfx API, now only DMResource is supported. Matti Hamalainen <ccr@tnsp.org> parents: 1881 diff changeset	574
1af79412f249 Remove the stdio FILE support from libgfx API, now only DMResource is supported. Matti Hamalainen <ccr@tnsp.org> parents: 1881 diff changeset	575 int dmWriteIFFMasterRAWHeader(
1af79412f249 Remove the stdio FILE support from libgfx API, now only DMResource is supported. Matti Hamalainen <ccr@tnsp.org> parents: 1881 diff changeset	576 DMResource fp, const char filename, const char *prefix,
2065 451980580189 Refactor how paletted/indexed formats are handled in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 2064 diff changeset	577 const DMImage img, const DMImageConvSpec spec)
1886 1af79412f249 Remove the stdio FILE support from libgfx API, now only DMResource is supported. Matti Hamalainen <ccr@tnsp.org> parents: 1881 diff changeset	578 {
2049 a945a5f2fd70 Improve the cdump output format support of gfxconv. Also add some error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2047 diff changeset	579 if (dmfprintf(fp,
1886 1af79412f249 Remove the stdio FILE support from libgfx API, now only DMResource is supported. Matti Hamalainen <ccr@tnsp.org> parents: 1881 diff changeset	580 "%s_width: dw.w %d\n"
1af79412f249 Remove the stdio FILE support from libgfx API, now only DMResource is supported. Matti Hamalainen <ccr@tnsp.org> parents: 1881 diff changeset	581 "%s_height: dw.w %d\n"
1af79412f249 Remove the stdio FILE support from libgfx API, now only DMResource is supported. Matti Hamalainen <ccr@tnsp.org> parents: 1881 diff changeset	582 "%s_nplanes: dw.w %d\n",
1af79412f249 Remove the stdio FILE support from libgfx API, now only DMResource is supported. Matti Hamalainen <ccr@tnsp.org> parents: 1881 diff changeset	583 prefix, img->width * spec->scaleX,
1af79412f249 Remove the stdio FILE support from libgfx API, now only DMResource is supported. Matti Hamalainen <ccr@tnsp.org> parents: 1881 diff changeset	584 prefix, img->height * spec->scaleY,
2049 a945a5f2fd70 Improve the cdump output format support of gfxconv. Also add some error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2047 diff changeset	585 prefix, spec->nplanes) < 0)
a945a5f2fd70 Improve the cdump output format support of gfxconv. Also add some error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2047 diff changeset	586 return dmferror(fp);
1886 1af79412f249 Remove the stdio FILE support from libgfx API, now only DMResource is supported. Matti Hamalainen <ccr@tnsp.org> parents: 1881 diff changeset	587
2065 451980580189 Refactor how paletted/indexed formats are handled in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 2064 diff changeset	588 if (spec->fmtid == DM_IMGFMT_ARAW)
1886 1af79412f249 Remove the stdio FILE support from libgfx API, now only DMResource is supported. Matti Hamalainen <ccr@tnsp.org> parents: 1881 diff changeset	589 {
2049 a945a5f2fd70 Improve the cdump output format support of gfxconv. Also add some error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2047 diff changeset	590 if (dmfprintf(fp,
1886 1af79412f249 Remove the stdio FILE support from libgfx API, now only DMResource is supported. Matti Hamalainen <ccr@tnsp.org> parents: 1881 diff changeset	591 "%s_ncolors: dw.w %d\n"
1af79412f249 Remove the stdio FILE support from libgfx API, now only DMResource is supported. Matti Hamalainen <ccr@tnsp.org> parents: 1881 diff changeset	592 "%s_palette:\n",
2094 4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	593 prefix, img->pal->ncolors,
2049 a945a5f2fd70 Improve the cdump output format support of gfxconv. Also add some error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2047 diff changeset	594 prefix) < 0)
a945a5f2fd70 Improve the cdump output format support of gfxconv. Also add some error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2047 diff changeset	595 return dmferror(fp);
1886 1af79412f249 Remove the stdio FILE support from libgfx API, now only DMResource is supported. Matti Hamalainen <ccr@tnsp.org> parents: 1881 diff changeset	596
1af79412f249 Remove the stdio FILE support from libgfx API, now only DMResource is supported. Matti Hamalainen <ccr@tnsp.org> parents: 1881 diff changeset	597 for (int i = 0; i < (1 << spec->nplanes); i++)
1af79412f249 Remove the stdio FILE support from libgfx API, now only DMResource is supported. Matti Hamalainen <ccr@tnsp.org> parents: 1881 diff changeset	598 {
1af79412f249 Remove the stdio FILE support from libgfx API, now only DMResource is supported. Matti Hamalainen <ccr@tnsp.org> parents: 1881 diff changeset	599 Uint32 color;
2094 4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	600 if (i < img->pal->ncolors)
1886 1af79412f249 Remove the stdio FILE support from libgfx API, now only DMResource is supported. Matti Hamalainen <ccr@tnsp.org> parents: 1881 diff changeset	601 {
2094 4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	602 color = (DMCOL(img->pal->colors[i].r) << 8) \|
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	603 (DMCOL(img->pal->colors[i].g) << 4) \|
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	604 (DMCOL(img->pal->colors[i].b));
1886 1af79412f249 Remove the stdio FILE support from libgfx API, now only DMResource is supported. Matti Hamalainen <ccr@tnsp.org> parents: 1881 diff changeset	605 }
1af79412f249 Remove the stdio FILE support from libgfx API, now only DMResource is supported. Matti Hamalainen <ccr@tnsp.org> parents: 1881 diff changeset	606 else
1af79412f249 Remove the stdio FILE support from libgfx API, now only DMResource is supported. Matti Hamalainen <ccr@tnsp.org> parents: 1881 diff changeset	607 color = 0;
1af79412f249 Remove the stdio FILE support from libgfx API, now only DMResource is supported. Matti Hamalainen <ccr@tnsp.org> parents: 1881 diff changeset	608
2049 a945a5f2fd70 Improve the cdump output format support of gfxconv. Also add some error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2047 diff changeset	609 if (dmfprintf(fp,
1886 1af79412f249 Remove the stdio FILE support from libgfx API, now only DMResource is supported. Matti Hamalainen <ccr@tnsp.org> parents: 1881 diff changeset	610 "\tdc.w $%04X\n",
2049 a945a5f2fd70 Improve the cdump output format support of gfxconv. Also add some error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2047 diff changeset	611 color) < 0)
a945a5f2fd70 Improve the cdump output format support of gfxconv. Also add some error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2047 diff changeset	612 return dmferror(fp);
1886 1af79412f249 Remove the stdio FILE support from libgfx API, now only DMResource is supported. Matti Hamalainen <ccr@tnsp.org> parents: 1881 diff changeset	613 }
1af79412f249 Remove the stdio FILE support from libgfx API, now only DMResource is supported. Matti Hamalainen <ccr@tnsp.org> parents: 1881 diff changeset	614
2049 a945a5f2fd70 Improve the cdump output format support of gfxconv. Also add some error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2047 diff changeset	615 if (dmfprintf(fp,
1886 1af79412f249 Remove the stdio FILE support from libgfx API, now only DMResource is supported. Matti Hamalainen <ccr@tnsp.org> parents: 1881 diff changeset	616 "%s: incbin \"%s\"\n",
2049 a945a5f2fd70 Improve the cdump output format support of gfxconv. Also add some error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2047 diff changeset	617 prefix, filename) < 0)
a945a5f2fd70 Improve the cdump output format support of gfxconv. Also add some error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2047 diff changeset	618 return dmferror(fp);
1886 1af79412f249 Remove the stdio FILE support from libgfx API, now only DMResource is supported. Matti Hamalainen <ccr@tnsp.org> parents: 1881 diff changeset	619 }
1af79412f249 Remove the stdio FILE support from libgfx API, now only DMResource is supported. Matti Hamalainen <ccr@tnsp.org> parents: 1881 diff changeset	620
1887 297aa8f0ca7f Return DMERR_OK instead of dmferror(fp) dmWriteIFFMasterRAWHeader(). Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	621 return DMERR_OK;
1886 1af79412f249 Remove the stdio FILE support from libgfx API, now only DMResource is supported. Matti Hamalainen <ccr@tnsp.org> parents: 1881 diff changeset	622 }
1af79412f249 Remove the stdio FILE support from libgfx API, now only DMResource is supported. Matti Hamalainen <ccr@tnsp.org> parents: 1881 diff changeset	623
1af79412f249 Remove the stdio FILE support from libgfx API, now only DMResource is supported. Matti Hamalainen <ccr@tnsp.org> parents: 1881 diff changeset	624
2086 aedadff9e116 Implement dmGetBits() to the DMBitStreamContext API. Also improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2085 diff changeset	625 static int dmWriteRAWRow(DMBitStreamContext bs, const DMImage img,
2085 b31bb3dc1310 Cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 2084 diff changeset	626 const DMImageConvSpec *spec, const int yc, const int plane)
1872 fe15412eec10 Actually fix also the ARAW/RAW image data writing to honor the scaling. Matti Hamalainen <ccr@tnsp.org> parents: 1814 diff changeset	627 {
fe15412eec10 Actually fix also the ARAW/RAW image data writing to honor the scaling. Matti Hamalainen <ccr@tnsp.org> parents: 1814 diff changeset	628 const Uint8 sp = img->data + (yc img->pitch);
fe15412eec10 Actually fix also the ARAW/RAW image data writing to honor the scaling. Matti Hamalainen <ccr@tnsp.org> parents: 1814 diff changeset	629 for (int xc = 0; xc < img->width; xc++)
fe15412eec10 Actually fix also the ARAW/RAW image data writing to honor the scaling. Matti Hamalainen <ccr@tnsp.org> parents: 1814 diff changeset	630 {
2086 aedadff9e116 Implement dmGetBits() to the DMBitStreamContext API. Also improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2085 diff changeset	631 int res;
1872 fe15412eec10 Actually fix also the ARAW/RAW image data writing to honor the scaling. Matti Hamalainen <ccr@tnsp.org> parents: 1814 diff changeset	632 for (int xscale = 0; xscale < spec->scaleX; xscale++)
2086 aedadff9e116 Implement dmGetBits() to the DMBitStreamContext API. Also improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2085 diff changeset	633 if ((res = dmPutBits(bs, (sp[xc] >> plane) & 1, 1)) != DMERR_OK)
aedadff9e116 Implement dmGetBits() to the DMBitStreamContext API. Also improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2085 diff changeset	634 return res;
1872 fe15412eec10 Actually fix also the ARAW/RAW image data writing to honor the scaling. Matti Hamalainen <ccr@tnsp.org> parents: 1814 diff changeset	635 }
2086 aedadff9e116 Implement dmGetBits() to the DMBitStreamContext API. Also improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2085 diff changeset	636 return DMERR_OK;
aedadff9e116 Implement dmGetBits() to the DMBitStreamContext API. Also improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2085 diff changeset	637 }
aedadff9e116 Implement dmGetBits() to the DMBitStreamContext API. Also improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2085 diff changeset	638
aedadff9e116 Implement dmGetBits() to the DMBitStreamContext API. Also improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2085 diff changeset	639
aedadff9e116 Implement dmGetBits() to the DMBitStreamContext API. Also improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2085 diff changeset	640 static int dmPutByteRes(DMBitStreamContext *ctx)
aedadff9e116 Implement dmGetBits() to the DMBitStreamContext API. Also improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2085 diff changeset	641 {
aedadff9e116 Implement dmGetBits() to the DMBitStreamContext API. Also improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2085 diff changeset	642 DMResource fp = (DMResource ) ctx->handle;
aedadff9e116 Implement dmGetBits() to the DMBitStreamContext API. Also improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2085 diff changeset	643
aedadff9e116 Implement dmGetBits() to the DMBitStreamContext API. Also improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2085 diff changeset	644 if (!dmf_write_byte(fp, ctx->outBuf & 0xff))
aedadff9e116 Implement dmGetBits() to the DMBitStreamContext API. Also improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2085 diff changeset	645 return dmferror(fp);
aedadff9e116 Implement dmGetBits() to the DMBitStreamContext API. Also improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2085 diff changeset	646 else
aedadff9e116 Implement dmGetBits() to the DMBitStreamContext API. Also improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2085 diff changeset	647 return DMERR_OK;
1872 fe15412eec10 Actually fix also the ARAW/RAW image data writing to honor the scaling. Matti Hamalainen <ccr@tnsp.org> parents: 1814 diff changeset	648 }
fe15412eec10 Actually fix also the ARAW/RAW image data writing to honor the scaling. Matti Hamalainen <ccr@tnsp.org> parents: 1814 diff changeset	649
fe15412eec10 Actually fix also the ARAW/RAW image data writing to honor the scaling. Matti Hamalainen <ccr@tnsp.org> parents: 1814 diff changeset	650
1886 1af79412f249 Remove the stdio FILE support from libgfx API, now only DMResource is supported. Matti Hamalainen <ccr@tnsp.org> parents: 1881 diff changeset	651 int dmWriteRAWImage(DMResource fp, const DMImage img, const DMImageConvSpec *spec)
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	652 {
1622 009a3e3c54bf Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1621 diff changeset	653 int res;
2086 aedadff9e116 Implement dmGetBits() to the DMBitStreamContext API. Also improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2085 diff changeset	654 DMBitStreamContext ctx;
aedadff9e116 Implement dmGetBits() to the DMBitStreamContext API. Also improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2085 diff changeset	655
aedadff9e116 Implement dmGetBits() to the DMBitStreamContext API. Also improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2085 diff changeset	656 dmInitBitStreamContext(&ctx);
aedadff9e116 Implement dmGetBits() to the DMBitStreamContext API. Also improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2085 diff changeset	657 ctx.putByte = dmPutByteRes;
aedadff9e116 Implement dmGetBits() to the DMBitStreamContext API. Also improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2085 diff changeset	658 ctx.handle = (void *) fp;
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	659
1291 2c4acbc3e7bf More work on libgfx etc. Matti Hamalainen <ccr@tnsp.org> parents: 1290 diff changeset	660 if (spec->planar)
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	661 {
1339 65f8fd1bf76e Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1309 diff changeset	662 // Output bitplanes in planar format
65f8fd1bf76e Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1309 diff changeset	663 // (each plane of line sequentially)
1622 009a3e3c54bf Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1621 diff changeset	664 for (int yc = 0; yc < img->height; yc++)
1872 fe15412eec10 Actually fix also the ARAW/RAW image data writing to honor the scaling. Matti Hamalainen <ccr@tnsp.org> parents: 1814 diff changeset	665 for (int yscale = 0; yscale < spec->scaleY; yscale++)
1622 009a3e3c54bf Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1621 diff changeset	666 for (int plane = 0; plane < spec->nplanes; plane++)
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	667 {
2086 aedadff9e116 Implement dmGetBits() to the DMBitStreamContext API. Also improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2085 diff changeset	668 if ((res = dmWriteRAWRow(&ctx, img, spec, yc, plane)) != DMERR_OK)
aedadff9e116 Implement dmGetBits() to the DMBitStreamContext API. Also improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2085 diff changeset	669 return res;
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	670 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	671 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	672 else
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	673 {
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	674 // Output each bitplane in sequence
1622 009a3e3c54bf Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1621 diff changeset	675 for (int plane = 0; plane < spec->nplanes; plane++)
009a3e3c54bf Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1621 diff changeset	676 for (int yc = 0; yc < img->height; yc++)
1872 fe15412eec10 Actually fix also the ARAW/RAW image data writing to honor the scaling. Matti Hamalainen <ccr@tnsp.org> parents: 1814 diff changeset	677 for (int yscale = 0; yscale < spec->scaleY; yscale++)
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	678 {
2086 aedadff9e116 Implement dmGetBits() to the DMBitStreamContext API. Also improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2085 diff changeset	679 if ((res = dmWriteRAWRow(&ctx, img, spec, yc, plane)) != DMERR_OK)
aedadff9e116 Implement dmGetBits() to the DMBitStreamContext API. Also improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2085 diff changeset	680 return res;
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	681 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	682 }
1102 e06abfde6c39 Cosmetics pass: Remove excess whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	683
2086 aedadff9e116 Implement dmGetBits() to the DMBitStreamContext API. Also improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2085 diff changeset	684 return dmFlushBitStream(&ctx);
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	685 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	686
566 d400e32b62d9 Add a slightly different raw output format. Matti Hamalainen <ccr@tnsp.org> parents: 487 diff changeset	687
2086 aedadff9e116 Implement dmGetBits() to the DMBitStreamContext API. Also improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2085 diff changeset	688 static int dmPutByteCDump(DMBitStreamContext *ctx)
2047 3829c292df02 Add 'cdump' image output format, mainly for debugging purposes. Matti Hamalainen <ccr@tnsp.org> parents: 2026 diff changeset	689 {
2086 aedadff9e116 Implement dmGetBits() to the DMBitStreamContext API. Also improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2085 diff changeset	690 DMResource fp = (DMResource ) ctx->handle;
aedadff9e116 Implement dmGetBits() to the DMBitStreamContext API. Also improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2085 diff changeset	691
aedadff9e116 Implement dmGetBits() to the DMBitStreamContext API. Also improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2085 diff changeset	692 if (dmfprintf(fp, "0x%02x, ", ctx->outBuf & 0xff) < 2)
aedadff9e116 Implement dmGetBits() to the DMBitStreamContext API. Also improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2085 diff changeset	693 return dmferror(fp);
aedadff9e116 Implement dmGetBits() to the DMBitStreamContext API. Also improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2085 diff changeset	694 else
aedadff9e116 Implement dmGetBits() to the DMBitStreamContext API. Also improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2085 diff changeset	695 return DMERR_OK;
2047 3829c292df02 Add 'cdump' image output format, mainly for debugging purposes. Matti Hamalainen <ccr@tnsp.org> parents: 2026 diff changeset	696 }
3829c292df02 Add 'cdump' image output format, mainly for debugging purposes. Matti Hamalainen <ccr@tnsp.org> parents: 2026 diff changeset	697
3829c292df02 Add 'cdump' image output format, mainly for debugging purposes. Matti Hamalainen <ccr@tnsp.org> parents: 2026 diff changeset	698
3829c292df02 Add 'cdump' image output format, mainly for debugging purposes. Matti Hamalainen <ccr@tnsp.org> parents: 2026 diff changeset	699 int dmWriteCDumpImage(DMResource fp, const DMImage img, const DMImageConvSpec *spec)
3829c292df02 Add 'cdump' image output format, mainly for debugging purposes. Matti Hamalainen <ccr@tnsp.org> parents: 2026 diff changeset	700 {
3829c292df02 Add 'cdump' image output format, mainly for debugging purposes. Matti Hamalainen <ccr@tnsp.org> parents: 2026 diff changeset	701 int res;
2086 aedadff9e116 Implement dmGetBits() to the DMBitStreamContext API. Also improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2085 diff changeset	702 DMBitStreamContext ctx;
2049 a945a5f2fd70 Improve the cdump output format support of gfxconv. Also add some error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2047 diff changeset	703
a945a5f2fd70 Improve the cdump output format support of gfxconv. Also add some error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2047 diff changeset	704 if (dmfprintf(fp,
2047 3829c292df02 Add 'cdump' image output format, mainly for debugging purposes. Matti Hamalainen <ccr@tnsp.org> parents: 2026 diff changeset	705 "#define SET_WIDTH %d\n"
3829c292df02 Add 'cdump' image output format, mainly for debugging purposes. Matti Hamalainen <ccr@tnsp.org> parents: 2026 diff changeset	706 "#define SET_HEIGHT %d\n"
3829c292df02 Add 'cdump' image output format, mainly for debugging purposes. Matti Hamalainen <ccr@tnsp.org> parents: 2026 diff changeset	707 "\n"
3829c292df02 Add 'cdump' image output format, mainly for debugging purposes. Matti Hamalainen <ccr@tnsp.org> parents: 2026 diff changeset	708 "Uint8 img_data[] = {\n",
3829c292df02 Add 'cdump' image output format, mainly for debugging purposes. Matti Hamalainen <ccr@tnsp.org> parents: 2026 diff changeset	709 img->width * spec->scaleX,
2049 a945a5f2fd70 Improve the cdump output format support of gfxconv. Also add some error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2047 diff changeset	710 img->height * spec->scaleY) < 0)
a945a5f2fd70 Improve the cdump output format support of gfxconv. Also add some error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2047 diff changeset	711 return dmferror(fp);
a945a5f2fd70 Improve the cdump output format support of gfxconv. Also add some error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2047 diff changeset	712
2086 aedadff9e116 Implement dmGetBits() to the DMBitStreamContext API. Also improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2085 diff changeset	713 dmInitBitStreamContext(&ctx);
aedadff9e116 Implement dmGetBits() to the DMBitStreamContext API. Also improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2085 diff changeset	714 ctx.putByte = dmPutByteCDump;
aedadff9e116 Implement dmGetBits() to the DMBitStreamContext API. Also improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2085 diff changeset	715 ctx.handle = (void *) fp;
2049 a945a5f2fd70 Improve the cdump output format support of gfxconv. Also add some error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2047 diff changeset	716
a945a5f2fd70 Improve the cdump output format support of gfxconv. Also add some error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2047 diff changeset	717 if (spec->planar)
a945a5f2fd70 Improve the cdump output format support of gfxconv. Also add some error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2047 diff changeset	718 {
a945a5f2fd70 Improve the cdump output format support of gfxconv. Also add some error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2047 diff changeset	719 // Output bitplanes in planar format
a945a5f2fd70 Improve the cdump output format support of gfxconv. Also add some error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2047 diff changeset	720 // (each plane of line sequentially)
a945a5f2fd70 Improve the cdump output format support of gfxconv. Also add some error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2047 diff changeset	721 for (int yc = 0; yc < img->height; yc++)
a945a5f2fd70 Improve the cdump output format support of gfxconv. Also add some error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2047 diff changeset	722 for (int yscale = 0; yscale < spec->scaleY; yscale++)
a945a5f2fd70 Improve the cdump output format support of gfxconv. Also add some error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2047 diff changeset	723 for (int plane = 0; plane < spec->nplanes; plane++)
a945a5f2fd70 Improve the cdump output format support of gfxconv. Also add some error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2047 diff changeset	724 {
2086 aedadff9e116 Implement dmGetBits() to the DMBitStreamContext API. Also improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2085 diff changeset	725 if ((res = dmWriteRAWRow(&ctx, img, spec, yc, plane)) != DMERR_OK)
aedadff9e116 Implement dmGetBits() to the DMBitStreamContext API. Also improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2085 diff changeset	726 return res;
2049 a945a5f2fd70 Improve the cdump output format support of gfxconv. Also add some error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2047 diff changeset	727
a945a5f2fd70 Improve the cdump output format support of gfxconv. Also add some error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2047 diff changeset	728 if (dmfprintf(fp, "\n") < 0)
a945a5f2fd70 Improve the cdump output format support of gfxconv. Also add some error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2047 diff changeset	729 return dmferror(fp);
a945a5f2fd70 Improve the cdump output format support of gfxconv. Also add some error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2047 diff changeset	730 }
a945a5f2fd70 Improve the cdump output format support of gfxconv. Also add some error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2047 diff changeset	731 }
a945a5f2fd70 Improve the cdump output format support of gfxconv. Also add some error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2047 diff changeset	732 else
a945a5f2fd70 Improve the cdump output format support of gfxconv. Also add some error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2047 diff changeset	733 {
a945a5f2fd70 Improve the cdump output format support of gfxconv. Also add some error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2047 diff changeset	734 // Output each bitplane in sequence
a945a5f2fd70 Improve the cdump output format support of gfxconv. Also add some error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2047 diff changeset	735 for (int plane = 0; plane < spec->nplanes; plane++)
a945a5f2fd70 Improve the cdump output format support of gfxconv. Also add some error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2047 diff changeset	736 for (int yc = 0; yc < img->height; yc++)
a945a5f2fd70 Improve the cdump output format support of gfxconv. Also add some error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2047 diff changeset	737 for (int yscale = 0; yscale < spec->scaleY; yscale++)
a945a5f2fd70 Improve the cdump output format support of gfxconv. Also add some error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2047 diff changeset	738 {
2086 aedadff9e116 Implement dmGetBits() to the DMBitStreamContext API. Also improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2085 diff changeset	739 if ((res = dmWriteRAWRow(&ctx, img, spec, yc, plane)) != DMERR_OK)
aedadff9e116 Implement dmGetBits() to the DMBitStreamContext API. Also improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2085 diff changeset	740 return res;
2049 a945a5f2fd70 Improve the cdump output format support of gfxconv. Also add some error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2047 diff changeset	741
a945a5f2fd70 Improve the cdump output format support of gfxconv. Also add some error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2047 diff changeset	742 if (dmfprintf(fp, "\n") < 0)
a945a5f2fd70 Improve the cdump output format support of gfxconv. Also add some error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2047 diff changeset	743 return dmferror(fp);
a945a5f2fd70 Improve the cdump output format support of gfxconv. Also add some error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2047 diff changeset	744 }
a945a5f2fd70 Improve the cdump output format support of gfxconv. Also add some error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2047 diff changeset	745 }
a945a5f2fd70 Improve the cdump output format support of gfxconv. Also add some error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2047 diff changeset	746
2086 aedadff9e116 Implement dmGetBits() to the DMBitStreamContext API. Also improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2085 diff changeset	747 res = dmFlushBitStream(&ctx);
2049 a945a5f2fd70 Improve the cdump output format support of gfxconv. Also add some error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2047 diff changeset	748
a945a5f2fd70 Improve the cdump output format support of gfxconv. Also add some error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2047 diff changeset	749 if (res == DMERR_OK &&
a945a5f2fd70 Improve the cdump output format support of gfxconv. Also add some error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2047 diff changeset	750 dmfprintf(fp, "};\n") < 0)
a945a5f2fd70 Improve the cdump output format support of gfxconv. Also add some error handling. Matti Hamalainen <ccr@tnsp.org> parents: 2047 diff changeset	751 res = dmferror(fp);
2047 3829c292df02 Add 'cdump' image output format, mainly for debugging purposes. Matti Hamalainen <ccr@tnsp.org> parents: 2026 diff changeset	752
3829c292df02 Add 'cdump' image output format, mainly for debugging purposes. Matti Hamalainen <ccr@tnsp.org> parents: 2026 diff changeset	753 return res;
3829c292df02 Add 'cdump' image output format, mainly for debugging purposes. Matti Hamalainen <ccr@tnsp.org> parents: 2026 diff changeset	754 }
3829c292df02 Add 'cdump' image output format, mainly for debugging purposes. Matti Hamalainen <ccr@tnsp.org> parents: 2026 diff changeset	755
3829c292df02 Add 'cdump' image output format, mainly for debugging purposes. Matti Hamalainen <ccr@tnsp.org> parents: 2026 diff changeset	756
1301 e03f20d0f785 Constify. Matti Hamalainen <ccr@tnsp.org> parents: 1300 diff changeset	757 static int dmWritePPMRow(void cbdata, const Uint8 row, const size_t len)
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	758 {
1609 c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1583 diff changeset	759 if (dmf_write_str((DMResource *) cbdata, row, len))
808 f8126fa1df9b Use dmlib error code return value in cases where a plain boolean was used Matti Hamalainen <ccr@tnsp.org> parents: 800 diff changeset	760 return DMERR_OK;
f8126fa1df9b Use dmlib error code return value in cases where a plain boolean was used Matti Hamalainen <ccr@tnsp.org> parents: 800 diff changeset	761 else
f8126fa1df9b Use dmlib error code return value in cases where a plain boolean was used Matti Hamalainen <ccr@tnsp.org> parents: 800 diff changeset	762 return DMERR_FWRITE;
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	763 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	764
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	765
1886 1af79412f249 Remove the stdio FILE support from libgfx API, now only DMResource is supported. Matti Hamalainen <ccr@tnsp.org> parents: 1881 diff changeset	766 int dmWritePPMImage(DMResource fp, const DMImage img, const DMImageConvSpec *spec)
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	767 {
1290 e7dc9bb9777e Rename struct DMImageSpec to DMImageConvSpec. Matti Hamalainen <ccr@tnsp.org> parents: 1288 diff changeset	768 DMImageConvSpec tmpSpec;
2092 614b161c0aa5 Initial support for reading PPM/PGM. Matti Hamalainen <ccr@tnsp.org> parents: 2091 diff changeset	769 char *tmpFmt;
614b161c0aa5 Initial support for reading PPM/PGM. Matti Hamalainen <ccr@tnsp.org> parents: 2091 diff changeset	770
614b161c0aa5 Initial support for reading PPM/PGM. Matti Hamalainen <ccr@tnsp.org> parents: 2091 diff changeset	771 memcpy(&tmpSpec, spec, sizeof(DMImageConvSpec));
614b161c0aa5 Initial support for reading PPM/PGM. Matti Hamalainen <ccr@tnsp.org> parents: 2091 diff changeset	772
614b161c0aa5 Initial support for reading PPM/PGM. Matti Hamalainen <ccr@tnsp.org> parents: 2091 diff changeset	773 switch (spec->format)
614b161c0aa5 Initial support for reading PPM/PGM. Matti Hamalainen <ccr@tnsp.org> parents: 2091 diff changeset	774 {
614b161c0aa5 Initial support for reading PPM/PGM. Matti Hamalainen <ccr@tnsp.org> parents: 2091 diff changeset	775 case DM_COLFMT_RGB:
614b161c0aa5 Initial support for reading PPM/PGM. Matti Hamalainen <ccr@tnsp.org> parents: 2091 diff changeset	776 case DM_COLFMT_RGBA:
614b161c0aa5 Initial support for reading PPM/PGM. Matti Hamalainen <ccr@tnsp.org> parents: 2091 diff changeset	777 case DM_COLFMT_PALETTE:
614b161c0aa5 Initial support for reading PPM/PGM. Matti Hamalainen <ccr@tnsp.org> parents: 2091 diff changeset	778 tmpSpec.format = DM_COLFMT_RGB;
614b161c0aa5 Initial support for reading PPM/PGM. Matti Hamalainen <ccr@tnsp.org> parents: 2091 diff changeset	779 tmpFmt = "6";
614b161c0aa5 Initial support for reading PPM/PGM. Matti Hamalainen <ccr@tnsp.org> parents: 2091 diff changeset	780 break;
614b161c0aa5 Initial support for reading PPM/PGM. Matti Hamalainen <ccr@tnsp.org> parents: 2091 diff changeset	781
614b161c0aa5 Initial support for reading PPM/PGM. Matti Hamalainen <ccr@tnsp.org> parents: 2091 diff changeset	782 case DM_COLFMT_GRAYSCALE:
614b161c0aa5 Initial support for reading PPM/PGM. Matti Hamalainen <ccr@tnsp.org> parents: 2091 diff changeset	783 tmpFmt = "5";
614b161c0aa5 Initial support for reading PPM/PGM. Matti Hamalainen <ccr@tnsp.org> parents: 2091 diff changeset	784 break;
614b161c0aa5 Initial support for reading PPM/PGM. Matti Hamalainen <ccr@tnsp.org> parents: 2091 diff changeset	785
614b161c0aa5 Initial support for reading PPM/PGM. Matti Hamalainen <ccr@tnsp.org> parents: 2091 diff changeset	786 default:
614b161c0aa5 Initial support for reading PPM/PGM. Matti Hamalainen <ccr@tnsp.org> parents: 2091 diff changeset	787 return dmError(DMERR_NOT_SUPPORTED,
614b161c0aa5 Initial support for reading PPM/PGM. Matti Hamalainen <ccr@tnsp.org> parents: 2091 diff changeset	788 "PPM: Not a supported color format for PPM/PGM format image.\n");
614b161c0aa5 Initial support for reading PPM/PGM. Matti Hamalainen <ccr@tnsp.org> parents: 2091 diff changeset	789 }
1288 6c8b19d1d196 More work on libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1287 diff changeset	790
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	791 // Write PPM header
1609 c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1583 diff changeset	792 char *tmp = dm_strdup_printf(
2092 614b161c0aa5 Initial support for reading PPM/PGM. Matti Hamalainen <ccr@tnsp.org> parents: 2091 diff changeset	793 "P%s\n%d %d\n255\n",
614b161c0aa5 Initial support for reading PPM/PGM. Matti Hamalainen <ccr@tnsp.org> parents: 2091 diff changeset	794 tmpFmt,
902 c6c480e8e1c8 Add separate X and Y scaling to gfxconv and libgfx outputters. Matti Hamalainen <ccr@tnsp.org> parents: 858 diff changeset	795 img->width * spec->scaleX,
c6c480e8e1c8 Add separate X and Y scaling to gfxconv and libgfx outputters. Matti Hamalainen <ccr@tnsp.org> parents: 858 diff changeset	796 img->height * spec->scaleY);
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	797
1609 c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1583 diff changeset	798 if (tmp == NULL)
c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1583 diff changeset	799 return DMERR_MALLOC;
c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1583 diff changeset	800
c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1583 diff changeset	801 dmfputs(tmp, fp);
c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1583 diff changeset	802 dmFree(tmp);
c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1583 diff changeset	803
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	804 // Write image data
1288 6c8b19d1d196 More work on libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1287 diff changeset	805 return dmWriteImageData(img, (void *) fp, dmWritePPMRow, &tmpSpec);
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	806 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	807
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	808
2092 614b161c0aa5 Initial support for reading PPM/PGM. Matti Hamalainen <ccr@tnsp.org> parents: 2091 diff changeset	809 int dmReadPPMImage(DMResource fp, DMImage *pimg)
614b161c0aa5 Initial support for reading PPM/PGM. Matti Hamalainen <ccr@tnsp.org> parents: 2091 diff changeset	810 {
614b161c0aa5 Initial support for reading PPM/PGM. Matti Hamalainen <ccr@tnsp.org> parents: 2091 diff changeset	811 DMImage *img = NULL;
614b161c0aa5 Initial support for reading PPM/PGM. Matti Hamalainen <ccr@tnsp.org> parents: 2091 diff changeset	812 unsigned int width, height;
614b161c0aa5 Initial support for reading PPM/PGM. Matti Hamalainen <ccr@tnsp.org> parents: 2091 diff changeset	813 int itype, res = DMERR_OK;
614b161c0aa5 Initial support for reading PPM/PGM. Matti Hamalainen <ccr@tnsp.org> parents: 2091 diff changeset	814 char hdr1[8], hdr2[32], hdr3[16];
614b161c0aa5 Initial support for reading PPM/PGM. Matti Hamalainen <ccr@tnsp.org> parents: 2091 diff changeset	815
614b161c0aa5 Initial support for reading PPM/PGM. Matti Hamalainen <ccr@tnsp.org> parents: 2091 diff changeset	816 // Read PPM header
614b161c0aa5 Initial support for reading PPM/PGM. Matti Hamalainen <ccr@tnsp.org> parents: 2091 diff changeset	817 if (dmfgets(hdr1, sizeof(hdr1), fp) == NULL \|\|
614b161c0aa5 Initial support for reading PPM/PGM. Matti Hamalainen <ccr@tnsp.org> parents: 2091 diff changeset	818 dmfgets(hdr2, sizeof(hdr2), fp) == NULL \|\|
614b161c0aa5 Initial support for reading PPM/PGM. Matti Hamalainen <ccr@tnsp.org> parents: 2091 diff changeset	819 dmfgets(hdr3, sizeof(hdr3), fp) == NULL)
614b161c0aa5 Initial support for reading PPM/PGM. Matti Hamalainen <ccr@tnsp.org> parents: 2091 diff changeset	820 {
614b161c0aa5 Initial support for reading PPM/PGM. Matti Hamalainen <ccr@tnsp.org> parents: 2091 diff changeset	821 res = dmError(DMERR_FREAD,
614b161c0aa5 Initial support for reading PPM/PGM. Matti Hamalainen <ccr@tnsp.org> parents: 2091 diff changeset	822 "PPM: Could not read image header data.\n");
614b161c0aa5 Initial support for reading PPM/PGM. Matti Hamalainen <ccr@tnsp.org> parents: 2091 diff changeset	823 goto error;
614b161c0aa5 Initial support for reading PPM/PGM. Matti Hamalainen <ccr@tnsp.org> parents: 2091 diff changeset	824 }
614b161c0aa5 Initial support for reading PPM/PGM. Matti Hamalainen <ccr@tnsp.org> parents: 2091 diff changeset	825
614b161c0aa5 Initial support for reading PPM/PGM. Matti Hamalainen <ccr@tnsp.org> parents: 2091 diff changeset	826 if (hdr1[0] != 'P' \|\| !isdigit(hdr1[1]) \|\|
614b161c0aa5 Initial support for reading PPM/PGM. Matti Hamalainen <ccr@tnsp.org> parents: 2091 diff changeset	827 !isdigit(hdr2[0]) \|\| !isdigit(hdr3[0]))
614b161c0aa5 Initial support for reading PPM/PGM. Matti Hamalainen <ccr@tnsp.org> parents: 2091 diff changeset	828 {
614b161c0aa5 Initial support for reading PPM/PGM. Matti Hamalainen <ccr@tnsp.org> parents: 2091 diff changeset	829 res = dmError(DMERR_NOT_SUPPORTED,
614b161c0aa5 Initial support for reading PPM/PGM. Matti Hamalainen <ccr@tnsp.org> parents: 2091 diff changeset	830 "PPM: Not a supported PPM/PGM format image.\n");
614b161c0aa5 Initial support for reading PPM/PGM. Matti Hamalainen <ccr@tnsp.org> parents: 2091 diff changeset	831 goto error;
614b161c0aa5 Initial support for reading PPM/PGM. Matti Hamalainen <ccr@tnsp.org> parents: 2091 diff changeset	832 }
614b161c0aa5 Initial support for reading PPM/PGM. Matti Hamalainen <ccr@tnsp.org> parents: 2091 diff changeset	833
614b161c0aa5 Initial support for reading PPM/PGM. Matti Hamalainen <ccr@tnsp.org> parents: 2091 diff changeset	834 switch (hdr1[1])
614b161c0aa5 Initial support for reading PPM/PGM. Matti Hamalainen <ccr@tnsp.org> parents: 2091 diff changeset	835 {
614b161c0aa5 Initial support for reading PPM/PGM. Matti Hamalainen <ccr@tnsp.org> parents: 2091 diff changeset	836 case '6': itype = DM_COLFMT_RGB; break;
614b161c0aa5 Initial support for reading PPM/PGM. Matti Hamalainen <ccr@tnsp.org> parents: 2091 diff changeset	837 case '5': itype = DM_COLFMT_GRAYSCALE; break;
614b161c0aa5 Initial support for reading PPM/PGM. Matti Hamalainen <ccr@tnsp.org> parents: 2091 diff changeset	838 default:
614b161c0aa5 Initial support for reading PPM/PGM. Matti Hamalainen <ccr@tnsp.org> parents: 2091 diff changeset	839 res = dmError(DMERR_NOT_SUPPORTED,
2094 4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	840 "PPM: Unsupported PPM/PNM/PGM subtype.\n");
2092 614b161c0aa5 Initial support for reading PPM/PGM. Matti Hamalainen <ccr@tnsp.org> parents: 2091 diff changeset	841 goto error;
614b161c0aa5 Initial support for reading PPM/PGM. Matti Hamalainen <ccr@tnsp.org> parents: 2091 diff changeset	842 }
614b161c0aa5 Initial support for reading PPM/PGM. Matti Hamalainen <ccr@tnsp.org> parents: 2091 diff changeset	843
614b161c0aa5 Initial support for reading PPM/PGM. Matti Hamalainen <ccr@tnsp.org> parents: 2091 diff changeset	844 if (sscanf(hdr2, "%u %u", &width, &height) != 2)
614b161c0aa5 Initial support for reading PPM/PGM. Matti Hamalainen <ccr@tnsp.org> parents: 2091 diff changeset	845 {
614b161c0aa5 Initial support for reading PPM/PGM. Matti Hamalainen <ccr@tnsp.org> parents: 2091 diff changeset	846 res = dmError(DMERR_INVALID_DATA,
614b161c0aa5 Initial support for reading PPM/PGM. Matti Hamalainen <ccr@tnsp.org> parents: 2091 diff changeset	847 "PPM: Invalid PPM/PGM image dimensions.\n");
614b161c0aa5 Initial support for reading PPM/PGM. Matti Hamalainen <ccr@tnsp.org> parents: 2091 diff changeset	848 goto error;
614b161c0aa5 Initial support for reading PPM/PGM. Matti Hamalainen <ccr@tnsp.org> parents: 2091 diff changeset	849 }
614b161c0aa5 Initial support for reading PPM/PGM. Matti Hamalainen <ccr@tnsp.org> parents: 2091 diff changeset	850
2094 4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	851 dmMsg(2, "PPM: %d x %d, type=%d\n",
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	852 width, height, itype);
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	853
2092 614b161c0aa5 Initial support for reading PPM/PGM. Matti Hamalainen <ccr@tnsp.org> parents: 2091 diff changeset	854 if ((*pimg = img = dmImageAlloc(width, height, itype, -1)) == NULL)
614b161c0aa5 Initial support for reading PPM/PGM. Matti Hamalainen <ccr@tnsp.org> parents: 2091 diff changeset	855 {
614b161c0aa5 Initial support for reading PPM/PGM. Matti Hamalainen <ccr@tnsp.org> parents: 2091 diff changeset	856 res = dmError(DMERR_MALLOC,
614b161c0aa5 Initial support for reading PPM/PGM. Matti Hamalainen <ccr@tnsp.org> parents: 2091 diff changeset	857 "PPM: Could not allocate image data.\n");
614b161c0aa5 Initial support for reading PPM/PGM. Matti Hamalainen <ccr@tnsp.org> parents: 2091 diff changeset	858 goto error;
614b161c0aa5 Initial support for reading PPM/PGM. Matti Hamalainen <ccr@tnsp.org> parents: 2091 diff changeset	859 }
614b161c0aa5 Initial support for reading PPM/PGM. Matti Hamalainen <ccr@tnsp.org> parents: 2091 diff changeset	860
2094 4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	861 if (!dmf_read_str(fp, img->data, img->size))
2092 614b161c0aa5 Initial support for reading PPM/PGM. Matti Hamalainen <ccr@tnsp.org> parents: 2091 diff changeset	862 {
614b161c0aa5 Initial support for reading PPM/PGM. Matti Hamalainen <ccr@tnsp.org> parents: 2091 diff changeset	863 res = dmError(DMERR_FREAD,
614b161c0aa5 Initial support for reading PPM/PGM. Matti Hamalainen <ccr@tnsp.org> parents: 2091 diff changeset	864 "PPM: Could not read image data.\n");
614b161c0aa5 Initial support for reading PPM/PGM. Matti Hamalainen <ccr@tnsp.org> parents: 2091 diff changeset	865 goto error;
614b161c0aa5 Initial support for reading PPM/PGM. Matti Hamalainen <ccr@tnsp.org> parents: 2091 diff changeset	866 }
614b161c0aa5 Initial support for reading PPM/PGM. Matti Hamalainen <ccr@tnsp.org> parents: 2091 diff changeset	867
614b161c0aa5 Initial support for reading PPM/PGM. Matti Hamalainen <ccr@tnsp.org> parents: 2091 diff changeset	868 error:
614b161c0aa5 Initial support for reading PPM/PGM. Matti Hamalainen <ccr@tnsp.org> parents: 2091 diff changeset	869
614b161c0aa5 Initial support for reading PPM/PGM. Matti Hamalainen <ccr@tnsp.org> parents: 2091 diff changeset	870 return res;
614b161c0aa5 Initial support for reading PPM/PGM. Matti Hamalainen <ccr@tnsp.org> parents: 2091 diff changeset	871 }
614b161c0aa5 Initial support for reading PPM/PGM. Matti Hamalainen <ccr@tnsp.org> parents: 2091 diff changeset	872
614b161c0aa5 Initial support for reading PPM/PGM. Matti Hamalainen <ccr@tnsp.org> parents: 2091 diff changeset	873
614b161c0aa5 Initial support for reading PPM/PGM. Matti Hamalainen <ccr@tnsp.org> parents: 2091 diff changeset	874 static int fmtProbePPM(const Uint8 *buf, const size_t len)
614b161c0aa5 Initial support for reading PPM/PGM. Matti Hamalainen <ccr@tnsp.org> parents: 2091 diff changeset	875 {
614b161c0aa5 Initial support for reading PPM/PGM. Matti Hamalainen <ccr@tnsp.org> parents: 2091 diff changeset	876 if (len > 32 &&
614b161c0aa5 Initial support for reading PPM/PGM. Matti Hamalainen <ccr@tnsp.org> parents: 2091 diff changeset	877 buf[0] == 'P' &&
2096 6b2bac1e3445 Improve PPM/PNM/PGM probing. Matti Hamalainen <ccr@tnsp.org> parents: 2095 diff changeset	878 (buf[1] == '5' \|\| buf[1] == '6') &&
2092 614b161c0aa5 Initial support for reading PPM/PGM. Matti Hamalainen <ccr@tnsp.org> parents: 2091 diff changeset	879 buf[2] == 0x0a && isdigit(buf[3]))
614b161c0aa5 Initial support for reading PPM/PGM. Matti Hamalainen <ccr@tnsp.org> parents: 2091 diff changeset	880 return DM_PROBE_SCORE_MAX;
614b161c0aa5 Initial support for reading PPM/PGM. Matti Hamalainen <ccr@tnsp.org> parents: 2091 diff changeset	881
614b161c0aa5 Initial support for reading PPM/PGM. Matti Hamalainen <ccr@tnsp.org> parents: 2091 diff changeset	882 return DM_PROBE_SCORE_FALSE;
614b161c0aa5 Initial support for reading PPM/PGM. Matti Hamalainen <ccr@tnsp.org> parents: 2091 diff changeset	883 }
614b161c0aa5 Initial support for reading PPM/PGM. Matti Hamalainen <ccr@tnsp.org> parents: 2091 diff changeset	884
614b161c0aa5 Initial support for reading PPM/PGM. Matti Hamalainen <ccr@tnsp.org> parents: 2091 diff changeset	885
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	886 #ifdef DM_USE_LIBPNG
1613 70b04c16aa40 Move format probe functions near to their other functions. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	887 static int fmtProbePNG(const Uint8 *buf, const size_t len)
70b04c16aa40 Move format probe functions near to their other functions. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	888 {
70b04c16aa40 Move format probe functions near to their other functions. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	889 if (len > 64 && buf[0] == 0x89 &&
70b04c16aa40 Move format probe functions near to their other functions. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	890 buf[1] == 'P' && buf[2] == 'N' && buf[3] == 'G' &&
70b04c16aa40 Move format probe functions near to their other functions. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	891 buf[4] == 0x0d && buf[5] == 0x0a)
70b04c16aa40 Move format probe functions near to their other functions. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	892 {
70b04c16aa40 Move format probe functions near to their other functions. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	893 if (buf[12] == 'I' && buf[13] == 'H' &&
70b04c16aa40 Move format probe functions near to their other functions. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	894 buf[14] == 'D' && buf[15] == 'R')
70b04c16aa40 Move format probe functions near to their other functions. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	895 return DM_PROBE_SCORE_MAX;
70b04c16aa40 Move format probe functions near to their other functions. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	896 else
70b04c16aa40 Move format probe functions near to their other functions. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	897 return DM_PROBE_SCORE_GOOD;
70b04c16aa40 Move format probe functions near to their other functions. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	898 }
70b04c16aa40 Move format probe functions near to their other functions. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	899
70b04c16aa40 Move format probe functions near to their other functions. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	900 return DM_PROBE_SCORE_FALSE;
70b04c16aa40 Move format probe functions near to their other functions. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	901 }
70b04c16aa40 Move format probe functions near to their other functions. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	902
70b04c16aa40 Move format probe functions near to their other functions. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	903
1301 e03f20d0f785 Constify. Matti Hamalainen <ccr@tnsp.org> parents: 1300 diff changeset	904 static int dmWritePNGRow(void cbdata, const Uint8 row, const size_t len)
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	905 {
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	906 png_structp png_ptr = cbdata;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	907 (void) len;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	908
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	909 if (setjmp(png_jmpbuf(png_ptr)))
808 f8126fa1df9b Use dmlib error code return value in cases where a plain boolean was used Matti Hamalainen <ccr@tnsp.org> parents: 800 diff changeset	910 return DMERR_INTERNAL;
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	911
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	912 png_write_row(png_ptr, row);
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	913
808 f8126fa1df9b Use dmlib error code return value in cases where a plain boolean was used Matti Hamalainen <ccr@tnsp.org> parents: 800 diff changeset	914 return DMERR_OK;
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	915 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	916
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	917
1609 c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1583 diff changeset	918 static void dmPNGWriteData(png_structp png_ptr, png_bytep data, png_size_t length)
c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1583 diff changeset	919 {
c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1583 diff changeset	920 DMResource res = (DMResource ) png_get_io_ptr(png_ptr);
c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1583 diff changeset	921
c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1583 diff changeset	922 // XXX TODO: How the fuck does one do error handling here?
c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1583 diff changeset	923 dmf_write_str(res, data, length);
c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1583 diff changeset	924 }
c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1583 diff changeset	925
c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1583 diff changeset	926
c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1583 diff changeset	927 static void dmPNGWriteFlush(png_structp png_ptr)
c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1583 diff changeset	928 {
c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1583 diff changeset	929 (void) png_ptr;
c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1583 diff changeset	930 }
c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1583 diff changeset	931
c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1583 diff changeset	932
1886 1af79412f249 Remove the stdio FILE support from libgfx API, now only DMResource is supported. Matti Hamalainen <ccr@tnsp.org> parents: 1881 diff changeset	933 int dmWritePNGImage(DMResource fp, const DMImage img, const DMImageConvSpec *spec)
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	934 {
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	935 png_structp png_ptr = NULL;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	936 png_infop info_ptr = NULL;
1304 e968b259605b Fix a warning about potentially clobbered variable due to setjmp() use. Matti Hamalainen <ccr@tnsp.org> parents: 1303 diff changeset	937 int fmt, res;
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	938
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	939 // Create PNG structures
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	940 png_ptr = png_create_write_struct(
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	941 PNG_LIBPNG_VER_STRING,
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	942 NULL, NULL, NULL);
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	943
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	944 if (png_ptr == NULL)
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	945 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	946 res = dmError(DMERR_MALLOC,
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	947 "PNG: png_create_write_struct() failed.\n");
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	948 goto error;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	949 }
1102 e06abfde6c39 Cosmetics pass: Remove excess whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	950
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	951 info_ptr = png_create_info_struct(png_ptr);
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	952 if (info_ptr == NULL)
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	953 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	954 res = dmError(DMERR_INIT_FAIL,
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	955 "PNG: png_create_info_struct(%p) failed.\n",
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	956 png_ptr);
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	957 goto error;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	958 }
1102 e06abfde6c39 Cosmetics pass: Remove excess whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	959
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	960 if (setjmp(png_jmpbuf(png_ptr)))
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	961 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	962 res = dmError(DMERR_INIT_FAIL,
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	963 "PNG: Error during image writing..\n");
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	964 goto error;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	965 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	966
1304 e968b259605b Fix a warning about potentially clobbered variable due to setjmp() use. Matti Hamalainen <ccr@tnsp.org> parents: 1303 diff changeset	967 res = DMERR_OK;
1609 c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1583 diff changeset	968 png_set_write_fn(png_ptr, fp, dmPNGWriteData, dmPNGWriteFlush);
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	969
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	970 // Write PNG header info
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	971 switch (spec->format)
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	972 {
2093 d17512dbb4ef Some work on reading >8bpp images. Matti Hamalainen <ccr@tnsp.org> parents: 2092 diff changeset	973 case DM_COLFMT_PALETTE : fmt = PNG_COLOR_TYPE_PALETTE; break;
d17512dbb4ef Some work on reading >8bpp images. Matti Hamalainen <ccr@tnsp.org> parents: 2092 diff changeset	974 case DM_COLFMT_GRAYSCALE : fmt = PNG_COLOR_TYPE_GRAY; break;
d17512dbb4ef Some work on reading >8bpp images. Matti Hamalainen <ccr@tnsp.org> parents: 2092 diff changeset	975 case DM_COLFMT_RGB : fmt = PNG_COLOR_TYPE_RGB; break;
d17512dbb4ef Some work on reading >8bpp images. Matti Hamalainen <ccr@tnsp.org> parents: 2092 diff changeset	976 case DM_COLFMT_RGBA : fmt = PNG_COLOR_TYPE_RGB_ALPHA; break;
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	977 default:
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	978 res = dmError(DMERR_NOT_SUPPORTED,
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	979 "PNG: Unsupported image format %d.\n",
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	980 spec->format);
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	981 goto error;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	982 }
1102 e06abfde6c39 Cosmetics pass: Remove excess whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	983
2022 eb6dafdd36dc Add option -C for controlling output file compression (PNG and IFF for now) in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 2020 diff changeset	984 png_set_compression_level(png_ptr, spec->compression);
eb6dafdd36dc Add option -C for controlling output file compression (PNG and IFF for now) in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 2020 diff changeset	985
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	986 png_set_IHDR(png_ptr, info_ptr,
902 c6c480e8e1c8 Add separate X and Y scaling to gfxconv and libgfx outputters. Matti Hamalainen <ccr@tnsp.org> parents: 858 diff changeset	987 img->width * spec->scaleX,
c6c480e8e1c8 Add separate X and Y scaling to gfxconv and libgfx outputters. Matti Hamalainen <ccr@tnsp.org> parents: 858 diff changeset	988 img->height * spec->scaleY,
2091 3b3acb6b4ba0 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2086 diff changeset	989 8, // bits per component: TODO: FIXME: calculate and use
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	990 fmt,
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	991 PNG_INTERLACE_NONE,
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	992 PNG_COMPRESSION_TYPE_DEFAULT,
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	993 PNG_FILTER_TYPE_DEFAULT);
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	994
1287 32051ad352c8 Adjust debug messages and debug message levels in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1286 diff changeset	995 dmMsg(2, "PNG: %d x %d, depth=%d, type=%d\n",
902 c6c480e8e1c8 Add separate X and Y scaling to gfxconv and libgfx outputters. Matti Hamalainen <ccr@tnsp.org> parents: 858 diff changeset	996 img->width * spec->scaleX,
c6c480e8e1c8 Add separate X and Y scaling to gfxconv and libgfx outputters. Matti Hamalainen <ccr@tnsp.org> parents: 858 diff changeset	997 img->height * spec->scaleY,
460 0af039b6c0ae Improve transparent color handling. Matti Hamalainen <ccr@tnsp.org> parents: 453 diff changeset	998 8, fmt);
0af039b6c0ae Improve transparent color handling. Matti Hamalainen <ccr@tnsp.org> parents: 453 diff changeset	999
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1000 // Palette
1801 0562dd55a1f6 s/DM_IFMT_/DM_COLFMT_/g Matti Hamalainen <ccr@tnsp.org> parents: 1800 diff changeset	1001 if (spec->format == DM_COLFMT_PALETTE)
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1002 {
858 e7019bd83cca Fix potential longjmp clobbering of variable. Matti Hamalainen <ccr@tnsp.org> parents: 834 diff changeset	1003 png_colorp palette = png_malloc(png_ptr, PNG_MAX_PALETTE_LENGTH * sizeof(png_color));
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1004
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1005 if (palette == NULL)
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1006 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1007 res = dmError(DMERR_MALLOC,
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1008 "PNG: Could not allocate palette structure.");
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1009 goto error;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1010 }
1102 e06abfde6c39 Cosmetics pass: Remove excess whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	1011
1167 848a88ce7a57 Use dmMemset(). Matti Hamalainen <ccr@tnsp.org> parents: 1152 diff changeset	1012 dmMemset(palette, 0, PNG_MAX_PALETTE_LENGTH * sizeof(png_color));
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1013
2094 4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	1014 for (int i = 0; i < img->pal->ncolors; i++)
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1015 {
2094 4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	1016 palette[i].red = img->pal->colors[i].r;
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	1017 palette[i].green = img->pal->colors[i].g;
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	1018 palette[i].blue = img->pal->colors[i].b;
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1019 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1020
2094 4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	1021 png_set_PLTE(png_ptr, info_ptr, palette, img->pal->ncolors);
1938 a8e475eede4a Fix two memory leaks in the PNG writer/reader of libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1921 diff changeset	1022 png_free(png_ptr, palette);
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1023 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1024
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1025 // png_set_gAMA(png_ptr, info_ptr, 2.2);
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1026
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1027 png_write_info(png_ptr, info_ptr);
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1028
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1029
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1030 // Write compressed image data
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1031 dmWriteImageData(img, (void *) png_ptr, dmWritePNGRow, spec);
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1032
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1033 // Write footer
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1034 png_write_end(png_ptr, NULL);
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1035
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1036 error:
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1037 if (png_ptr && info_ptr)
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1038 png_destroy_write_struct(&png_ptr, &info_ptr);
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1039
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1040 return res;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1041 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1042
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1043
1609 c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1583 diff changeset	1044 void dmPNGReadData(png_structp png_ptr, png_bytep data, png_size_t length)
c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1583 diff changeset	1045 {
c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1583 diff changeset	1046 DMResource res = (DMResource ) png_get_io_ptr(png_ptr);
c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1583 diff changeset	1047
c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1583 diff changeset	1048 // XXX TODO: How the fuck does one do error handling here?
c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1583 diff changeset	1049 dmf_read_str(res, data, length);
c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1583 diff changeset	1050 }
c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1583 diff changeset	1051
1886 1af79412f249 Remove the stdio FILE support from libgfx API, now only DMResource is supported. Matti Hamalainen <ccr@tnsp.org> parents: 1881 diff changeset	1052
1af79412f249 Remove the stdio FILE support from libgfx API, now only DMResource is supported. Matti Hamalainen <ccr@tnsp.org> parents: 1881 diff changeset	1053 int dmReadPNGImage(DMResource fp, DMImage *pimg)
453 349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	1054 {
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	1055 png_structp png_ptr = NULL;
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	1056 png_infop info_ptr = NULL;
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	1057 png_colorp palette = NULL;
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	1058 png_bytep *row_pointers = NULL;
460 0af039b6c0ae Improve transparent color handling. Matti Hamalainen <ccr@tnsp.org> parents: 453 diff changeset	1059 png_bytep trans = NULL;
1940 c77019065b96 Initialize two variables to zero, as valgrind complains about them despite Matti Hamalainen <ccr@tnsp.org> parents: 1939 diff changeset	1060 png_uint_32 width, height, res_x = 0, res_y = 0;
2094 4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	1061 int res, itype, bit_depth, color_type, ncolors, ntrans, unit_type;
453 349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	1062 DMImage *img;
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	1063
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	1064 // Create PNG structures
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	1065 png_ptr = png_create_read_struct(
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	1066 PNG_LIBPNG_VER_STRING,
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	1067 NULL, NULL, NULL);
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	1068
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	1069 if (png_ptr == NULL)
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	1070 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1071 res = dmError(DMERR_MALLOC,
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1072 "PNG: png_create_write_struct() failed.\n");
453 349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	1073 goto error;
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	1074 }
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	1075
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	1076 info_ptr = png_create_info_struct(png_ptr);
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	1077 if (info_ptr == NULL)
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	1078 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1079 res = dmError(DMERR_INIT_FAIL,
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1080 "PNG: png_create_info_struct(%p) failed.\n",
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1081 png_ptr);
453 349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	1082 goto error;
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	1083 }
1102 e06abfde6c39 Cosmetics pass: Remove excess whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	1084
453 349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	1085 if (setjmp(png_jmpbuf(png_ptr)))
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	1086 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1087 res = dmError(DMERR_INIT_FAIL,
1291 2c4acbc3e7bf More work on libgfx etc. Matti Hamalainen <ccr@tnsp.org> parents: 1290 diff changeset	1088 "PNG: Error during image reading.\n");
453 349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	1089 goto error;
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	1090 }
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	1091
1609 c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1583 diff changeset	1092 png_set_read_fn(png_ptr, fp, dmPNGReadData);
453 349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	1093
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	1094 // Read image information
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	1095 png_read_info(png_ptr, info_ptr);
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	1096
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	1097 png_get_IHDR(png_ptr, info_ptr, &width, &height,
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	1098 &bit_depth, &color_type, NULL, NULL, NULL);
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	1099
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	1100 if (width < 1 \|\| height < 1)
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	1101 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1102 res = dmError(DMERR_INVALID_DATA,
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1103 "PNG: Invalid width or height (%d x %d)\n",
453 349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	1104 width, height);
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	1105 goto error;
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	1106 }
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	1107
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	1108 switch (color_type)
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	1109 {
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	1110 case PNG_COLOR_TYPE_GRAY:
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	1111 if (bit_depth > 8)
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	1112 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1113 res = dmError(DMERR_NOT_SUPPORTED,
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1114 "PNG: Unsupported bit depth for grayscale image: %d\n",
453 349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	1115 bit_depth);
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	1116 goto error;
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	1117 }
2093 d17512dbb4ef Some work on reading >8bpp images. Matti Hamalainen <ccr@tnsp.org> parents: 2092 diff changeset	1118
d17512dbb4ef Some work on reading >8bpp images. Matti Hamalainen <ccr@tnsp.org> parents: 2092 diff changeset	1119 if (bit_depth < 8)
d17512dbb4ef Some work on reading >8bpp images. Matti Hamalainen <ccr@tnsp.org> parents: 2092 diff changeset	1120 png_set_expand_gray_1_2_4_to_8(png_ptr);
d17512dbb4ef Some work on reading >8bpp images. Matti Hamalainen <ccr@tnsp.org> parents: 2092 diff changeset	1121
d17512dbb4ef Some work on reading >8bpp images. Matti Hamalainen <ccr@tnsp.org> parents: 2092 diff changeset	1122 itype = DM_COLFMT_GRAYSCALE;
453 349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	1123 break;
1102 e06abfde6c39 Cosmetics pass: Remove excess whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	1124
453 349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	1125 case PNG_COLOR_TYPE_PALETTE:
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	1126 png_set_packing(png_ptr);
2093 d17512dbb4ef Some work on reading >8bpp images. Matti Hamalainen <ccr@tnsp.org> parents: 2092 diff changeset	1127 itype = DM_COLFMT_PALETTE;
d17512dbb4ef Some work on reading >8bpp images. Matti Hamalainen <ccr@tnsp.org> parents: 2092 diff changeset	1128 break;
d17512dbb4ef Some work on reading >8bpp images. Matti Hamalainen <ccr@tnsp.org> parents: 2092 diff changeset	1129
d17512dbb4ef Some work on reading >8bpp images. Matti Hamalainen <ccr@tnsp.org> parents: 2092 diff changeset	1130 case PNG_COLOR_TYPE_RGB:
d17512dbb4ef Some work on reading >8bpp images. Matti Hamalainen <ccr@tnsp.org> parents: 2092 diff changeset	1131 itype = DM_COLFMT_RGB;
d17512dbb4ef Some work on reading >8bpp images. Matti Hamalainen <ccr@tnsp.org> parents: 2092 diff changeset	1132 break;
d17512dbb4ef Some work on reading >8bpp images. Matti Hamalainen <ccr@tnsp.org> parents: 2092 diff changeset	1133
d17512dbb4ef Some work on reading >8bpp images. Matti Hamalainen <ccr@tnsp.org> parents: 2092 diff changeset	1134 case PNG_COLOR_TYPE_RGBA:
d17512dbb4ef Some work on reading >8bpp images. Matti Hamalainen <ccr@tnsp.org> parents: 2092 diff changeset	1135 itype = DM_COLFMT_RGBA;
453 349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	1136 break;
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	1137
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	1138 default:
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1139 res = dmError(DMERR_NOT_SUPPORTED,
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1140 "PNG: RGB/RGBA images not supported for loading.\n");
453 349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	1141 goto error;
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	1142 }
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	1143
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	1144 // Allocate image
1287 32051ad352c8 Adjust debug messages and debug message levels in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1286 diff changeset	1145 dmMsg(2, "PNG: %d x %d, depth=%d, type=%d\n",
453 349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	1146 width, height, bit_depth, color_type);
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	1147
1300 fd442faa705f "Fix" the PNG/ILBM decoding to not use actual bitdepths for indexed images, but force 8bits. Matti Hamalainen <ccr@tnsp.org> parents: 1299 diff changeset	1148 if ((*pimg = img = dmImageAlloc(width, height,
2093 d17512dbb4ef Some work on reading >8bpp images. Matti Hamalainen <ccr@tnsp.org> parents: 2092 diff changeset	1149 itype,
1300 fd442faa705f "Fix" the PNG/ILBM decoding to not use actual bitdepths for indexed images, but force 8bits. Matti Hamalainen <ccr@tnsp.org> parents: 1299 diff changeset	1150 // XXX TODO? When/if we ever handle < 8bit indexed correctly, we can use the actual bpp
fd442faa705f "Fix" the PNG/ILBM decoding to not use actual bitdepths for indexed images, but force 8bits. Matti Hamalainen <ccr@tnsp.org> parents: 1299 diff changeset	1151 -1 /* bit_depth */)) == NULL)
453 349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	1152 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1153 res = dmError(DMERR_MALLOC,
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1154 "PNG: Could not allocate image data.\n");
453 349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	1155 goto error;
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	1156 }
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	1157
1628 a549d33d543a Add image aspect ratio information. Matti Hamalainen <ccr@tnsp.org> parents: 1627 diff changeset	1158 // Set image aspect ratio
a549d33d543a Add image aspect ratio information. Matti Hamalainen <ccr@tnsp.org> parents: 1627 diff changeset	1159 png_get_pHYs(png_ptr, info_ptr, &res_x, &res_y, &unit_type);
a549d33d543a Add image aspect ratio information. Matti Hamalainen <ccr@tnsp.org> parents: 1627 diff changeset	1160
a549d33d543a Add image aspect ratio information. Matti Hamalainen <ccr@tnsp.org> parents: 1627 diff changeset	1161 if (res_x > 0 && res_y > 0 &&
a549d33d543a Add image aspect ratio information. Matti Hamalainen <ccr@tnsp.org> parents: 1627 diff changeset	1162 res_y / res_x != (unsigned) (img->height / img->width))
a549d33d543a Add image aspect ratio information. Matti Hamalainen <ccr@tnsp.org> parents: 1627 diff changeset	1163 img->aspect = (float) res_y / (float) res_x;
a549d33d543a Add image aspect ratio information. Matti Hamalainen <ccr@tnsp.org> parents: 1627 diff changeset	1164
453 349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	1165 // ...
1938 a8e475eede4a Fix two memory leaks in the PNG writer/reader of libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1921 diff changeset	1166 if ((row_pointers = png_malloc(png_ptr, height * sizeof(png_bytep))) == NULL)
a8e475eede4a Fix two memory leaks in the PNG writer/reader of libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1921 diff changeset	1167 goto error;
a8e475eede4a Fix two memory leaks in the PNG writer/reader of libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1921 diff changeset	1168
2094 4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	1169 for (int i = 0; i < img->height; i++)
453 349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	1170 row_pointers[i] = img->data + (i * img->pitch);
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	1171
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	1172 png_read_image(png_ptr, row_pointers);
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	1173
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	1174 png_read_end(png_ptr, NULL);
1945 80d67f0e8567 Better fix for the PNG reader memory leak. Matti Hamalainen <ccr@tnsp.org> parents: 1942 diff changeset	1175 png_free(png_ptr, row_pointers);
453 349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	1176
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	1177 // Create palette
2093 d17512dbb4ef Some work on reading >8bpp images. Matti Hamalainen <ccr@tnsp.org> parents: 2092 diff changeset	1178 if (color_type == PNG_COLOR_TYPE_PALETTE)
453 349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	1179 {
2093 d17512dbb4ef Some work on reading >8bpp images. Matti Hamalainen <ccr@tnsp.org> parents: 2092 diff changeset	1180 png_get_PLTE(png_ptr, info_ptr, &palette, &ncolors);
d17512dbb4ef Some work on reading >8bpp images. Matti Hamalainen <ccr@tnsp.org> parents: 2092 diff changeset	1181 if (ncolors > 0 && palette != NULL)
d17512dbb4ef Some work on reading >8bpp images. Matti Hamalainen <ccr@tnsp.org> parents: 2092 diff changeset	1182 {
d17512dbb4ef Some work on reading >8bpp images. Matti Hamalainen <ccr@tnsp.org> parents: 2092 diff changeset	1183 dmMsg(2, "PNG: Palette of %d colors found.\n", ncolors);
453 349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	1184
2094 4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	1185 if ((res = dmPaletteAlloc(&(img->pal), ncolors, -1)) != DMERR_OK)
453 349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	1186 goto error;
2094 4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	1187
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	1188 for (int i = 0; i < img->pal->ncolors; i++)
453 349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	1189 {
2094 4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	1190 img->pal->colors[i].r = palette[i].red;
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	1191 img->pal->colors[i].g = palette[i].green;
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	1192 img->pal->colors[i].b = palette[i].blue;
453 349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	1193 }
2093 d17512dbb4ef Some work on reading >8bpp images. Matti Hamalainen <ccr@tnsp.org> parents: 2092 diff changeset	1194 }
d17512dbb4ef Some work on reading >8bpp images. Matti Hamalainen <ccr@tnsp.org> parents: 2092 diff changeset	1195
460 0af039b6c0ae Improve transparent color handling. Matti Hamalainen <ccr@tnsp.org> parents: 453 diff changeset	1196 png_get_tRNS(png_ptr, info_ptr, &trans, &ntrans, NULL);
467 80d09ea85e75 Check for NULL pointers from png_get_tRNS and png_get_PLTE. Matti Hamalainen <ccr@tnsp.org> parents: 465 diff changeset	1197 if (trans != NULL && ntrans > 0)
460 0af039b6c0ae Improve transparent color handling. Matti Hamalainen <ccr@tnsp.org> parents: 453 diff changeset	1198 {
2091 3b3acb6b4ba0 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2086 diff changeset	1199 dmMsg(2, "PNG: %d transparent colors.\n", ntrans);
2094 4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	1200 for (int i = 0; i < img->pal->ncolors && i < ntrans; i++)
467 80d09ea85e75 Check for NULL pointers from png_get_tRNS and png_get_PLTE. Matti Hamalainen <ccr@tnsp.org> parents: 465 diff changeset	1201 {
2094 4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	1202 img->pal->colors[i].a = trans[i];
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	1203 if (img->pal->ctransp < 0 && trans[i] == 0)
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	1204 img->pal->ctransp = i;
467 80d09ea85e75 Check for NULL pointers from png_get_tRNS and png_get_PLTE. Matti Hamalainen <ccr@tnsp.org> parents: 465 diff changeset	1205 }
460 0af039b6c0ae Improve transparent color handling. Matti Hamalainen <ccr@tnsp.org> parents: 453 diff changeset	1206 }
1102 e06abfde6c39 Cosmetics pass: Remove excess whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	1207 }
460 0af039b6c0ae Improve transparent color handling. Matti Hamalainen <ccr@tnsp.org> parents: 453 diff changeset	1208
2094 4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	1209 res = DMERR_OK;
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	1210
453 349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	1211 error:
1939 bc00373e5a90 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 1938 diff changeset	1212 if (png_ptr != NULL && info_ptr != NULL)
453 349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	1213 png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	1214
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	1215 return res;
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	1216 }
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1217 #endif
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1218
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1219
1613 70b04c16aa40 Move format probe functions near to their other functions. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	1220 //
70b04c16aa40 Move format probe functions near to their other functions. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	1221 // Z-Soft PCX format
70b04c16aa40 Move format probe functions near to their other functions. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	1222 //
1279 0d3f5f44c0c4 Somewhat improve PCX read support in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1265 diff changeset	1223 #define DMPCX_PAL_COLORS 16 // Number of internal palette colors
0d3f5f44c0c4 Somewhat improve PCX read support in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1265 diff changeset	1224
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1225 typedef struct
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1226 {
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1227 Uint8 r,g,b;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1228 } DMPCXColor;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1229
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1230
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1231 typedef struct
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1232 {
2091 3b3acb6b4ba0 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2086 diff changeset	1233 Uint8
3b3acb6b4ba0 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2086 diff changeset	1234 manufacturer, // always 0x0a
3b3acb6b4ba0 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2086 diff changeset	1235 version, // Z-Soft PC Paintbrush version:
1288 6c8b19d1d196 More work on libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1287 diff changeset	1236 // 0 = v2.5
6c8b19d1d196 More work on libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1287 diff changeset	1237 // 2 = v2.8 with palette,
6c8b19d1d196 More work on libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1287 diff changeset	1238 // 3 = v2.8 without palette
6c8b19d1d196 More work on libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1287 diff changeset	1239 // 4 = PC Paintbrush for Windows
6c8b19d1d196 More work on libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1287 diff changeset	1240 // 5 = v3.0 or better
2091 3b3acb6b4ba0 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2086 diff changeset	1241 encoding, // usually 0x01 = RLE, 0x00 = uncompressed
3b3acb6b4ba0 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2086 diff changeset	1242 bitsPerPlane; // bits per pixel per plane
1279 0d3f5f44c0c4 Somewhat improve PCX read support in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1265 diff changeset	1243
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1244 Uint16 xmin, ymin, xmax, ymax;
1279 0d3f5f44c0c4 Somewhat improve PCX read support in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1265 diff changeset	1245 Uint16 hres, vres; // resolution in DPI, can be image dimensions as well.
0d3f5f44c0c4 Somewhat improve PCX read support in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1265 diff changeset	1246 DMPCXColor colorMap[DMPCX_PAL_COLORS];
0d3f5f44c0c4 Somewhat improve PCX read support in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1265 diff changeset	1247 Uint8 reserved; // should be set to 0
0d3f5f44c0c4 Somewhat improve PCX read support in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1265 diff changeset	1248 Uint8 nplanes; // number of planes
0d3f5f44c0c4 Somewhat improve PCX read support in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1265 diff changeset	1249 Uint16 bpl; // bytes per plane LINE
0d3f5f44c0c4 Somewhat improve PCX read support in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1265 diff changeset	1250 Uint16 palInfo; // 1 = color/BW, 2 = grayscale
0d3f5f44c0c4 Somewhat improve PCX read support in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1265 diff changeset	1251 Uint16 hScreenSize, vScreenSize;
0d3f5f44c0c4 Somewhat improve PCX read support in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1265 diff changeset	1252 Uint8 filler[54];
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1253 } DMPCXHeader;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1254
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1255
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1256 typedef struct
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1257 {
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1258 DMPCXHeader *header;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1259 Uint8 *buf;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1260 size_t bufLen, bufOffs;
1609 c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1583 diff changeset	1261 DMResource *fp;
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1262 } DMPCXData;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1263
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1264
1613 70b04c16aa40 Move format probe functions near to their other functions. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	1265 static int fmtProbePCX(const Uint8 *buf, const size_t len)
70b04c16aa40 Move format probe functions near to their other functions. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	1266 {
70b04c16aa40 Move format probe functions near to their other functions. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	1267 if (len > 128 + 32 &&
70b04c16aa40 Move format probe functions near to their other functions. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	1268 (buf[1] == 5 \|\| buf[1] == 2 \|\| buf[1] == 3) &&
70b04c16aa40 Move format probe functions near to their other functions. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	1269 buf[2] == 1 &&
70b04c16aa40 Move format probe functions near to their other functions. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	1270 (buf[3] == 8 \|\| buf[3] == 4 \|\| buf[3] == 3 \|\| buf[3] == 1) &&
70b04c16aa40 Move format probe functions near to their other functions. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	1271 buf[65] >= 1 && buf[65] <= 4)
70b04c16aa40 Move format probe functions near to their other functions. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	1272 return DM_PROBE_SCORE_GOOD;
70b04c16aa40 Move format probe functions near to their other functions. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	1273
70b04c16aa40 Move format probe functions near to their other functions. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	1274 return DM_PROBE_SCORE_FALSE;
70b04c16aa40 Move format probe functions near to their other functions. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	1275 }
70b04c16aa40 Move format probe functions near to their other functions. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	1276
70b04c16aa40 Move format probe functions near to their other functions. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	1277
1298 f0d6aac3adc4 Some cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1297 diff changeset	1278 // Returns one byte from row buffer (of length len) at offset soffs,
f0d6aac3adc4 Some cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1297 diff changeset	1279 // OR zero if the offset is outside buffer.
1301 e03f20d0f785 Constify. Matti Hamalainen <ccr@tnsp.org> parents: 1300 diff changeset	1280 static inline Uint8 dmPCXGetByte(const Uint8 *row, const size_t len, const size_t soffs)
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1281 {
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1282 return (soffs < len) ? row[soffs] : 0;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1283 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1284
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1285 static BOOL dmPCXFlush(DMPCXData *pcx)
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1286 {
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1287 BOOL ret = TRUE;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1288 if (pcx->bufOffs > 0)
1609 c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1583 diff changeset	1289 ret = dmf_write_str(pcx->fp, pcx->buf, pcx->bufOffs);
1297 5bd64397453b More work on PCX writer. Matti Hamalainen <ccr@tnsp.org> parents: 1296 diff changeset	1290
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1291 pcx->bufOffs = 0;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1292 return ret;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1293 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1294
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1295 static inline BOOL dmPCXPutByte(DMPCXData *pcx, const Uint8 val)
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1296 {
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1297 if (pcx->bufOffs < pcx->bufLen)
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1298 {
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1299 pcx->buf[pcx->bufOffs++] = val;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1300 return TRUE;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1301 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1302 else
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1303 return dmPCXFlush(pcx);
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1304 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1305
1297 5bd64397453b More work on PCX writer. Matti Hamalainen <ccr@tnsp.org> parents: 1296 diff changeset	1306
5bd64397453b More work on PCX writer. Matti Hamalainen <ccr@tnsp.org> parents: 1296 diff changeset	1307 static int dmPCXPutData(DMPCXData *pcx, const Uint8 data, const int count)
5bd64397453b More work on PCX writer. Matti Hamalainen <ccr@tnsp.org> parents: 1296 diff changeset	1308 {
5bd64397453b More work on PCX writer. Matti Hamalainen <ccr@tnsp.org> parents: 1296 diff changeset	1309 if (count == 1 && (data & 0xC0) != 0xC0)
5bd64397453b More work on PCX writer. Matti Hamalainen <ccr@tnsp.org> parents: 1296 diff changeset	1310 {
5bd64397453b More work on PCX writer. Matti Hamalainen <ccr@tnsp.org> parents: 1296 diff changeset	1311 if (!dmPCXPutByte(pcx, data))
5bd64397453b More work on PCX writer. Matti Hamalainen <ccr@tnsp.org> parents: 1296 diff changeset	1312 return DMERR_FWRITE;
5bd64397453b More work on PCX writer. Matti Hamalainen <ccr@tnsp.org> parents: 1296 diff changeset	1313 }
5bd64397453b More work on PCX writer. Matti Hamalainen <ccr@tnsp.org> parents: 1296 diff changeset	1314 else
5bd64397453b More work on PCX writer. Matti Hamalainen <ccr@tnsp.org> parents: 1296 diff changeset	1315 {
5bd64397453b More work on PCX writer. Matti Hamalainen <ccr@tnsp.org> parents: 1296 diff changeset	1316 if (!dmPCXPutByte(pcx, 0xC0 \| count) \|\|
5bd64397453b More work on PCX writer. Matti Hamalainen <ccr@tnsp.org> parents: 1296 diff changeset	1317 !dmPCXPutByte(pcx, data))
5bd64397453b More work on PCX writer. Matti Hamalainen <ccr@tnsp.org> parents: 1296 diff changeset	1318 return DMERR_FWRITE;
5bd64397453b More work on PCX writer. Matti Hamalainen <ccr@tnsp.org> parents: 1296 diff changeset	1319 }
5bd64397453b More work on PCX writer. Matti Hamalainen <ccr@tnsp.org> parents: 1296 diff changeset	1320 return DMERR_OK;
5bd64397453b More work on PCX writer. Matti Hamalainen <ccr@tnsp.org> parents: 1296 diff changeset	1321 }
5bd64397453b More work on PCX writer. Matti Hamalainen <ccr@tnsp.org> parents: 1296 diff changeset	1322
5bd64397453b More work on PCX writer. Matti Hamalainen <ccr@tnsp.org> parents: 1296 diff changeset	1323
1301 e03f20d0f785 Constify. Matti Hamalainen <ccr@tnsp.org> parents: 1300 diff changeset	1324 static int dmWritePCXRow(void cbdata, const Uint8 row, const size_t len)
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1325 {
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1326 DMPCXData pcx = (DMPCXData ) cbdata;
1297 5bd64397453b More work on PCX writer. Matti Hamalainen <ccr@tnsp.org> parents: 1296 diff changeset	1327 int err;
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1328 size_t soffs = 0;
1102 e06abfde6c39 Cosmetics pass: Remove excess whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	1329
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1330 pcx->bufOffs = 0;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1331
1279 0d3f5f44c0c4 Somewhat improve PCX read support in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1265 diff changeset	1332 for (int plane = 0; plane < pcx->header->nplanes; plane++)
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1333 {
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1334 Uint8 data = dmPCXGetByte(row, len, soffs++),
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1335 count = 1;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1336
1297 5bd64397453b More work on PCX writer. Matti Hamalainen <ccr@tnsp.org> parents: 1296 diff changeset	1337 size_t blen = pcx->header->bpl * pcx->header->nplanes;
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1338 while (soffs < blen)
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1339 {
1297 5bd64397453b More work on PCX writer. Matti Hamalainen <ccr@tnsp.org> parents: 1296 diff changeset	1340 if (data == dmPCXGetByte(row, len, soffs) && count < 0x3F)
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1341 {
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1342 count++;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1343 soffs++;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1344 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1345 else
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1346 {
1297 5bd64397453b More work on PCX writer. Matti Hamalainen <ccr@tnsp.org> parents: 1296 diff changeset	1347 if ((err = dmPCXPutData(pcx, data, count)) != DMERR_OK)
5bd64397453b More work on PCX writer. Matti Hamalainen <ccr@tnsp.org> parents: 1296 diff changeset	1348 return err;
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1349
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1350 data = dmPCXGetByte(row, len, soffs++);
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1351 count = 1;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1352 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1353 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1354
1297 5bd64397453b More work on PCX writer. Matti Hamalainen <ccr@tnsp.org> parents: 1296 diff changeset	1355 if ((err = dmPCXPutData(pcx, data, count)) != DMERR_OK)
5bd64397453b More work on PCX writer. Matti Hamalainen <ccr@tnsp.org> parents: 1296 diff changeset	1356 return err;
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1357
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1358 if (!dmPCXFlush(pcx))
808 f8126fa1df9b Use dmlib error code return value in cases where a plain boolean was used Matti Hamalainen <ccr@tnsp.org> parents: 800 diff changeset	1359 return DMERR_FWRITE;
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1360 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1361
808 f8126fa1df9b Use dmlib error code return value in cases where a plain boolean was used Matti Hamalainen <ccr@tnsp.org> parents: 800 diff changeset	1362 return DMERR_OK;
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1363 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1364
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1365
1886 1af79412f249 Remove the stdio FILE support from libgfx API, now only DMResource is supported. Matti Hamalainen <ccr@tnsp.org> parents: 1881 diff changeset	1366 int dmWritePCXImage(DMResource fp, const DMImage img, const DMImageConvSpec *pspec)
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1367 {
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1368 DMPCXData pcx;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1369 DMPCXHeader hdr;
1303 be30466fbc47 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1302 diff changeset	1370 DMImageConvSpec spec;
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1371 int res;
1302 38614c07c2e2 Now with "almost" working 24bit PCX output. Almost. Matti Hamalainen <ccr@tnsp.org> parents: 1301 diff changeset	1372
1303 be30466fbc47 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1302 diff changeset	1373 // Always force planar for PCX
1302 38614c07c2e2 Now with "almost" working 24bit PCX output. Almost. Matti Hamalainen <ccr@tnsp.org> parents: 1301 diff changeset	1374 memcpy(&spec, pspec, sizeof(DMImageConvSpec));
38614c07c2e2 Now with "almost" working 24bit PCX output. Almost. Matti Hamalainen <ccr@tnsp.org> parents: 1301 diff changeset	1375 spec.planar = TRUE;
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1376
1450 61a486e25dc7 24bit PCX writing does not work correctly, so return DMERR_NOT_SUPPORTED in the writer function. Matti Hamalainen <ccr@tnsp.org> parents: 1341 diff changeset	1377 // XXX: 24bit PCX does not work yet ..
2093 d17512dbb4ef Some work on reading >8bpp images. Matti Hamalainen <ccr@tnsp.org> parents: 2092 diff changeset	1378 if (spec.format != DM_COLFMT_PALETTE &&
d17512dbb4ef Some work on reading >8bpp images. Matti Hamalainen <ccr@tnsp.org> parents: 2092 diff changeset	1379 spec.format != DM_COLFMT_GRAYSCALE)
1800 45e7688336dc Fix checks for NULL palette in index/palette images. Also improve error Matti Hamalainen <ccr@tnsp.org> parents: 1730 diff changeset	1380 {
45e7688336dc Fix checks for NULL palette in index/palette images. Also improve error Matti Hamalainen <ccr@tnsp.org> parents: 1730 diff changeset	1381 return dmError(DMERR_NOT_SUPPORTED,
45e7688336dc Fix checks for NULL palette in index/palette images. Also improve error Matti Hamalainen <ccr@tnsp.org> parents: 1730 diff changeset	1382 "24bit PCX not supported yet.\n");
45e7688336dc Fix checks for NULL palette in index/palette images. Also improve error Matti Hamalainen <ccr@tnsp.org> parents: 1730 diff changeset	1383 }
45e7688336dc Fix checks for NULL palette in index/palette images. Also improve error Matti Hamalainen <ccr@tnsp.org> parents: 1730 diff changeset	1384
2065 451980580189 Refactor how paletted/indexed formats are handled in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 2064 diff changeset	1385 if (spec.format == DM_COLFMT_PALETTE && img->pal == NULL)
1800 45e7688336dc Fix checks for NULL palette in index/palette images. Also improve error Matti Hamalainen <ccr@tnsp.org> parents: 1730 diff changeset	1386 {
45e7688336dc Fix checks for NULL palette in index/palette images. Also improve error Matti Hamalainen <ccr@tnsp.org> parents: 1730 diff changeset	1387 return dmError(DMERR_NULLPTR,
45e7688336dc Fix checks for NULL palette in index/palette images. Also improve error Matti Hamalainen <ccr@tnsp.org> parents: 1730 diff changeset	1388 "Image spec says paletted/indexed image, but palette pointer is NULL.\n");
45e7688336dc Fix checks for NULL palette in index/palette images. Also improve error Matti Hamalainen <ccr@tnsp.org> parents: 1730 diff changeset	1389 }
1450 61a486e25dc7 24bit PCX writing does not work correctly, so return DMERR_NOT_SUPPORTED in the writer function. Matti Hamalainen <ccr@tnsp.org> parents: 1341 diff changeset	1390
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1391 // Create output file
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1392 pcx.buf = NULL;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1393 pcx.header = &hdr;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1394 pcx.fp = fp;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1395
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1396 // Create PCX header
1167 848a88ce7a57 Use dmMemset(). Matti Hamalainen <ccr@tnsp.org> parents: 1152 diff changeset	1397 dmMemset(&hdr, 0, sizeof(hdr));
2093 d17512dbb4ef Some work on reading >8bpp images. Matti Hamalainen <ccr@tnsp.org> parents: 2092 diff changeset	1398 if (spec.format == DM_COLFMT_PALETTE \|\|
d17512dbb4ef Some work on reading >8bpp images. Matti Hamalainen <ccr@tnsp.org> parents: 2092 diff changeset	1399 spec.format == DM_COLFMT_GRAYSCALE)
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1400 {
2094 4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	1401 const int ncolors = img->pal->ncolors > DMPCX_PAL_COLORS ? DMPCX_PAL_COLORS : img->pal->ncolors;
2016 7114ea4c3c42 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 1948 diff changeset	1402 for (int i = 0; i < ncolors; i++)
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1403 {
2094 4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	1404 hdr.colorMap[i].r = img->pal->colors[i].r;
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	1405 hdr.colorMap[i].g = img->pal->colors[i].g;
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	1406 hdr.colorMap[i].b = img->pal->colors[i].b;
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1407 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1408 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1409 hdr.manufacturer = 10;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1410 hdr.version = 5;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1411 hdr.encoding = 1;
1302 38614c07c2e2 Now with "almost" working 24bit PCX output. Almost. Matti Hamalainen <ccr@tnsp.org> parents: 1301 diff changeset	1412 hdr.hres = img->width * spec.scaleX;
38614c07c2e2 Now with "almost" working 24bit PCX output. Almost. Matti Hamalainen <ccr@tnsp.org> parents: 1301 diff changeset	1413 hdr.vres = img->height * spec.scaleY;
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1414 hdr.xmin = hdr.ymin = 0;
1302 38614c07c2e2 Now with "almost" working 24bit PCX output. Almost. Matti Hamalainen <ccr@tnsp.org> parents: 1301 diff changeset	1415 hdr.xmax = (img->width * spec.scaleX) - 1;
38614c07c2e2 Now with "almost" working 24bit PCX output. Almost. Matti Hamalainen <ccr@tnsp.org> parents: 1301 diff changeset	1416 hdr.ymax = (img->height * spec.scaleY) - 1;
1279 0d3f5f44c0c4 Somewhat improve PCX read support in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1265 diff changeset	1417 hdr.palInfo = 1;
1283 642a0dd98c6e Oops, forgot to adjust the writing and reading when adding two members to Matti Hamalainen <ccr@tnsp.org> parents: 1281 diff changeset	1418 hdr.hScreenSize = hdr.hres;
642a0dd98c6e Oops, forgot to adjust the writing and reading when adding two members to Matti Hamalainen <ccr@tnsp.org> parents: 1281 diff changeset	1419 hdr.vScreenSize = hdr.vres;
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1420
1291 2c4acbc3e7bf More work on libgfx etc. Matti Hamalainen <ccr@tnsp.org> parents: 1290 diff changeset	1421 // TODO XXX .. maybe actually compute these asdf
2c4acbc3e7bf More work on libgfx etc. Matti Hamalainen <ccr@tnsp.org> parents: 1290 diff changeset	1422 hdr.bitsPerPlane = 8;
1302 38614c07c2e2 Now with "almost" working 24bit PCX output. Almost. Matti Hamalainen <ccr@tnsp.org> parents: 1301 diff changeset	1423 hdr.nplanes = dmImageGetBytesPerPixel(spec.format);
1291 2c4acbc3e7bf More work on libgfx etc. Matti Hamalainen <ccr@tnsp.org> parents: 1290 diff changeset	1424
1302 38614c07c2e2 Now with "almost" working 24bit PCX output. Almost. Matti Hamalainen <ccr@tnsp.org> parents: 1301 diff changeset	1425 res = img->width * spec.scaleX;
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1426 hdr.bpl = res / 2;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1427 if (res % 2) hdr.bpl++;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1428 hdr.bpl *= 2;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1429
1297 5bd64397453b More work on PCX writer. Matti Hamalainen <ccr@tnsp.org> parents: 1296 diff changeset	1430 dmMsg(2,
5bd64397453b More work on PCX writer. Matti Hamalainen <ccr@tnsp.org> parents: 1296 diff changeset	1431 "PCX: xmin=%d, ymin=%d, xmax=%d, ymax=%d, res=%dx%d, scr=%dx%d\n",
5bd64397453b More work on PCX writer. Matti Hamalainen <ccr@tnsp.org> parents: 1296 diff changeset	1432 hdr.xmin, hdr.ymin, hdr.xmax, hdr.ymax,
5bd64397453b More work on PCX writer. Matti Hamalainen <ccr@tnsp.org> parents: 1296 diff changeset	1433 hdr.hres, hdr.vres,
5bd64397453b More work on PCX writer. Matti Hamalainen <ccr@tnsp.org> parents: 1296 diff changeset	1434 hdr.hScreenSize, hdr.vScreenSize);
5bd64397453b More work on PCX writer. Matti Hamalainen <ccr@tnsp.org> parents: 1296 diff changeset	1435
2065 451980580189 Refactor how paletted/indexed formats are handled in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 2064 diff changeset	1436 dmMsg(2, "PCX: nplanes=%d, bpp=%d, bpl=%d, colfmt=%d, planar=%s\n",
1302 38614c07c2e2 Now with "almost" working 24bit PCX output. Almost. Matti Hamalainen <ccr@tnsp.org> parents: 1301 diff changeset	1437 hdr.nplanes, hdr.bitsPerPlane, hdr.bpl,
2065 451980580189 Refactor how paletted/indexed formats are handled in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 2064 diff changeset	1438 spec.format,
1302 38614c07c2e2 Now with "almost" working 24bit PCX output. Almost. Matti Hamalainen <ccr@tnsp.org> parents: 1301 diff changeset	1439 spec.planar ? "yes" : "no"
38614c07c2e2 Now with "almost" working 24bit PCX output. Almost. Matti Hamalainen <ccr@tnsp.org> parents: 1301 diff changeset	1440 );
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1441
1291 2c4acbc3e7bf More work on libgfx etc. Matti Hamalainen <ccr@tnsp.org> parents: 1290 diff changeset	1442 // TODO XXX this is also bogus
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1443 pcx.bufLen = hdr.bpl * 4;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1444 if ((pcx.buf = dmMalloc(pcx.bufLen)) == NULL)
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1445 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1446 res = dmError(DMERR_MALLOC,
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1447 "PCX: Could not allocate %d bytes for RLE compression buffer.\n",
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1448 pcx.bufLen);
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1449 goto error;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1450 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1451
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1452 // Write PCX header
1609 c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1583 diff changeset	1453 if (!dmf_write_byte(pcx.fp, hdr.manufacturer) \|\|
c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1583 diff changeset	1454 !dmf_write_byte(pcx.fp, hdr.version) \|\|
c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1583 diff changeset	1455 !dmf_write_byte(pcx.fp, hdr.encoding) \|\|
c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1583 diff changeset	1456 !dmf_write_byte(pcx.fp, hdr.bitsPerPlane))
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1457 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1458 res = dmError(DMERR_FWRITE,
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1459 "PCX: Could not write basic header data.\n");
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1460 goto error;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1461 }
1102 e06abfde6c39 Cosmetics pass: Remove excess whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	1462
1609 c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1583 diff changeset	1463 if (!dmf_write_le16(pcx.fp, hdr.xmin) \|\|
c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1583 diff changeset	1464 !dmf_write_le16(pcx.fp, hdr.ymin) \|\|
c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1583 diff changeset	1465 !dmf_write_le16(pcx.fp, hdr.xmax) \|\|
c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1583 diff changeset	1466 !dmf_write_le16(pcx.fp, hdr.ymax) \|\|
c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1583 diff changeset	1467 !dmf_write_le16(pcx.fp, hdr.hres) \|\|
c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1583 diff changeset	1468 !dmf_write_le16(pcx.fp, hdr.vres))
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1469 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1470 res = dmError(DMERR_FWRITE,
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1471 "PCX: Could not write image dimensions.\n");
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1472 goto error;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1473 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1474
1609 c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1583 diff changeset	1475 if (!dmf_write_str(pcx.fp, (Uint8 *) &hdr.colorMap, sizeof(hdr.colorMap)))
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1476 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1477 res = dmError(DMERR_FWRITE,
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1478 "PCX: Could not write colormap.\n");
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1479 goto error;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1480 }
1102 e06abfde6c39 Cosmetics pass: Remove excess whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	1481
1609 c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1583 diff changeset	1482 if (!dmf_write_byte(pcx.fp, hdr.reserved) \|\|
c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1583 diff changeset	1483 !dmf_write_byte(pcx.fp, hdr.nplanes) \|\|
c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1583 diff changeset	1484 !dmf_write_le16(pcx.fp, hdr.bpl) \|\|
c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1583 diff changeset	1485 !dmf_write_le16(pcx.fp, hdr.palInfo) \|\|
c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1583 diff changeset	1486 !dmf_write_le16(pcx.fp, hdr.hScreenSize) \|\|
c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1583 diff changeset	1487 !dmf_write_le16(pcx.fp, hdr.vScreenSize) \|\|
c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1583 diff changeset	1488 !dmf_write_str(pcx.fp, (Uint8 *) &hdr.filler, sizeof(hdr.filler)))
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1489 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1490 res = dmError(DMERR_FWRITE,
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1491 "PCX: Could not write header remainder.\n");
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1492 goto error;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1493 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1494
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1495 // Write image data
1302 38614c07c2e2 Now with "almost" working 24bit PCX output. Almost. Matti Hamalainen <ccr@tnsp.org> parents: 1301 diff changeset	1496 res = dmWriteImageData(img, (void *) &pcx, dmWritePCXRow, &spec);
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1497
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1498 // Write VGA palette
2093 d17512dbb4ef Some work on reading >8bpp images. Matti Hamalainen <ccr@tnsp.org> parents: 2092 diff changeset	1499 if (spec.format == DM_COLFMT_PALETTE \|\|
d17512dbb4ef Some work on reading >8bpp images. Matti Hamalainen <ccr@tnsp.org> parents: 2092 diff changeset	1500 spec.format == DM_COLFMT_GRAYSCALE)
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1501 {
2094 4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	1502 dmMsg(2, "PCX: Writing palette of %d active entries.\n", img->pal->ncolors);
1294 9f2117f1584a Improve error checking in PCX writer. Matti Hamalainen <ccr@tnsp.org> parents: 1292 diff changeset	1503
1609 c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1583 diff changeset	1504 dmf_write_byte(pcx.fp, 0x0C);
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1505
2094 4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	1506 if ((res = dmPaletteWriteData(fp, img->pal, img->pal->ncolors, 256)) != DMERR_OK)
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1507 {
2094 4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	1508 res = dmError(DMERR_FWRITE,
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	1509 "PCX: Could not write palette data.\n");
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	1510 goto error;
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1511 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1512 }
1102 e06abfde6c39 Cosmetics pass: Remove excess whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	1513
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1514 error:
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1515 dmFree(pcx.buf);
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1516 return res;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1517 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1518
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1519
1609 c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1583 diff changeset	1520 static BOOL dmPCXDecodeRLERow(DMResource fp, Uint8 buf, const size_t bufLen)
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1521 {
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1522 size_t offs = 0;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1523 do
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1524 {
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1525 int count;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1526 Uint8 data;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1527
1609 c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1583 diff changeset	1528 if (!dmf_read_byte(fp, &data))
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1529 return FALSE;
1102 e06abfde6c39 Cosmetics pass: Remove excess whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	1530
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1531 if ((data & 0xC0) == 0xC0)
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1532 {
1284 28be63226b05 More work on PCX loader. Matti Hamalainen <ccr@tnsp.org> parents: 1283 diff changeset	1533 BOOL skip = FALSE;
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1534 count = data & 0x3F;
1284 28be63226b05 More work on PCX loader. Matti Hamalainen <ccr@tnsp.org> parents: 1283 diff changeset	1535 if (count == 0)
28be63226b05 More work on PCX loader. Matti Hamalainen <ccr@tnsp.org> parents: 1283 diff changeset	1536 {
1285 e4bda4909d72 Make libgfx error mode a global variable, at least for now. Matti Hamalainen <ccr@tnsp.org> parents: 1284 diff changeset	1537 switch (dmGFXErrorMode)
1284 28be63226b05 More work on PCX loader. Matti Hamalainen <ccr@tnsp.org> parents: 1283 diff changeset	1538 {
1285 e4bda4909d72 Make libgfx error mode a global variable, at least for now. Matti Hamalainen <ccr@tnsp.org> parents: 1284 diff changeset	1539 case DM_ERRMODE_RECOV_1:
1284 28be63226b05 More work on PCX loader. Matti Hamalainen <ccr@tnsp.org> parents: 1283 diff changeset	1540 // Use as literal
28be63226b05 More work on PCX loader. Matti Hamalainen <ccr@tnsp.org> parents: 1283 diff changeset	1541 skip = TRUE;
28be63226b05 More work on PCX loader. Matti Hamalainen <ccr@tnsp.org> parents: 1283 diff changeset	1542 count = 1;
28be63226b05 More work on PCX loader. Matti Hamalainen <ccr@tnsp.org> parents: 1283 diff changeset	1543 break;
28be63226b05 More work on PCX loader. Matti Hamalainen <ccr@tnsp.org> parents: 1283 diff changeset	1544
1285 e4bda4909d72 Make libgfx error mode a global variable, at least for now. Matti Hamalainen <ccr@tnsp.org> parents: 1284 diff changeset	1545 case DM_ERRMODE_RECOV_2:
1284 28be63226b05 More work on PCX loader. Matti Hamalainen <ccr@tnsp.org> parents: 1283 diff changeset	1546 // Ignore completely
28be63226b05 More work on PCX loader. Matti Hamalainen <ccr@tnsp.org> parents: 1283 diff changeset	1547 skip = TRUE;
28be63226b05 More work on PCX loader. Matti Hamalainen <ccr@tnsp.org> parents: 1283 diff changeset	1548 break;
28be63226b05 More work on PCX loader. Matti Hamalainen <ccr@tnsp.org> parents: 1283 diff changeset	1549
1285 e4bda4909d72 Make libgfx error mode a global variable, at least for now. Matti Hamalainen <ccr@tnsp.org> parents: 1284 diff changeset	1550 case DM_ERRMODE_FAIL:
1284 28be63226b05 More work on PCX loader. Matti Hamalainen <ccr@tnsp.org> parents: 1283 diff changeset	1551 default:
28be63226b05 More work on PCX loader. Matti Hamalainen <ccr@tnsp.org> parents: 1283 diff changeset	1552 // Error out on "invalid" data
28be63226b05 More work on PCX loader. Matti Hamalainen <ccr@tnsp.org> parents: 1283 diff changeset	1553 return FALSE;
28be63226b05 More work on PCX loader. Matti Hamalainen <ccr@tnsp.org> parents: 1283 diff changeset	1554 }
28be63226b05 More work on PCX loader. Matti Hamalainen <ccr@tnsp.org> parents: 1283 diff changeset	1555 }
28be63226b05 More work on PCX loader. Matti Hamalainen <ccr@tnsp.org> parents: 1283 diff changeset	1556
1609 c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1583 diff changeset	1557 if (!skip && !dmf_read_byte(fp, &data))
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1558 return FALSE;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1559 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1560 else
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1561 count = 1;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1562
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1563 while (count-- && offs < bufLen)
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1564 buf[offs++] = data;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1565
1284 28be63226b05 More work on PCX loader. Matti Hamalainen <ccr@tnsp.org> parents: 1283 diff changeset	1566 // Check for remaining output count, error out if we wish to
1285 e4bda4909d72 Make libgfx error mode a global variable, at least for now. Matti Hamalainen <ccr@tnsp.org> parents: 1284 diff changeset	1567 if (count > 0 && dmGFXErrorMode == DM_ERRMODE_FAIL)
1284 28be63226b05 More work on PCX loader. Matti Hamalainen <ccr@tnsp.org> parents: 1283 diff changeset	1568 return FALSE;
28be63226b05 More work on PCX loader. Matti Hamalainen <ccr@tnsp.org> parents: 1283 diff changeset	1569
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1570 } while (offs < bufLen);
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1571
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1572 return TRUE;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1573 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1574
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1575
1886 1af79412f249 Remove the stdio FILE support from libgfx API, now only DMResource is supported. Matti Hamalainen <ccr@tnsp.org> parents: 1881 diff changeset	1576 int dmReadPCXImage(DMResource fp, DMImage *pimg)
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1577 {
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1578 DMImage *img;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1579 DMPCXData pcx;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1580 DMPCXHeader hdr;
1279 0d3f5f44c0c4 Somewhat improve PCX read support in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1265 diff changeset	1581 int res = 0;
1286 b812fad6f33e Work on libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1285 diff changeset	1582 BOOL isPaletted;
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1583 pcx.buf = NULL;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1584
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1585 // Read PCX header
1609 c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1583 diff changeset	1586 if (!dmf_read_byte(fp, &hdr.manufacturer) \|\|
c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1583 diff changeset	1587 !dmf_read_byte(fp, &hdr.version) \|\|
c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1583 diff changeset	1588 !dmf_read_byte(fp, &hdr.encoding) \|\|
c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1583 diff changeset	1589 !dmf_read_byte(fp, &hdr.bitsPerPlane) \|\|
c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1583 diff changeset	1590 !dmf_read_le16(fp, &hdr.xmin) \|\|
c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1583 diff changeset	1591 !dmf_read_le16(fp, &hdr.ymin) \|\|
c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1583 diff changeset	1592 !dmf_read_le16(fp, &hdr.xmax) \|\|
c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1583 diff changeset	1593 !dmf_read_le16(fp, &hdr.ymax) \|\|
c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1583 diff changeset	1594 !dmf_read_le16(fp, &hdr.hres) \|\|
c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1583 diff changeset	1595 !dmf_read_le16(fp, &hdr.vres) \|\|
c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1583 diff changeset	1596 !dmf_read_str(fp, (Uint8 *) &hdr.colorMap, sizeof(hdr.colorMap)) \|\|
c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1583 diff changeset	1597 !dmf_read_byte(fp, &hdr.reserved) \|\|
c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1583 diff changeset	1598 !dmf_read_byte(fp, &hdr.nplanes) \|\|
c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1583 diff changeset	1599 !dmf_read_le16(fp, &hdr.bpl) \|\|
c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1583 diff changeset	1600 !dmf_read_le16(fp, &hdr.palInfo) \|\|
c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1583 diff changeset	1601 !dmf_read_le16(fp, &hdr.hScreenSize) \|\|
c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1583 diff changeset	1602 !dmf_read_le16(fp, &hdr.vScreenSize) \|\|
c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1583 diff changeset	1603 !dmf_read_str(fp, (Uint8 *) &hdr.filler, sizeof(hdr.filler)))
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1604 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1605 res = dmError(DMERR_FREAD,
1298 f0d6aac3adc4 Some cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1297 diff changeset	1606 "PCX: Could not read image header data.\n");
f0d6aac3adc4 Some cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1297 diff changeset	1607 goto error;
f0d6aac3adc4 Some cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1297 diff changeset	1608 }
f0d6aac3adc4 Some cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1297 diff changeset	1609
f0d6aac3adc4 Some cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1297 diff changeset	1610 if (hdr.manufacturer != 10 \|\|
f0d6aac3adc4 Some cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1297 diff changeset	1611 hdr.version > 5 \|\|
f0d6aac3adc4 Some cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1297 diff changeset	1612 hdr.encoding != 1)
f0d6aac3adc4 Some cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1297 diff changeset	1613 {
f0d6aac3adc4 Some cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1297 diff changeset	1614 res = dmError(DMERR_NOT_SUPPORTED,
f0d6aac3adc4 Some cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1297 diff changeset	1615 "PCX: Not a PCX file, or unsupported variant.\n");
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1616 goto error;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1617 }
1102 e06abfde6c39 Cosmetics pass: Remove excess whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	1618
1299 b0c0be4c76f9 Aaand some more work on PCX loader. Actually works with 4/1 planes/bpp images now. Matti Hamalainen <ccr@tnsp.org> parents: 1298 diff changeset	1619 if (hdr.nplanes == 4 && hdr.bitsPerPlane == 4)
b0c0be4c76f9 Aaand some more work on PCX loader. Actually works with 4/1 planes/bpp images now. Matti Hamalainen <ccr@tnsp.org> parents: 1298 diff changeset	1620 {
b0c0be4c76f9 Aaand some more work on PCX loader. Actually works with 4/1 planes/bpp images now. Matti Hamalainen <ccr@tnsp.org> parents: 1298 diff changeset	1621 dmMsg(2,
2078 b2f1ce24f81b Be more informative when attempting to figure out broken PCX file. Matti Hamalainen <ccr@tnsp.org> parents: 2071 diff changeset	1622 "PCX: Probably invalid combination of nplanes=%d and bpp=%d, attempting to fix ..\n",
b2f1ce24f81b Be more informative when attempting to figure out broken PCX file. Matti Hamalainen <ccr@tnsp.org> parents: 2071 diff changeset	1623 hdr.nplanes, hdr.bitsPerPlane);
1609 c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1583 diff changeset	1624
1299 b0c0be4c76f9 Aaand some more work on PCX loader. Actually works with 4/1 planes/bpp images now. Matti Hamalainen <ccr@tnsp.org> parents: 1298 diff changeset	1625 hdr.bitsPerPlane = 1;
b0c0be4c76f9 Aaand some more work on PCX loader. Actually works with 4/1 planes/bpp images now. Matti Hamalainen <ccr@tnsp.org> parents: 1298 diff changeset	1626 }
b0c0be4c76f9 Aaand some more work on PCX loader. Actually works with 4/1 planes/bpp images now. Matti Hamalainen <ccr@tnsp.org> parents: 1298 diff changeset	1627
1295 7a986f33895e Fix isPaletted check in PCX reader :P Matti Hamalainen <ccr@tnsp.org> parents: 1294 diff changeset	1628 isPaletted = (hdr.bitsPerPlane * hdr.nplanes) <= 8;
1291 2c4acbc3e7bf More work on libgfx etc. Matti Hamalainen <ccr@tnsp.org> parents: 1290 diff changeset	1629
2c4acbc3e7bf More work on libgfx etc. Matti Hamalainen <ccr@tnsp.org> parents: 1290 diff changeset	1630 dmMsg(2,
2c4acbc3e7bf More work on libgfx etc. Matti Hamalainen <ccr@tnsp.org> parents: 1290 diff changeset	1631 "PCX: xmin=%d, ymin=%d, xmax=%d, ymax=%d, res=%dx%d, scr=%dx%d\n",
2c4acbc3e7bf More work on libgfx etc. Matti Hamalainen <ccr@tnsp.org> parents: 1290 diff changeset	1632 hdr.xmin, hdr.ymin, hdr.xmax, hdr.ymax,
2c4acbc3e7bf More work on libgfx etc. Matti Hamalainen <ccr@tnsp.org> parents: 1290 diff changeset	1633 hdr.hres, hdr.vres,
2c4acbc3e7bf More work on libgfx etc. Matti Hamalainen <ccr@tnsp.org> parents: 1290 diff changeset	1634 hdr.hScreenSize, hdr.vScreenSize);
2c4acbc3e7bf More work on libgfx etc. Matti Hamalainen <ccr@tnsp.org> parents: 1290 diff changeset	1635
2c4acbc3e7bf More work on libgfx etc. Matti Hamalainen <ccr@tnsp.org> parents: 1290 diff changeset	1636 dmMsg(2,
2c4acbc3e7bf More work on libgfx etc. Matti Hamalainen <ccr@tnsp.org> parents: 1290 diff changeset	1637 "PCX: nplanes=%d, bpp=%d, bpl=%d, isPaletted=%s\n",
2c4acbc3e7bf More work on libgfx etc. Matti Hamalainen <ccr@tnsp.org> parents: 1290 diff changeset	1638 hdr.nplanes, hdr.bitsPerPlane, hdr.bpl, isPaletted ? "yes" : "no");
2c4acbc3e7bf More work on libgfx etc. Matti Hamalainen <ccr@tnsp.org> parents: 1290 diff changeset	1639
1279 0d3f5f44c0c4 Somewhat improve PCX read support in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1265 diff changeset	1640 if (hdr.nplanes < 1 \|\| hdr.nplanes > 8)
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1641 {
1279 0d3f5f44c0c4 Somewhat improve PCX read support in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1265 diff changeset	1642 res = dmError(DMERR_NOT_SUPPORTED,
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1643 "PCX: Unsupported number of bitplanes %d.\n",
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1644 hdr.nplanes);
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1645 goto error;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1646 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1647
1286 b812fad6f33e Work on libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1285 diff changeset	1648 if (!isPaletted)
b812fad6f33e Work on libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1285 diff changeset	1649 {
b812fad6f33e Work on libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1285 diff changeset	1650 res = dmError(DMERR_NOT_SUPPORTED,
b812fad6f33e Work on libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1285 diff changeset	1651 "PCX: Non-indexed (truecolour) PCX images not supported for loading.\n");
b812fad6f33e Work on libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1285 diff changeset	1652 goto error;
b812fad6f33e Work on libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1285 diff changeset	1653 }
b812fad6f33e Work on libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1285 diff changeset	1654
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1655 // Allocate image
1286 b812fad6f33e Work on libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1285 diff changeset	1656 if ((*pimg = img = dmImageAlloc(hdr.xmax - hdr.xmin + 1, hdr.ymax - hdr.ymin + 1,
2093 d17512dbb4ef Some work on reading >8bpp images. Matti Hamalainen <ccr@tnsp.org> parents: 2092 diff changeset	1657 isPaletted ? DM_COLFMT_PALETTE : DM_COLFMT_RGB,
1299 b0c0be4c76f9 Aaand some more work on PCX loader. Actually works with 4/1 planes/bpp images now. Matti Hamalainen <ccr@tnsp.org> parents: 1298 diff changeset	1658 // XXX TODO? When/if we ever handle < 8bit indexed correctly, we can use the actual bpp
b0c0be4c76f9 Aaand some more work on PCX loader. Actually works with 4/1 planes/bpp images now. Matti Hamalainen <ccr@tnsp.org> parents: 1298 diff changeset	1659 // isPaletted ? (hdr.bitsPerPlane * hdr.nplanes) : -1
b0c0be4c76f9 Aaand some more work on PCX loader. Actually works with 4/1 planes/bpp images now. Matti Hamalainen <ccr@tnsp.org> parents: 1298 diff changeset	1660 -1
b0c0be4c76f9 Aaand some more work on PCX loader. Actually works with 4/1 planes/bpp images now. Matti Hamalainen <ccr@tnsp.org> parents: 1298 diff changeset	1661 )) == NULL)
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1662 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1663 res = dmError(DMERR_MALLOC,
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1664 "PCX: Could not allocate image structure.\n");
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1665 goto error;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1666 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1667
1628 a549d33d543a Add image aspect ratio information. Matti Hamalainen <ccr@tnsp.org> parents: 1627 diff changeset	1668 // Set image aspect ratio
a549d33d543a Add image aspect ratio information. Matti Hamalainen <ccr@tnsp.org> parents: 1627 diff changeset	1669 if (hdr.hScreenSize > 0 && hdr.vScreenSize > 0 &&
a549d33d543a Add image aspect ratio information. Matti Hamalainen <ccr@tnsp.org> parents: 1627 diff changeset	1670 hdr.vScreenSize / hdr.hScreenSize != img->height / img->width)
a549d33d543a Add image aspect ratio information. Matti Hamalainen <ccr@tnsp.org> parents: 1627 diff changeset	1671 img->aspect = (float) hdr.vScreenSize / (float) hdr.hScreenSize;
a549d33d543a Add image aspect ratio information. Matti Hamalainen <ccr@tnsp.org> parents: 1627 diff changeset	1672
1298 f0d6aac3adc4 Some cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1297 diff changeset	1673 // Sanity check bytes per line value
1279 0d3f5f44c0c4 Somewhat improve PCX read support in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1265 diff changeset	1674 if (hdr.bpl < (img->width * hdr.bitsPerPlane) / 8)
0d3f5f44c0c4 Somewhat improve PCX read support in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1265 diff changeset	1675 {
0d3f5f44c0c4 Somewhat improve PCX read support in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1265 diff changeset	1676 res = dmError(DMERR_MALLOC,
0d3f5f44c0c4 Somewhat improve PCX read support in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1265 diff changeset	1677 "PCX: The bytes per plane line value %d is smaller than width*bpp/8 = %d!\n",
0d3f5f44c0c4 Somewhat improve PCX read support in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1265 diff changeset	1678 hdr.bpl, (img->width * hdr.bitsPerPlane) / 8);
0d3f5f44c0c4 Somewhat improve PCX read support in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1265 diff changeset	1679 goto error;
0d3f5f44c0c4 Somewhat improve PCX read support in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1265 diff changeset	1680 }
0d3f5f44c0c4 Somewhat improve PCX read support in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1265 diff changeset	1681
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1682 pcx.bufLen = hdr.nplanes * hdr.bpl;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1683 if ((pcx.buf = dmMalloc(pcx.bufLen)) == NULL)
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1684 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1685 res = dmError(DMERR_MALLOC,
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1686 "PCX: Could not allocate RLE buffer.\n");
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1687 goto error;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1688 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1689
1299 b0c0be4c76f9 Aaand some more work on PCX loader. Actually works with 4/1 planes/bpp images now. Matti Hamalainen <ccr@tnsp.org> parents: 1298 diff changeset	1690 dmMsg(2,
b0c0be4c76f9 Aaand some more work on PCX loader. Actually works with 4/1 planes/bpp images now. Matti Hamalainen <ccr@tnsp.org> parents: 1298 diff changeset	1691 "PCX: bufLen=%d\n",
b0c0be4c76f9 Aaand some more work on PCX loader. Actually works with 4/1 planes/bpp images now. Matti Hamalainen <ccr@tnsp.org> parents: 1298 diff changeset	1692 pcx.bufLen);
b0c0be4c76f9 Aaand some more work on PCX loader. Actually works with 4/1 planes/bpp images now. Matti Hamalainen <ccr@tnsp.org> parents: 1298 diff changeset	1693
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1694 // Read image data
1279 0d3f5f44c0c4 Somewhat improve PCX read support in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1265 diff changeset	1695 Uint8 *dp = img->data;
0d3f5f44c0c4 Somewhat improve PCX read support in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1265 diff changeset	1696 for (int yc = 0; yc < img->height; yc++)
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1697 {
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1698 // Decode row of RLE'd data
1285 e4bda4909d72 Make libgfx error mode a global variable, at least for now. Matti Hamalainen <ccr@tnsp.org> parents: 1284 diff changeset	1699 if (!dmPCXDecodeRLERow(fp, pcx.buf, pcx.bufLen))
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1700 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1701 res = dmError(DMERR_INVALID_DATA,
1279 0d3f5f44c0c4 Somewhat improve PCX read support in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1265 diff changeset	1702 "PCX: Error decoding RLE compressed data.\n");
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1703 goto error;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1704 }
1609 c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1583 diff changeset	1705
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1706 // Decode bitplanes
1279 0d3f5f44c0c4 Somewhat improve PCX read support in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1265 diff changeset	1707 switch (hdr.bitsPerPlane)
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1708 {
1296 228cab109c6a More work on PCX reader. Matti Hamalainen <ccr@tnsp.org> parents: 1295 diff changeset	1709 case 24:
1279 0d3f5f44c0c4 Somewhat improve PCX read support in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1265 diff changeset	1710 case 8:
0d3f5f44c0c4 Somewhat improve PCX read support in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1265 diff changeset	1711 {
1286 b812fad6f33e Work on libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1285 diff changeset	1712 // Actually bytes and bits per plane per pixel ..
b812fad6f33e Work on libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1285 diff changeset	1713 const int bytesPerPlane = hdr.bitsPerPlane / 8;
1279 0d3f5f44c0c4 Somewhat improve PCX read support in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1265 diff changeset	1714
1286 b812fad6f33e Work on libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1285 diff changeset	1715 for (int nplane = 0; nplane < hdr.nplanes; nplane++)
b812fad6f33e Work on libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1285 diff changeset	1716 {
b812fad6f33e Work on libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1285 diff changeset	1717 Uint8 dptr = dp + (nplane bytesPerPlane),
b812fad6f33e Work on libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1285 diff changeset	1718 sptr = pcx.buf + (hdr.bpl nplane);
b812fad6f33e Work on libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1285 diff changeset	1719
b812fad6f33e Work on libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1285 diff changeset	1720 memcpy(dptr, sptr, img->width * bytesPerPlane);
b812fad6f33e Work on libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1285 diff changeset	1721 }
1279 0d3f5f44c0c4 Somewhat improve PCX read support in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1265 diff changeset	1722 }
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1723 break;
1102 e06abfde6c39 Cosmetics pass: Remove excess whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	1724
1280 300a51e98fc3 Bump version and copyright. Matti Hamalainen <ccr@tnsp.org> parents: 1279 diff changeset	1725 case 1:
1814 0b7062d874ef Use dmMemset() instead of memset(). Matti Hamalainen <ccr@tnsp.org> parents: 1810 diff changeset	1726 dmMemset(dp, 0, img->width);
1296 228cab109c6a More work on PCX reader. Matti Hamalainen <ccr@tnsp.org> parents: 1295 diff changeset	1727
1280 300a51e98fc3 Bump version and copyright. Matti Hamalainen <ccr@tnsp.org> parents: 1279 diff changeset	1728 for (int nplane = 0; nplane < hdr.nplanes; nplane++)
300a51e98fc3 Bump version and copyright. Matti Hamalainen <ccr@tnsp.org> parents: 1279 diff changeset	1729 {
1296 228cab109c6a More work on PCX reader. Matti Hamalainen <ccr@tnsp.org> parents: 1295 diff changeset	1730 Uint8 sptr = pcx.buf + (hdr.bpl nplane);
1280 300a51e98fc3 Bump version and copyright. Matti Hamalainen <ccr@tnsp.org> parents: 1279 diff changeset	1731
300a51e98fc3 Bump version and copyright. Matti Hamalainen <ccr@tnsp.org> parents: 1279 diff changeset	1732 for (int xc = 0; xc < img->width; xc++)
1296 228cab109c6a More work on PCX reader. Matti Hamalainen <ccr@tnsp.org> parents: 1295 diff changeset	1733 {
1299 b0c0be4c76f9 Aaand some more work on PCX loader. Actually works with 4/1 planes/bpp images now. Matti Hamalainen <ccr@tnsp.org> parents: 1298 diff changeset	1734 const int px = 7 - (xc & 7);
b0c0be4c76f9 Aaand some more work on PCX loader. Actually works with 4/1 planes/bpp images now. Matti Hamalainen <ccr@tnsp.org> parents: 1298 diff changeset	1735 dp[xc] \|= ((sptr[xc / 8] & (1 << px)) >> px) << nplane;
1296 228cab109c6a More work on PCX reader. Matti Hamalainen <ccr@tnsp.org> parents: 1295 diff changeset	1736 }
1280 300a51e98fc3 Bump version and copyright. Matti Hamalainen <ccr@tnsp.org> parents: 1279 diff changeset	1737 }
300a51e98fc3 Bump version and copyright. Matti Hamalainen <ccr@tnsp.org> parents: 1279 diff changeset	1738 break;
300a51e98fc3 Bump version and copyright. Matti Hamalainen <ccr@tnsp.org> parents: 1279 diff changeset	1739
1279 0d3f5f44c0c4 Somewhat improve PCX read support in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1265 diff changeset	1740 default:
1285 e4bda4909d72 Make libgfx error mode a global variable, at least for now. Matti Hamalainen <ccr@tnsp.org> parents: 1284 diff changeset	1741 res = dmError(DMERR_NOT_SUPPORTED,
1279 0d3f5f44c0c4 Somewhat improve PCX read support in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1265 diff changeset	1742 "PCX: Unsupported number of bits per plane %d.\n",
0d3f5f44c0c4 Somewhat improve PCX read support in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1265 diff changeset	1743 hdr.bitsPerPlane);
0d3f5f44c0c4 Somewhat improve PCX read support in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1265 diff changeset	1744 goto error;
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1745 }
1102 e06abfde6c39 Cosmetics pass: Remove excess whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	1746
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1747 dp += img->pitch;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1748 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1749
1279 0d3f5f44c0c4 Somewhat improve PCX read support in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1265 diff changeset	1750 // Read additional VGA palette, if available
1286 b812fad6f33e Work on libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1285 diff changeset	1751 if (isPaletted)
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1752 {
1279 0d3f5f44c0c4 Somewhat improve PCX read support in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1265 diff changeset	1753 int ncolors;
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1754 Uint8 tmpb;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1755 BOOL read;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1756
1609 c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1583 diff changeset	1757 if (!dmf_read_byte(fp, &tmpb) \|\| tmpb != 0x0C)
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1758 {
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1759 read = FALSE;
1299 b0c0be4c76f9 Aaand some more work on PCX loader. Actually works with 4/1 planes/bpp images now. Matti Hamalainen <ccr@tnsp.org> parents: 1298 diff changeset	1760 ncolors = DMPCX_PAL_COLORS;
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1761 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1762 else
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1763 {
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1764 read = TRUE;
451 fdc91f2a0d27 Modularize palette reading and handling code. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1765 ncolors = 256;
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1766 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1767
2094 4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	1768 if ((res = dmPaletteAlloc(&(img->pal), ncolors, -1)) != DMERR_OK)
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1769 {
2094 4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	1770 res = dmError(res,
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1771 "PCX: Could not allocate palette data!\n");
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1772 goto error;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1773 }
1102 e06abfde6c39 Cosmetics pass: Remove excess whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	1774
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1775 if (read)
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1776 {
1279 0d3f5f44c0c4 Somewhat improve PCX read support in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1265 diff changeset	1777 // Okay, attempt to read the palette data
1296 228cab109c6a More work on PCX reader. Matti Hamalainen <ccr@tnsp.org> parents: 1295 diff changeset	1778 dmMsg(2, "PCX: Reading palette of %d colors\n", ncolors);
2094 4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	1779 if ((res = dmPaletteReadData(fp, img->pal, ncolors)) != DMERR_OK)
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1780 {
2094 4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	1781 dmErrorMsg("PCX: Error reading palette.\n");
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1782 goto error;
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1783 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1784 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1785 else
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1786 {
2094 4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	1787 const int nmax = img->pal->ncolors > DMPCX_PAL_COLORS ? DMPCX_PAL_COLORS : img->pal->ncolors;
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	1788
1279 0d3f5f44c0c4 Somewhat improve PCX read support in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1265 diff changeset	1789 // If the extra palette is not available, copy the colors from
0d3f5f44c0c4 Somewhat improve PCX read support in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1265 diff changeset	1790 // the header palette to our internal palette structure.
2094 4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	1791 dmMsg(2, "PCX: Initializing palette from header of %d colors (%d)\n", ncolors, nmax);
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	1792
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	1793 for (int i = 0; i < nmax; i++)
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1794 {
2094 4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	1795 img->pal->colors[i].r = hdr.colorMap[i].r;
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	1796 img->pal->colors[i].g = hdr.colorMap[i].g;
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	1797 img->pal->colors[i].b = hdr.colorMap[i].b;
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1798 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1799 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1800 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1801
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1802 error:
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1803 dmFree(pcx.buf);
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1804 return res;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1805 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1806
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1807
1613 70b04c16aa40 Move format probe functions near to their other functions. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	1808 //
70b04c16aa40 Move format probe functions near to their other functions. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	1809 // IFF ILBM / PBM format
70b04c16aa40 Move format probe functions near to their other functions. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	1810 //
443 f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1811 #define IFF_ID_FORM 0x464F524D // "FORM"
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1812 #define IFF_ID_ILBM 0x494C424D // "ILBM"
464 358776103ceb Add support for IFF PBMs. Matti Hamalainen <ccr@tnsp.org> parents: 462 diff changeset	1813 #define IFF_ID_PBM 0x50424D20 // "PBM "
443 f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1814 #define IFF_ID_BMHD 0x424D4844 // "BMHD"
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1815 #define IFF_ID_CMAP 0x434D4150 // "CMAP"
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1816 #define IFF_ID_BODY 0x424F4459 // "BODY"
449 117f94b253af Add support for CAMG chunk reading and possibly half-brite handling in IFF ILBM reader. Matti Hamalainen <ccr@tnsp.org> parents: 448 diff changeset	1817 #define IFF_ID_CAMG 0x43414D47 // "CAMG"
2053 6dfbe976d740 Implement basic initial support for IFF ACBM format images. Matti Hamalainen <ccr@tnsp.org> parents: 2050 diff changeset	1818 #define IFF_ID_ACBM 0x4143424D // "ACBM"
6dfbe976d740 Implement basic initial support for IFF ACBM format images. Matti Hamalainen <ccr@tnsp.org> parents: 2050 diff changeset	1819 #define IFF_ID_ABIT 0x41424954 // "ABIT"
443 f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1820
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1821 #define IFF_MASK_NONE 0
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1822 #define IFF_MASK_HAS_MASK 1
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1823 #define IFF_MASK_TRANSP 2
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1824 #define IFF_MASK_LASSO 3
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1825
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1826 #define IFF_COMP_NONE 0
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1827 #define IFF_COMP_BYTERUN1 1
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1828
449 117f94b253af Add support for CAMG chunk reading and possibly half-brite handling in IFF ILBM reader. Matti Hamalainen <ccr@tnsp.org> parents: 448 diff changeset	1829 #define IFF_CAMG_LACE 0x00000004
117f94b253af Add support for CAMG chunk reading and possibly half-brite handling in IFF ILBM reader. Matti Hamalainen <ccr@tnsp.org> parents: 448 diff changeset	1830 #define IFF_CAMG_HALFBRITE 0x00000080
117f94b253af Add support for CAMG chunk reading and possibly half-brite handling in IFF ILBM reader. Matti Hamalainen <ccr@tnsp.org> parents: 448 diff changeset	1831 #define IFF_CAMG_HAM 0x00000800
443 f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1832
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1833 typedef struct
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1834 {
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1835 Uint32 id;
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1836 Uint32 size;
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1837 int count;
1656 2de258f2eb2e Get rid of a basically redundant function in IFF reader. Matti Hamalainen <ccr@tnsp.org> parents: 1655 diff changeset	1838 char idStr[6];
1895 eb03869a10d3 Clean up the IFF reader and make it more robust. Matti Hamalainen <ccr@tnsp.org> parents: 1894 diff changeset	1839 off_t offs;
443 f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1840 } DMIFFChunk;
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1841
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1842
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1843 typedef struct
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1844 {
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1845 Uint16 w, h;
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1846 Sint16 x, y;
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1847 Uint8 nplanes;
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1848 Uint8 masking;
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1849 Uint8 compression;
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1850 Uint8 pad1;
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1851 Uint16 transp;
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1852 Uint8 xasp, yasp;
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1853 Sint16 pagew, pageh;
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1854 } DMIFFBMHD;
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1855
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1856
444 7d588807f91d Clean up the IFF parser a bit. Matti Hamalainen <ccr@tnsp.org> parents: 443 diff changeset	1857 typedef struct
7d588807f91d Clean up the IFF parser a bit. Matti Hamalainen <ccr@tnsp.org> parents: 443 diff changeset	1858 {
1810 c9197a038e8e Various cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1808 diff changeset	1859 DMIFFChunk chFORM, chBMHD, chCMAP, chBODY;
444 7d588807f91d Clean up the IFF parser a bit. Matti Hamalainen <ccr@tnsp.org> parents: 443 diff changeset	1860 DMIFFBMHD bmhd;
1810 c9197a038e8e Various cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1808 diff changeset	1861 Uint32 camg;
444 7d588807f91d Clean up the IFF parser a bit. Matti Hamalainen <ccr@tnsp.org> parents: 443 diff changeset	1862 int ncolors;
2094 4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	1863 DMPalette *pal;
2053 6dfbe976d740 Implement basic initial support for IFF ACBM format images. Matti Hamalainen <ccr@tnsp.org> parents: 2050 diff changeset	1864 Uint32 idsig;
2064 3617ef01c1de Separate ILBM and PBM subformats of IFF images. Matti Hamalainen <ccr@tnsp.org> parents: 2063 diff changeset	1865 char *idstr;
444 7d588807f91d Clean up the IFF parser a bit. Matti Hamalainen <ccr@tnsp.org> parents: 443 diff changeset	1866 } DMIFF;
7d588807f91d Clean up the IFF parser a bit. Matti Hamalainen <ccr@tnsp.org> parents: 443 diff changeset	1867
7d588807f91d Clean up the IFF parser a bit. Matti Hamalainen <ccr@tnsp.org> parents: 443 diff changeset	1868
2068 e4dc8fbaa5ad Improve IFF probing. Matti Hamalainen <ccr@tnsp.org> parents: 2067 diff changeset	1869 static int fmtProbeIFF(const Uint8 *buf, const size_t len, const Uint32 id)
1613 70b04c16aa40 Move format probe functions near to their other functions. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	1870 {
70b04c16aa40 Move format probe functions near to their other functions. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	1871 if (len > 32 &&
2068 e4dc8fbaa5ad Improve IFF probing. Matti Hamalainen <ccr@tnsp.org> parents: 2067 diff changeset	1872 DM_BE32_TO_NATIVE((Uint32 ) (buf + 0)) == IFF_ID_FORM &&
e4dc8fbaa5ad Improve IFF probing. Matti Hamalainen <ccr@tnsp.org> parents: 2067 diff changeset	1873 DM_BE32_TO_NATIVE((Uint32 ) (buf + 8)) == id)
1613 70b04c16aa40 Move format probe functions near to their other functions. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	1874 {
2063 bd109c0a7b88 Improve IFF probing. Matti Hamalainen <ccr@tnsp.org> parents: 2057 diff changeset	1875 if (DM_BE32_TO_NATIVE((Uint32 ) (buf + 12)) == IFF_ID_BMHD)
1613 70b04c16aa40 Move format probe functions near to their other functions. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	1876 return DM_PROBE_SCORE_MAX;
70b04c16aa40 Move format probe functions near to their other functions. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	1877 else
70b04c16aa40 Move format probe functions near to their other functions. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	1878 return DM_PROBE_SCORE_GOOD;
70b04c16aa40 Move format probe functions near to their other functions. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	1879 }
70b04c16aa40 Move format probe functions near to their other functions. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	1880
70b04c16aa40 Move format probe functions near to their other functions. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	1881 return DM_PROBE_SCORE_FALSE;
70b04c16aa40 Move format probe functions near to their other functions. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	1882 }
70b04c16aa40 Move format probe functions near to their other functions. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	1883
70b04c16aa40 Move format probe functions near to their other functions. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	1884
2068 e4dc8fbaa5ad Improve IFF probing. Matti Hamalainen <ccr@tnsp.org> parents: 2067 diff changeset	1885 static int fmtProbeIFF_ILBM(const Uint8 *buf, const size_t len)
e4dc8fbaa5ad Improve IFF probing. Matti Hamalainen <ccr@tnsp.org> parents: 2067 diff changeset	1886 {
e4dc8fbaa5ad Improve IFF probing. Matti Hamalainen <ccr@tnsp.org> parents: 2067 diff changeset	1887 return fmtProbeIFF(buf, len, IFF_ID_ILBM);
e4dc8fbaa5ad Improve IFF probing. Matti Hamalainen <ccr@tnsp.org> parents: 2067 diff changeset	1888 }
e4dc8fbaa5ad Improve IFF probing. Matti Hamalainen <ccr@tnsp.org> parents: 2067 diff changeset	1889
e4dc8fbaa5ad Improve IFF probing. Matti Hamalainen <ccr@tnsp.org> parents: 2067 diff changeset	1890
e4dc8fbaa5ad Improve IFF probing. Matti Hamalainen <ccr@tnsp.org> parents: 2067 diff changeset	1891 static int fmtProbeIFF_PBM(const Uint8 *buf, const size_t len)
e4dc8fbaa5ad Improve IFF probing. Matti Hamalainen <ccr@tnsp.org> parents: 2067 diff changeset	1892 {
e4dc8fbaa5ad Improve IFF probing. Matti Hamalainen <ccr@tnsp.org> parents: 2067 diff changeset	1893 return fmtProbeIFF(buf, len, IFF_ID_PBM);
e4dc8fbaa5ad Improve IFF probing. Matti Hamalainen <ccr@tnsp.org> parents: 2067 diff changeset	1894 }
e4dc8fbaa5ad Improve IFF probing. Matti Hamalainen <ccr@tnsp.org> parents: 2067 diff changeset	1895
e4dc8fbaa5ad Improve IFF probing. Matti Hamalainen <ccr@tnsp.org> parents: 2067 diff changeset	1896
e4dc8fbaa5ad Improve IFF probing. Matti Hamalainen <ccr@tnsp.org> parents: 2067 diff changeset	1897 static int fmtProbeIFF_ACBM(const Uint8 *buf, const size_t len)
e4dc8fbaa5ad Improve IFF probing. Matti Hamalainen <ccr@tnsp.org> parents: 2067 diff changeset	1898 {
e4dc8fbaa5ad Improve IFF probing. Matti Hamalainen <ccr@tnsp.org> parents: 2067 diff changeset	1899 return fmtProbeIFF(buf, len, IFF_ID_ACBM);
e4dc8fbaa5ad Improve IFF probing. Matti Hamalainen <ccr@tnsp.org> parents: 2067 diff changeset	1900 }
e4dc8fbaa5ad Improve IFF probing. Matti Hamalainen <ccr@tnsp.org> parents: 2067 diff changeset	1901
e4dc8fbaa5ad Improve IFF probing. Matti Hamalainen <ccr@tnsp.org> parents: 2067 diff changeset	1902
1657 2b6dbdd602b5 Split IFF chunk id string from id creation into separate function. Matti Hamalainen <ccr@tnsp.org> parents: 1656 diff changeset	1903 static void dmMakeIFFChunkIDStr(DMIFFChunk *chunk)
2b6dbdd602b5 Split IFF chunk id string from id creation into separate function. Matti Hamalainen <ccr@tnsp.org> parents: 1656 diff changeset	1904 {
2b6dbdd602b5 Split IFF chunk id string from id creation into separate function. Matti Hamalainen <ccr@tnsp.org> parents: 1656 diff changeset	1905 chunk->idStr[0] = (chunk->id >> 24) & 0xff;
2b6dbdd602b5 Split IFF chunk id string from id creation into separate function. Matti Hamalainen <ccr@tnsp.org> parents: 1656 diff changeset	1906 chunk->idStr[1] = (chunk->id >> 16) & 0xff;
2b6dbdd602b5 Split IFF chunk id string from id creation into separate function. Matti Hamalainen <ccr@tnsp.org> parents: 1656 diff changeset	1907 chunk->idStr[2] = (chunk->id >> 8) & 0xff;
2b6dbdd602b5 Split IFF chunk id string from id creation into separate function. Matti Hamalainen <ccr@tnsp.org> parents: 1656 diff changeset	1908 chunk->idStr[3] = (chunk->id) & 0xff;
2b6dbdd602b5 Split IFF chunk id string from id creation into separate function. Matti Hamalainen <ccr@tnsp.org> parents: 1656 diff changeset	1909 chunk->idStr[4] = 0;
2b6dbdd602b5 Split IFF chunk id string from id creation into separate function. Matti Hamalainen <ccr@tnsp.org> parents: 1656 diff changeset	1910 }
2b6dbdd602b5 Split IFF chunk id string from id creation into separate function. Matti Hamalainen <ccr@tnsp.org> parents: 1656 diff changeset	1911
2b6dbdd602b5 Split IFF chunk id string from id creation into separate function. Matti Hamalainen <ccr@tnsp.org> parents: 1656 diff changeset	1912
1654 92656ad7f706 Improve IFF reader error handling. Matti Hamalainen <ccr@tnsp.org> parents: 1641 diff changeset	1913 static int dmReadIFFChunkHdr(DMResource fp, DMIFFChunk chunk)
443 f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1914 {
1609 c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1583 diff changeset	1915 if (!dmf_read_be32(fp, &chunk->id) \|\|
c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1583 diff changeset	1916 !dmf_read_be32(fp, &chunk->size))
443 f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1917 {
1654 92656ad7f706 Improve IFF reader error handling. Matti Hamalainen <ccr@tnsp.org> parents: 1641 diff changeset	1918 return dmError(DMERR_FREAD,
1892 cbc911ffd21e Rename ILBM functions to IFF, which is more approriate as we support both ILBM and PBM variants of the IFF images. Matti Hamalainen <ccr@tnsp.org> parents: 1887 diff changeset	1919 "IFF: Could not read IFF chunk header.\n");
443 f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1920 }
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1921 else
1656 2de258f2eb2e Get rid of a basically redundant function in IFF reader. Matti Hamalainen <ccr@tnsp.org> parents: 1655 diff changeset	1922 {
1895 eb03869a10d3 Clean up the IFF reader and make it more robust. Matti Hamalainen <ccr@tnsp.org> parents: 1894 diff changeset	1923 chunk->offs = dmftell(fp);
1657 2b6dbdd602b5 Split IFF chunk id string from id creation into separate function. Matti Hamalainen <ccr@tnsp.org> parents: 1656 diff changeset	1924 dmMakeIFFChunkIDStr(chunk);
1654 92656ad7f706 Improve IFF reader error handling. Matti Hamalainen <ccr@tnsp.org> parents: 1641 diff changeset	1925 return DMERR_OK;
1656 2de258f2eb2e Get rid of a basically redundant function in IFF reader. Matti Hamalainen <ccr@tnsp.org> parents: 1655 diff changeset	1926 }
443 f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1927 }
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1928
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1929
1895 eb03869a10d3 Clean up the IFF reader and make it more robust. Matti Hamalainen <ccr@tnsp.org> parents: 1894 diff changeset	1930 static int dmSkipIFFChunkRest(DMResource fp, const DMIFFChunk chunk)
444 7d588807f91d Clean up the IFF parser a bit. Matti Hamalainen <ccr@tnsp.org> parents: 443 diff changeset	1931 {
1901 636d3c8bcd35 Fix uneven chunk size handling in IFF reader. Matti Hamalainen <ccr@tnsp.org> parents: 1900 diff changeset	1932 off_t read = dmftell(fp) - chunk->offs,
636d3c8bcd35 Fix uneven chunk size handling in IFF reader. Matti Hamalainen <ccr@tnsp.org> parents: 1900 diff changeset	1933 size = chunk->size;
636d3c8bcd35 Fix uneven chunk size handling in IFF reader. Matti Hamalainen <ccr@tnsp.org> parents: 1900 diff changeset	1934
636d3c8bcd35 Fix uneven chunk size handling in IFF reader. Matti Hamalainen <ccr@tnsp.org> parents: 1900 diff changeset	1935 if (size & 1)
447 0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	1936 {
1901 636d3c8bcd35 Fix uneven chunk size handling in IFF reader. Matti Hamalainen <ccr@tnsp.org> parents: 1900 diff changeset	1937 dmMsg(3, "IFF: Chunk size %d is uneven, adjusting to %d.\n",
636d3c8bcd35 Fix uneven chunk size handling in IFF reader. Matti Hamalainen <ccr@tnsp.org> parents: 1900 diff changeset	1938 size, size + 1);
636d3c8bcd35 Fix uneven chunk size handling in IFF reader. Matti Hamalainen <ccr@tnsp.org> parents: 1900 diff changeset	1939 size++;
636d3c8bcd35 Fix uneven chunk size handling in IFF reader. Matti Hamalainen <ccr@tnsp.org> parents: 1900 diff changeset	1940 }
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1941
1901 636d3c8bcd35 Fix uneven chunk size handling in IFF reader. Matti Hamalainen <ccr@tnsp.org> parents: 1900 diff changeset	1942 if (size > read)
636d3c8bcd35 Fix uneven chunk size handling in IFF reader. Matti Hamalainen <ccr@tnsp.org> parents: 1900 diff changeset	1943 {
636d3c8bcd35 Fix uneven chunk size handling in IFF reader. Matti Hamalainen <ccr@tnsp.org> parents: 1900 diff changeset	1944 dmMsg(3, "IFF: Skipping %d bytes (%d of %d consumed)\n",
636d3c8bcd35 Fix uneven chunk size handling in IFF reader. Matti Hamalainen <ccr@tnsp.org> parents: 1900 diff changeset	1945 size - read, read, size);
636d3c8bcd35 Fix uneven chunk size handling in IFF reader. Matti Hamalainen <ccr@tnsp.org> parents: 1900 diff changeset	1946
636d3c8bcd35 Fix uneven chunk size handling in IFF reader. Matti Hamalainen <ccr@tnsp.org> parents: 1900 diff changeset	1947 if (dmfseek(fp, size - read, SEEK_CUR) != 0)
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1948 {
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1949 return dmError(DMERR_FSEEK,
1892 cbc911ffd21e Rename ILBM functions to IFF, which is more approriate as we support both ILBM and PBM variants of the IFF images. Matti Hamalainen <ccr@tnsp.org> parents: 1887 diff changeset	1950 "IFF: Failed to skip chunk end.\n");
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1951 }
447 0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	1952 }
1903 8ad98bc7402c Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1902 diff changeset	1953
1901 636d3c8bcd35 Fix uneven chunk size handling in IFF reader. Matti Hamalainen <ccr@tnsp.org> parents: 1900 diff changeset	1954 return DMERR_OK;
444 7d588807f91d Clean up the IFF parser a bit. Matti Hamalainen <ccr@tnsp.org> parents: 443 diff changeset	1955 }
7d588807f91d Clean up the IFF parser a bit. Matti Hamalainen <ccr@tnsp.org> parents: 443 diff changeset	1956
1656 2de258f2eb2e Get rid of a basically redundant function in IFF reader. Matti Hamalainen <ccr@tnsp.org> parents: 1655 diff changeset	1957
2053 6dfbe976d740 Implement basic initial support for IFF ACBM format images. Matti Hamalainen <ccr@tnsp.org> parents: 2050 diff changeset	1958 static int dmCheckIFFChunk(DMIFFChunk dest, const DMIFFChunk chunk,
445 1d65efb29986 Simplify. Matti Hamalainen <ccr@tnsp.org> parents: 444 diff changeset	1959 const BOOL multi, const Uint32 minSize)
443 f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1960 {
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1961 if (dest->count > 0 && !multi)
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1962 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1963 return dmError(DMERR_INVALID_DATA,
1892 cbc911ffd21e Rename ILBM functions to IFF, which is more approriate as we support both ILBM and PBM variants of the IFF images. Matti Hamalainen <ccr@tnsp.org> parents: 1887 diff changeset	1964 "IFF: Multiple instances of chunk %s found.\n",
1656 2de258f2eb2e Get rid of a basically redundant function in IFF reader. Matti Hamalainen <ccr@tnsp.org> parents: 1655 diff changeset	1965 chunk->idStr);
443 f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1966 }
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1967
443 f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1968 dest->count++;
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1969
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1970 if (chunk->size < minSize)
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1971 {
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1972 return dmError(DMERR_OUT_OF_DATA,
1907 571109a14967 Add some more informative messages in IFF loader. Matti Hamalainen <ccr@tnsp.org> parents: 1906 diff changeset	1973 "IFF: Chunk %s is too small (%d < %d).\n",
571109a14967 Add some more informative messages in IFF loader. Matti Hamalainen <ccr@tnsp.org> parents: 1906 diff changeset	1974 chunk->idStr, chunk->size, minSize);
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1975 }
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1976
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1977 return DMERR_OK;
443 f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1978 }
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1979
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1980
2055 6c6a4ea67540 Make two functions static and one not. Matti Hamalainen <ccr@tnsp.org> parents: 2054 diff changeset	1981 BOOL dmIFFDecodeByteRun1Row(DMResource fp, Uint8 buf, const size_t bufLen)
447 0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	1982 {
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	1983 size_t offs = 0;
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	1984 do
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	1985 {
1905 425259977bc5 Don't use signed arithmatic in IFF ByteRun1 decoder. Matti Hamalainen <ccr@tnsp.org> parents: 1904 diff changeset	1986 Uint8 data, ucount;
447 0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	1987
1905 425259977bc5 Don't use signed arithmatic in IFF ByteRun1 decoder. Matti Hamalainen <ccr@tnsp.org> parents: 1904 diff changeset	1988 if (!dmf_read_byte(fp, &ucount))
447 0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	1989 return FALSE;
1102 e06abfde6c39 Cosmetics pass: Remove excess whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	1990
1905 425259977bc5 Don't use signed arithmatic in IFF ByteRun1 decoder. Matti Hamalainen <ccr@tnsp.org> parents: 1904 diff changeset	1991 if (ucount == 0x80)
447 0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	1992 {
1609 c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1583 diff changeset	1993 if (!dmf_read_byte(fp, &data))
447 0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	1994 return FALSE;
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	1995 }
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	1996 else
1905 425259977bc5 Don't use signed arithmatic in IFF ByteRun1 decoder. Matti Hamalainen <ccr@tnsp.org> parents: 1904 diff changeset	1997 if (ucount & 0x80)
447 0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	1998 {
1905 425259977bc5 Don't use signed arithmatic in IFF ByteRun1 decoder. Matti Hamalainen <ccr@tnsp.org> parents: 1904 diff changeset	1999 Uint8 count = (ucount ^ 0xff) + 2;
1609 c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1583 diff changeset	2000 if (!dmf_read_byte(fp, &data))
447 0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	2001 return FALSE;
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	2002
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	2003 while (count-- && offs < bufLen)
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	2004 buf[offs++] = data;
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	2005 }
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	2006 else
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	2007 {
1905 425259977bc5 Don't use signed arithmatic in IFF ByteRun1 decoder. Matti Hamalainen <ccr@tnsp.org> parents: 1904 diff changeset	2008 Uint8 count = ucount + 1;
447 0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	2009 while (count-- && offs < bufLen)
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	2010 {
1609 c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1583 diff changeset	2011 if (!dmf_read_byte(fp, &data))
447 0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	2012 return FALSE;
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	2013
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	2014 buf[offs++] = data;
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	2015 }
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	2016 }
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	2017 } while (offs < bufLen);
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	2018
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	2019 return TRUE;
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	2020 }
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	2021
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	2022
1609 c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1583 diff changeset	2023 static BOOL dmIFFReadOneRow(DMResource fp, DMIFF iff, Uint8 *buf, const size_t bufLen)
447 0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	2024 {
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	2025 if (iff->bmhd.compression == IFF_COMP_BYTERUN1)
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	2026 return dmIFFDecodeByteRun1Row(fp, buf, bufLen);
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	2027 else
1609 c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1583 diff changeset	2028 return dmf_read_str(fp, buf, bufLen);
447 0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	2029 }
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	2030
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	2031
1622 009a3e3c54bf Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1621 diff changeset	2032 static inline Uint8 dmDecodeBit(const Uint8 *buf, const int xc)
1619 dacf4c2f7a86 Remove slight code duplication. Matti Hamalainen <ccr@tnsp.org> parents: 1618 diff changeset	2033 {
dacf4c2f7a86 Remove slight code duplication. Matti Hamalainen <ccr@tnsp.org> parents: 1618 diff changeset	2034 return (buf[xc / 8] >> (7 - (xc & 7))) & 1;
dacf4c2f7a86 Remove slight code duplication. Matti Hamalainen <ccr@tnsp.org> parents: 1618 diff changeset	2035 }
dacf4c2f7a86 Remove slight code duplication. Matti Hamalainen <ccr@tnsp.org> parents: 1618 diff changeset	2036
dacf4c2f7a86 Remove slight code duplication. Matti Hamalainen <ccr@tnsp.org> parents: 1618 diff changeset	2037
1903 8ad98bc7402c Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1902 diff changeset	2038 static int dmDecodeIFFBody(DMResource fp, DMIFF iff, DMImage *img)
444 7d588807f91d Clean up the IFF parser a bit. Matti Hamalainen <ccr@tnsp.org> parents: 443 diff changeset	2039 {
1903 8ad98bc7402c Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1902 diff changeset	2040 Uint8 *buf = NULL;
8ad98bc7402c Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1902 diff changeset	2041 size_t bufLen = 0;
1618 4c96181c9c09 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 1616 diff changeset	2042 int res = DMERR_OK;
1659 99b8ab61dc1b Micro-optimization. Matti Hamalainen <ccr@tnsp.org> parents: 1658 diff changeset	2043 const int nplanes = iff->bmhd.nplanes;
1102 e06abfde6c39 Cosmetics pass: Remove excess whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	2044
2053 6dfbe976d740 Implement basic initial support for IFF ACBM format images. Matti Hamalainen <ccr@tnsp.org> parents: 2050 diff changeset	2045 if (iff->idsig == IFF_ID_ILBM)
1903 8ad98bc7402c Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1902 diff changeset	2046 {
8ad98bc7402c Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1902 diff changeset	2047 bufLen = ((img->width + 15) / 16) * 2;
1906 09d46bf9fe71 Use a consistent message between IFF encoding and decoding. Matti Hamalainen <ccr@tnsp.org> parents: 1905 diff changeset	2048 dmMsg(2, "IFF: Line / plane row size %d bytes.\n", bufLen);
2053 6dfbe976d740 Implement basic initial support for IFF ACBM format images. Matti Hamalainen <ccr@tnsp.org> parents: 2050 diff changeset	2049
1903 8ad98bc7402c Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1902 diff changeset	2050 }
2053 6dfbe976d740 Implement basic initial support for IFF ACBM format images. Matti Hamalainen <ccr@tnsp.org> parents: 2050 diff changeset	2051 else
6dfbe976d740 Implement basic initial support for IFF ACBM format images. Matti Hamalainen <ccr@tnsp.org> parents: 2050 diff changeset	2052 if (iff->idsig == IFF_ID_ACBM)
6dfbe976d740 Implement basic initial support for IFF ACBM format images. Matti Hamalainen <ccr@tnsp.org> parents: 2050 diff changeset	2053 {
2082 a0a6f5a3fbbf Fix plane buffer size calculation for IFF ACBM to round up to nearest byte (minimum of 1). Matti Hamalainen <ccr@tnsp.org> parents: 2081 diff changeset	2054 bufLen = (img->width * img->height + 7) / 8;
2053 6dfbe976d740 Implement basic initial support for IFF ACBM format images. Matti Hamalainen <ccr@tnsp.org> parents: 2050 diff changeset	2055 dmMsg(2, "IFF: Plane buffer size %d bytes.\n", bufLen);
6dfbe976d740 Implement basic initial support for IFF ACBM format images. Matti Hamalainen <ccr@tnsp.org> parents: 2050 diff changeset	2056 }
6dfbe976d740 Implement basic initial support for IFF ACBM format images. Matti Hamalainen <ccr@tnsp.org> parents: 2050 diff changeset	2057
6dfbe976d740 Implement basic initial support for IFF ACBM format images. Matti Hamalainen <ccr@tnsp.org> parents: 2050 diff changeset	2058 if (bufLen > 0 && (buf = dmMalloc(bufLen)) == NULL)
6dfbe976d740 Implement basic initial support for IFF ACBM format images. Matti Hamalainen <ccr@tnsp.org> parents: 2050 diff changeset	2059 return DMERR_MALLOC;
1102 e06abfde6c39 Cosmetics pass: Remove excess whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	2060
447 0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	2061 // Decode the chunk
2053 6dfbe976d740 Implement basic initial support for IFF ACBM format images. Matti Hamalainen <ccr@tnsp.org> parents: 2050 diff changeset	2062 if (iff->idsig == IFF_ID_ACBM)
6dfbe976d740 Implement basic initial support for IFF ACBM format images. Matti Hamalainen <ccr@tnsp.org> parents: 2050 diff changeset	2063 {
2081 a14286e2710e Initialize the destination image data in case of IFF ACBM loading. Matti Hamalainen <ccr@tnsp.org> parents: 2078 diff changeset	2064 // Initialize destination image data
a14286e2710e Initialize the destination image data in case of IFF ACBM loading. Matti Hamalainen <ccr@tnsp.org> parents: 2078 diff changeset	2065 dmMemset(img->data, 0, img->size);
a14286e2710e Initialize the destination image data in case of IFF ACBM loading. Matti Hamalainen <ccr@tnsp.org> parents: 2078 diff changeset	2066
2053 6dfbe976d740 Implement basic initial support for IFF ACBM format images. Matti Hamalainen <ccr@tnsp.org> parents: 2050 diff changeset	2067 for (int plane = 0; plane < nplanes; plane++)
6dfbe976d740 Implement basic initial support for IFF ACBM format images. Matti Hamalainen <ccr@tnsp.org> parents: 2050 diff changeset	2068 {
2069 83a3d05b5c1d Fixes to ACBM support. Matti Hamalainen <ccr@tnsp.org> parents: 2068 diff changeset	2069 // Decompress or read data
83a3d05b5c1d Fixes to ACBM support. Matti Hamalainen <ccr@tnsp.org> parents: 2068 diff changeset	2070 if (!dmIFFReadOneRow(fp, iff, buf, bufLen))
2053 6dfbe976d740 Implement basic initial support for IFF ACBM format images. Matti Hamalainen <ccr@tnsp.org> parents: 2050 diff changeset	2071 {
6dfbe976d740 Implement basic initial support for IFF ACBM format images. Matti Hamalainen <ccr@tnsp.org> parents: 2050 diff changeset	2072 res = dmError(DMERR_FREAD,
2069 83a3d05b5c1d Fixes to ACBM support. Matti Hamalainen <ccr@tnsp.org> parents: 2068 diff changeset	2073 "IFF: Error in reading ACBM image plane #%d.\n",
2053 6dfbe976d740 Implement basic initial support for IFF ACBM format images. Matti Hamalainen <ccr@tnsp.org> parents: 2050 diff changeset	2074 plane);
6dfbe976d740 Implement basic initial support for IFF ACBM format images. Matti Hamalainen <ccr@tnsp.org> parents: 2050 diff changeset	2075 goto out;
6dfbe976d740 Implement basic initial support for IFF ACBM format images. Matti Hamalainen <ccr@tnsp.org> parents: 2050 diff changeset	2076 }
6dfbe976d740 Implement basic initial support for IFF ACBM format images. Matti Hamalainen <ccr@tnsp.org> parents: 2050 diff changeset	2077
6dfbe976d740 Implement basic initial support for IFF ACBM format images. Matti Hamalainen <ccr@tnsp.org> parents: 2050 diff changeset	2078 for (int yc = 0; yc < img->height; yc++)
6dfbe976d740 Implement basic initial support for IFF ACBM format images. Matti Hamalainen <ccr@tnsp.org> parents: 2050 diff changeset	2079 {
6dfbe976d740 Implement basic initial support for IFF ACBM format images. Matti Hamalainen <ccr@tnsp.org> parents: 2050 diff changeset	2080 Uint8 dp = img->data + (yc img->pitch);
2067 430c010d97c1 Fix hardcoding in ACBM decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2065 diff changeset	2081 Uint8 sp = buf + (yc img->width) / 8;
2053 6dfbe976d740 Implement basic initial support for IFF ACBM format images. Matti Hamalainen <ccr@tnsp.org> parents: 2050 diff changeset	2082 for (int xc = 0; xc < img->width; xc++)
6dfbe976d740 Implement basic initial support for IFF ACBM format images. Matti Hamalainen <ccr@tnsp.org> parents: 2050 diff changeset	2083 {
2067 430c010d97c1 Fix hardcoding in ACBM decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2065 diff changeset	2084 dp[xc] \|= dmDecodeBit(sp, xc) << plane;
2053 6dfbe976d740 Implement basic initial support for IFF ACBM format images. Matti Hamalainen <ccr@tnsp.org> parents: 2050 diff changeset	2085 }
6dfbe976d740 Implement basic initial support for IFF ACBM format images. Matti Hamalainen <ccr@tnsp.org> parents: 2050 diff changeset	2086 }
6dfbe976d740 Implement basic initial support for IFF ACBM format images. Matti Hamalainen <ccr@tnsp.org> parents: 2050 diff changeset	2087 }
6dfbe976d740 Implement basic initial support for IFF ACBM format images. Matti Hamalainen <ccr@tnsp.org> parents: 2050 diff changeset	2088 }
6dfbe976d740 Implement basic initial support for IFF ACBM format images. Matti Hamalainen <ccr@tnsp.org> parents: 2050 diff changeset	2089 else
1618 4c96181c9c09 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 1616 diff changeset	2090 for (int yc = 0; yc < img->height; yc++)
447 0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	2091 {
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	2092 Uint8 dp = img->data + (yc img->pitch);
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	2093
2053 6dfbe976d740 Implement basic initial support for IFF ACBM format images. Matti Hamalainen <ccr@tnsp.org> parents: 2050 diff changeset	2094 if (iff->idsig == IFF_ID_ILBM)
447 0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	2095 {
1907 571109a14967 Add some more informative messages in IFF loader. Matti Hamalainen <ccr@tnsp.org> parents: 1906 diff changeset	2096 // Clear planar decoding buffer
1903 8ad98bc7402c Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1902 diff changeset	2097 dmMemset(dp, 0, img->pitch);
8ad98bc7402c Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1902 diff changeset	2098
8ad98bc7402c Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1902 diff changeset	2099 for (int plane = 0; plane < nplanes; plane++)
447 0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	2100 {
1903 8ad98bc7402c Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1902 diff changeset	2101 // Decompress or read data
8ad98bc7402c Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1902 diff changeset	2102 if (!dmIFFReadOneRow(fp, iff, buf, bufLen))
8ad98bc7402c Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1902 diff changeset	2103 {
8ad98bc7402c Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1902 diff changeset	2104 res = dmError(DMERR_FREAD,
2069 83a3d05b5c1d Fixes to ACBM support. Matti Hamalainen <ccr@tnsp.org> parents: 2068 diff changeset	2105 "IFF: Error in reading ILBM image plane #%d @ %d.\n",
1903 8ad98bc7402c Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1902 diff changeset	2106 plane, yc);
8ad98bc7402c Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1902 diff changeset	2107 goto out;
8ad98bc7402c Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1902 diff changeset	2108 }
8ad98bc7402c Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1902 diff changeset	2109
8ad98bc7402c Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1902 diff changeset	2110 // Decode bitplane
8ad98bc7402c Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1902 diff changeset	2111 for (int xc = 0; xc < img->width; xc++)
8ad98bc7402c Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1902 diff changeset	2112 dp[xc] \|= dmDecodeBit(buf, xc) << plane;
447 0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	2113 }
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	2114
1903 8ad98bc7402c Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1902 diff changeset	2115 // Read mask data
8ad98bc7402c Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1902 diff changeset	2116 if (iff->bmhd.masking == IFF_MASK_HAS_MASK)
8ad98bc7402c Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1902 diff changeset	2117 {
8ad98bc7402c Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1902 diff changeset	2118 // Decompress or read data
8ad98bc7402c Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1902 diff changeset	2119 if (!dmIFFReadOneRow(fp, iff, buf, bufLen))
8ad98bc7402c Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1902 diff changeset	2120 {
8ad98bc7402c Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1902 diff changeset	2121 res = dmError(DMERR_FREAD,
2069 83a3d05b5c1d Fixes to ACBM support. Matti Hamalainen <ccr@tnsp.org> parents: 2068 diff changeset	2122 "IFF: Error in reading ILBM mask plane.\n");
1903 8ad98bc7402c Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1902 diff changeset	2123 goto out;
8ad98bc7402c Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1902 diff changeset	2124 }
447 0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	2125
1903 8ad98bc7402c Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1902 diff changeset	2126 // Decode mask
8ad98bc7402c Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1902 diff changeset	2127 for (int xc = 0; xc < img->width; xc++)
8ad98bc7402c Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1902 diff changeset	2128 {
8ad98bc7402c Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1902 diff changeset	2129 const Uint8 data = dmDecodeBit(buf, xc);
8ad98bc7402c Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1902 diff changeset	2130
8ad98bc7402c Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1902 diff changeset	2131 // Black out any pixels with mask bit 0
8ad98bc7402c Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1902 diff changeset	2132 if (!data)
2094 4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	2133 dp[xc] = img->pal->ctransp < 0 ? 0 : img->pal->ctransp;
1903 8ad98bc7402c Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1902 diff changeset	2134 }
8ad98bc7402c Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1902 diff changeset	2135 }
8ad98bc7402c Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1902 diff changeset	2136 }
8ad98bc7402c Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1902 diff changeset	2137 else
2053 6dfbe976d740 Implement basic initial support for IFF ACBM format images. Matti Hamalainen <ccr@tnsp.org> parents: 2050 diff changeset	2138 if (iff->idsig == IFF_ID_PBM)
447 0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	2139 {
1903 8ad98bc7402c Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1902 diff changeset	2140 if (!dmIFFReadOneRow(fp, iff, dp, img->width))
447 0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	2141 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	2142 res = dmError(DMERR_FREAD,
1903 8ad98bc7402c Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1902 diff changeset	2143 "IFF: Error reading PBM image row #%d.\n", yc);
8ad98bc7402c Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1902 diff changeset	2144 goto out;
447 0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	2145 }
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	2146 }
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	2147 }
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	2148
1903 8ad98bc7402c Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1902 diff changeset	2149 out:
447 0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	2150 dmFree(buf);
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	2151 return res;
444 7d588807f91d Clean up the IFF parser a bit. Matti Hamalainen <ccr@tnsp.org> parents: 443 diff changeset	2152 }
7d588807f91d Clean up the IFF parser a bit. Matti Hamalainen <ccr@tnsp.org> parents: 443 diff changeset	2153
7d588807f91d Clean up the IFF parser a bit. Matti Hamalainen <ccr@tnsp.org> parents: 443 diff changeset	2154
1892 cbc911ffd21e Rename ILBM functions to IFF, which is more approriate as we support both ILBM and PBM variants of the IFF images. Matti Hamalainen <ccr@tnsp.org> parents: 1887 diff changeset	2155 int dmReadIFFImage(DMResource fp, DMImage *pimg)
443 f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	2156 {
444 7d588807f91d Clean up the IFF parser a bit. Matti Hamalainen <ccr@tnsp.org> parents: 443 diff changeset	2157 DMIFFChunk chunk;
7d588807f91d Clean up the IFF parser a bit. Matti Hamalainen <ccr@tnsp.org> parents: 443 diff changeset	2158 DMIFF iff;
1903 8ad98bc7402c Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1902 diff changeset	2159 BOOL parsed = FALSE;
1627 d0e626e039bf Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 1626 diff changeset	2160 int res = DMERR_OK;
443 f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	2161
1167 848a88ce7a57 Use dmMemset(). Matti Hamalainen <ccr@tnsp.org> parents: 1152 diff changeset	2162 dmMemset(&iff, 0, sizeof(iff));
443 f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	2163
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	2164 // Read IFF FORM header
1654 92656ad7f706 Improve IFF reader error handling. Matti Hamalainen <ccr@tnsp.org> parents: 1641 diff changeset	2165 if ((res = dmReadIFFChunkHdr(fp, &chunk)) != DMERR_OK)
92656ad7f706 Improve IFF reader error handling. Matti Hamalainen <ccr@tnsp.org> parents: 1641 diff changeset	2166 return res;
92656ad7f706 Improve IFF reader error handling. Matti Hamalainen <ccr@tnsp.org> parents: 1641 diff changeset	2167
92656ad7f706 Improve IFF reader error handling. Matti Hamalainen <ccr@tnsp.org> parents: 1641 diff changeset	2168 if (chunk.id != IFF_ID_FORM \|\| chunk.size < 32)
443 f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	2169 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	2170 return dmError(DMERR_NOT_SUPPORTED,
1892 cbc911ffd21e Rename ILBM functions to IFF, which is more approriate as we support both ILBM and PBM variants of the IFF images. Matti Hamalainen <ccr@tnsp.org> parents: 1887 diff changeset	2171 "IFF: Not a IFF file (%08X vs %08X / %d).\n",
1265 4e074b9b4789 Improve IFF FORM validity error message. Matti Hamalainen <ccr@tnsp.org> parents: 1264 diff changeset	2172 chunk.id, IFF_ID_FORM, chunk.size);
443 f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	2173 }
1102 e06abfde6c39 Cosmetics pass: Remove excess whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	2174
1892 cbc911ffd21e Rename ILBM functions to IFF, which is more approriate as we support both ILBM and PBM variants of the IFF images. Matti Hamalainen <ccr@tnsp.org> parents: 1887 diff changeset	2175 // Check IFF ILBM/PBM signature
2053 6dfbe976d740 Implement basic initial support for IFF ACBM format images. Matti Hamalainen <ccr@tnsp.org> parents: 2050 diff changeset	2176 if (!dmf_read_be32(fp, &iff.idsig) \|\|
6dfbe976d740 Implement basic initial support for IFF ACBM format images. Matti Hamalainen <ccr@tnsp.org> parents: 2050 diff changeset	2177 (iff.idsig != IFF_ID_ILBM &&
6dfbe976d740 Implement basic initial support for IFF ACBM format images. Matti Hamalainen <ccr@tnsp.org> parents: 2050 diff changeset	2178 iff.idsig != IFF_ID_PBM &&
6dfbe976d740 Implement basic initial support for IFF ACBM format images. Matti Hamalainen <ccr@tnsp.org> parents: 2050 diff changeset	2179 iff.idsig != IFF_ID_ACBM))
443 f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	2180 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	2181 return dmError(DMERR_INVALID_DATA,
2053 6dfbe976d740 Implement basic initial support for IFF ACBM format images. Matti Hamalainen <ccr@tnsp.org> parents: 2050 diff changeset	2182 "IFF: Not a IFF ILBM/PBM/ACBM file.\n");
443 f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	2183 }
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	2184
2023 362fb8295f0c Be more informative about the actual sub-format of the IFF image (PBM/ILBM). Matti Hamalainen <ccr@tnsp.org> parents: 2022 diff changeset	2185 dmMsg(3, "IFF: FORM is %s format image, with size %d bytes.\n",
2064 3617ef01c1de Separate ILBM and PBM subformats of IFF images. Matti Hamalainen <ccr@tnsp.org> parents: 2063 diff changeset	2186 iff.idsig == IFF_ID_ILBM ? "ILBM" :
3617ef01c1de Separate ILBM and PBM subformats of IFF images. Matti Hamalainen <ccr@tnsp.org> parents: 2063 diff changeset	2187 (iff.idsig == IFF_ID_PBM ? "PBM" : "ACBM"),
2053 6dfbe976d740 Implement basic initial support for IFF ACBM format images. Matti Hamalainen <ccr@tnsp.org> parents: 2050 diff changeset	2188 chunk.size);
1907 571109a14967 Add some more informative messages in IFF loader. Matti Hamalainen <ccr@tnsp.org> parents: 1906 diff changeset	2189
1609 c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1583 diff changeset	2190 while (!parsed && !dmfeof(fp))
443 f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	2191 {
1895 eb03869a10d3 Clean up the IFF reader and make it more robust. Matti Hamalainen <ccr@tnsp.org> parents: 1894 diff changeset	2192 // Read chunk header
1654 92656ad7f706 Improve IFF reader error handling. Matti Hamalainen <ccr@tnsp.org> parents: 1641 diff changeset	2193 if ((res = dmReadIFFChunkHdr(fp, &chunk)) != DMERR_OK)
92656ad7f706 Improve IFF reader error handling. Matti Hamalainen <ccr@tnsp.org> parents: 1641 diff changeset	2194 return res;
1102 e06abfde6c39 Cosmetics pass: Remove excess whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	2195
443 f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	2196 switch (chunk.id)
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	2197 {
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	2198 case IFF_ID_BMHD:
447 0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	2199 // Check for multiple occurences of BMHD
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	2200 if ((res = dmCheckIFFChunk(&iff.chBMHD, &chunk, FALSE, sizeof(iff.bmhd))) != DMERR_OK)
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	2201 return res;
443 f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	2202
447 0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	2203 // Read BMHD data
1609 c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1583 diff changeset	2204 if (!dmf_read_be16(fp, &iff.bmhd.w) \|\|
c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1583 diff changeset	2205 !dmf_read_be16(fp, &iff.bmhd.h) \|\|
c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1583 diff changeset	2206 !dmf_read_be16(fp, (Uint16 *) &iff.bmhd.x) \|\|
c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1583 diff changeset	2207 !dmf_read_be16(fp, (Uint16 *) &iff.bmhd.y) \|\|
c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1583 diff changeset	2208 !dmf_read_byte(fp, &iff.bmhd.nplanes) \|\|
c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1583 diff changeset	2209 !dmf_read_byte(fp, &iff.bmhd.masking) \|\|
c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1583 diff changeset	2210 !dmf_read_byte(fp, &iff.bmhd.compression) \|\|
c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1583 diff changeset	2211 !dmf_read_byte(fp, &iff.bmhd.pad1) \|\|
c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1583 diff changeset	2212 !dmf_read_be16(fp, &iff.bmhd.transp) \|\|
c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1583 diff changeset	2213 !dmf_read_byte(fp, &iff.bmhd.xasp) \|\|
c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1583 diff changeset	2214 !dmf_read_byte(fp, &iff.bmhd.yasp) \|\|
c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1583 diff changeset	2215 !dmf_read_be16(fp, (Uint16 *) &iff.bmhd.pagew) \|\|
c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1583 diff changeset	2216 !dmf_read_be16(fp, (Uint16 *) &iff.bmhd.pageh))
443 f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	2217 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	2218 return dmError(DMERR_FREAD,
1892 cbc911ffd21e Rename ILBM functions to IFF, which is more approriate as we support both ILBM and PBM variants of the IFF images. Matti Hamalainen <ccr@tnsp.org> parents: 1887 diff changeset	2219 "IFF: Error reading BMHD chunk.\n");
443 f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	2220 }
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	2221
1892 cbc911ffd21e Rename ILBM functions to IFF, which is more approriate as we support both ILBM and PBM variants of the IFF images. Matti Hamalainen <ccr@tnsp.org> parents: 1887 diff changeset	2222 dmMsg(1, "IFF: BMHD %d x %d @ %d, %d : nplanes=%d, comp=%d, mask=%d, transp=%d\n",
447 0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	2223 iff.bmhd.w, iff.bmhd.h, iff.bmhd.x, iff.bmhd.y,
1655 a05e3fcc60ec Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1654 diff changeset	2224 iff.bmhd.nplanes, iff.bmhd.compression, iff.bmhd.masking,
a05e3fcc60ec Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1654 diff changeset	2225 iff.bmhd.transp);
1102 e06abfde6c39 Cosmetics pass: Remove excess whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	2226
447 0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	2227 // Sanity check
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	2228 if (iff.bmhd.nplanes < 1 \|\| iff.bmhd.nplanes > 8 \|\|
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	2229 (iff.bmhd.compression != IFF_COMP_NONE &&
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	2230 iff.bmhd.compression != IFF_COMP_BYTERUN1) \|\|
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	2231 (iff.bmhd.masking != IFF_MASK_NONE &&
448 f1aab48a76fe Add transp mask support to IFF ILBM loader. Matti Hamalainen <ccr@tnsp.org> parents: 447 diff changeset	2232 iff.bmhd.masking != IFF_MASK_HAS_MASK &&
f1aab48a76fe Add transp mask support to IFF ILBM loader. Matti Hamalainen <ccr@tnsp.org> parents: 447 diff changeset	2233 iff.bmhd.masking != IFF_MASK_TRANSP))
447 0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	2234 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	2235 return dmError(DMERR_NOT_SUPPORTED,
1892 cbc911ffd21e Rename ILBM functions to IFF, which is more approriate as we support both ILBM and PBM variants of the IFF images. Matti Hamalainen <ccr@tnsp.org> parents: 1887 diff changeset	2236 "IFF: Unsupported features, refusing to load.\n");
447 0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	2237 }
2069 83a3d05b5c1d Fixes to ACBM support. Matti Hamalainen <ccr@tnsp.org> parents: 2068 diff changeset	2238
83a3d05b5c1d Fixes to ACBM support. Matti Hamalainen <ccr@tnsp.org> parents: 2068 diff changeset	2239 if (iff.idsig == IFF_ID_ACBM &&
83a3d05b5c1d Fixes to ACBM support. Matti Hamalainen <ccr@tnsp.org> parents: 2068 diff changeset	2240 iff.bmhd.compression != IFF_COMP_NONE)
83a3d05b5c1d Fixes to ACBM support. Matti Hamalainen <ccr@tnsp.org> parents: 2068 diff changeset	2241 {
83a3d05b5c1d Fixes to ACBM support. Matti Hamalainen <ccr@tnsp.org> parents: 2068 diff changeset	2242 dmMsg(1, "IFF: ACBM image with compression != none (%d). Ignoring.\n",
83a3d05b5c1d Fixes to ACBM support. Matti Hamalainen <ccr@tnsp.org> parents: 2068 diff changeset	2243 iff.bmhd.compression);
83a3d05b5c1d Fixes to ACBM support. Matti Hamalainen <ccr@tnsp.org> parents: 2068 diff changeset	2244
83a3d05b5c1d Fixes to ACBM support. Matti Hamalainen <ccr@tnsp.org> parents: 2068 diff changeset	2245 iff.bmhd.compression = IFF_COMP_NONE;
83a3d05b5c1d Fixes to ACBM support. Matti Hamalainen <ccr@tnsp.org> parents: 2068 diff changeset	2246 }
443 f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	2247 break;
444 7d588807f91d Clean up the IFF parser a bit. Matti Hamalainen <ccr@tnsp.org> parents: 443 diff changeset	2248
443 f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	2249
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	2250 case IFF_ID_CMAP:
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	2251 // Check for multiple occurences of CMAP
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	2252 if ((res = dmCheckIFFChunk(&iff.chCMAP, &chunk, FALSE, 3)) != DMERR_OK)
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	2253 return res;
443 f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	2254
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	2255 // Check for sanity
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	2256 if (chunk.size % 3 != 0)
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	2257 {
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	2258 // Non-fatal
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	2259 dmError(DMERR_INVALID_DATA,
1892 cbc911ffd21e Rename ILBM functions to IFF, which is more approriate as we support both ILBM and PBM variants of the IFF images. Matti Hamalainen <ccr@tnsp.org> parents: 1887 diff changeset	2260 "IFF: CMAP chunk size not divisible by 3, possibly broken file.\n");
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	2261 }
443 f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	2262
444 7d588807f91d Clean up the IFF parser a bit. Matti Hamalainen <ccr@tnsp.org> parents: 443 diff changeset	2263 iff.ncolors = chunk.size / 3;
1892 cbc911ffd21e Rename ILBM functions to IFF, which is more approriate as we support both ILBM and PBM variants of the IFF images. Matti Hamalainen <ccr@tnsp.org> parents: 1887 diff changeset	2264 dmMsg(2, "IFF: CMAP %d entries (%d bytes)\n",
1624 9a8395b56d1a Remove unused message argument. Matti Hamalainen <ccr@tnsp.org> parents: 1623 diff changeset	2265 iff.ncolors, chunk.size);
443 f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	2266
444 7d588807f91d Clean up the IFF parser a bit. Matti Hamalainen <ccr@tnsp.org> parents: 443 diff changeset	2267 if (iff.bmhd.nplanes > 0 && iff.ncolors != 1 << iff.bmhd.nplanes)
1892 cbc911ffd21e Rename ILBM functions to IFF, which is more approriate as we support both ILBM and PBM variants of the IFF images. Matti Hamalainen <ccr@tnsp.org> parents: 1887 diff changeset	2268 dmMsg(2, "IFF: Expected %d entries in CMAP.\n", 1 << iff.bmhd.nplanes);
1102 e06abfde6c39 Cosmetics pass: Remove excess whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	2269
451 fdc91f2a0d27 Modularize palette reading and handling code. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	2270 // Read palette
fdc91f2a0d27 Modularize palette reading and handling code. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	2271 if (iff.ncolors > 0)
443 f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	2272 {
2094 4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	2273 if ((res = dmPaletteAlloc(&iff.pal, iff.ncolors,
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	2274 (iff.bmhd.masking == IFF_MASK_TRANSP) ? iff.bmhd.transp : -1)) != DMERR_OK)
443 f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	2275 {
2094 4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	2276 dmErrorMsg("IFF: Could not allocate palette data.\n");
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	2277 return res;
451 fdc91f2a0d27 Modularize palette reading and handling code. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	2278 }
2094 4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	2279 if ((res = dmPaletteReadData(fp, iff.pal, iff.ncolors)) != DMERR_OK)
451 fdc91f2a0d27 Modularize palette reading and handling code. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	2280 {
2094 4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	2281 dmErrorMsg("IFF: Error reading CMAP.\n");
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	2282 return res;
443 f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	2283 }
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	2284 }
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	2285
444 7d588807f91d Clean up the IFF parser a bit. Matti Hamalainen <ccr@tnsp.org> parents: 443 diff changeset	2286 if (iff.chBMHD.count && iff.chBODY.count)
443 f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	2287 parsed = TRUE;
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	2288 break;
1102 e06abfde6c39 Cosmetics pass: Remove excess whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	2289
443 f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	2290 case IFF_ID_BODY:
2053 6dfbe976d740 Implement basic initial support for IFF ACBM format images. Matti Hamalainen <ccr@tnsp.org> parents: 2050 diff changeset	2291 case IFF_ID_ABIT:
1621 9aaa8ee24626 Fix a comment. Matti Hamalainen <ccr@tnsp.org> parents: 1620 diff changeset	2292 // Check for multiple occurences of BODY
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	2293 if ((res = dmCheckIFFChunk(&iff.chBODY, &chunk, FALSE, 1)) != DMERR_OK)
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	2294 return res;
443 f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	2295
447 0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	2296 // Check for sanity
444 7d588807f91d Clean up the IFF parser a bit. Matti Hamalainen <ccr@tnsp.org> parents: 443 diff changeset	2297 if (!iff.chBMHD.count)
443 f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	2298 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	2299 return dmError(DMERR_INVALID_DATA,
2053 6dfbe976d740 Implement basic initial support for IFF ACBM format images. Matti Hamalainen <ccr@tnsp.org> parents: 2050 diff changeset	2300 "IFF: %s chunk before BMHD?\n", chunk.idStr);
443 f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	2301 }
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	2302
2053 6dfbe976d740 Implement basic initial support for IFF ACBM format images. Matti Hamalainen <ccr@tnsp.org> parents: 2050 diff changeset	2303 dmMsg(2, "IFF: %s chunk size %d bytes\n", chunk.idStr, chunk.size);
1102 e06abfde6c39 Cosmetics pass: Remove excess whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	2304
1626 1793fc1496da Remove some code duplication. Matti Hamalainen <ccr@tnsp.org> parents: 1625 diff changeset	2305 // Allocate image
1793fc1496da Remove some code duplication. Matti Hamalainen <ccr@tnsp.org> parents: 1625 diff changeset	2306 if ((*pimg = dmImageAlloc(iff.bmhd.w, iff.bmhd.h,
1801 0562dd55a1f6 s/DM_IFMT_/DM_COLFMT_/g Matti Hamalainen <ccr@tnsp.org> parents: 1800 diff changeset	2307 iff.bmhd.nplanes <= 8 ? DM_COLFMT_PALETTE : DM_COLFMT_RGBA,
1626 1793fc1496da Remove some code duplication. Matti Hamalainen <ccr@tnsp.org> parents: 1625 diff changeset	2308 // XXX TODO? When/if we ever handle < 8bit indexed correctly, we can use the actual bpp
1793fc1496da Remove some code duplication. Matti Hamalainen <ccr@tnsp.org> parents: 1625 diff changeset	2309 //iff->bmhd.nplanes <= 8 ? iff->bmhd.nplanes : -1
1793fc1496da Remove some code duplication. Matti Hamalainen <ccr@tnsp.org> parents: 1625 diff changeset	2310 -1
1793fc1496da Remove some code duplication. Matti Hamalainen <ccr@tnsp.org> parents: 1625 diff changeset	2311 )) == NULL)
1793fc1496da Remove some code duplication. Matti Hamalainen <ccr@tnsp.org> parents: 1625 diff changeset	2312 return DMERR_MALLOC;
1793fc1496da Remove some code duplication. Matti Hamalainen <ccr@tnsp.org> parents: 1625 diff changeset	2313
1628 a549d33d543a Add image aspect ratio information. Matti Hamalainen <ccr@tnsp.org> parents: 1627 diff changeset	2314 // Set image aspect ratio
a549d33d543a Add image aspect ratio information. Matti Hamalainen <ccr@tnsp.org> parents: 1627 diff changeset	2315 if (iff.bmhd.xasp > 0 && iff.bmhd.yasp > 0)
a549d33d543a Add image aspect ratio information. Matti Hamalainen <ccr@tnsp.org> parents: 1627 diff changeset	2316 (*pimg)->aspect = (float) iff.bmhd.yasp / (float) iff.bmhd.xasp;
1626 1793fc1496da Remove some code duplication. Matti Hamalainen <ccr@tnsp.org> parents: 1625 diff changeset	2317
447 0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	2318 // Decode the body
1903 8ad98bc7402c Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1902 diff changeset	2319 if ((res = dmDecodeIFFBody(fp, &iff, *pimg)) != DMERR_OK)
8ad98bc7402c Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1902 diff changeset	2320 return res;
444 7d588807f91d Clean up the IFF parser a bit. Matti Hamalainen <ccr@tnsp.org> parents: 443 diff changeset	2321
1895 eb03869a10d3 Clean up the IFF reader and make it more robust. Matti Hamalainen <ccr@tnsp.org> parents: 1894 diff changeset	2322 if ((res = dmSkipIFFChunkRest(fp, &chunk)) != DMERR_OK)
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	2323 return res;
447 0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	2324
444 7d588807f91d Clean up the IFF parser a bit. Matti Hamalainen <ccr@tnsp.org> parents: 443 diff changeset	2325 if (iff.chCMAP.count)
443 f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	2326 parsed = TRUE;
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	2327 break;
449 117f94b253af Add support for CAMG chunk reading and possibly half-brite handling in IFF ILBM reader. Matti Hamalainen <ccr@tnsp.org> parents: 448 diff changeset	2328
117f94b253af Add support for CAMG chunk reading and possibly half-brite handling in IFF ILBM reader. Matti Hamalainen <ccr@tnsp.org> parents: 448 diff changeset	2329 case IFF_ID_CAMG:
1609 c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1583 diff changeset	2330 if (!dmf_read_be32(fp, &iff.camg))
449 117f94b253af Add support for CAMG chunk reading and possibly half-brite handling in IFF ILBM reader. Matti Hamalainen <ccr@tnsp.org> parents: 448 diff changeset	2331 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	2332 return dmError(DMERR_FREAD,
1892 cbc911ffd21e Rename ILBM functions to IFF, which is more approriate as we support both ILBM and PBM variants of the IFF images. Matti Hamalainen <ccr@tnsp.org> parents: 1887 diff changeset	2333 "IFF: Error reading CAMG chunk.\n");
449 117f94b253af Add support for CAMG chunk reading and possibly half-brite handling in IFF ILBM reader. Matti Hamalainen <ccr@tnsp.org> parents: 448 diff changeset	2334 }
1102 e06abfde6c39 Cosmetics pass: Remove excess whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	2335
1892 cbc911ffd21e Rename ILBM functions to IFF, which is more approriate as we support both ILBM and PBM variants of the IFF images. Matti Hamalainen <ccr@tnsp.org> parents: 1887 diff changeset	2336 dmMsg(2, "IFF: CAMG value 0x%08x\n", iff.camg);
449 117f94b253af Add support for CAMG chunk reading and possibly half-brite handling in IFF ILBM reader. Matti Hamalainen <ccr@tnsp.org> parents: 448 diff changeset	2337
117f94b253af Add support for CAMG chunk reading and possibly half-brite handling in IFF ILBM reader. Matti Hamalainen <ccr@tnsp.org> parents: 448 diff changeset	2338 if ((iff.camg & IFF_CAMG_HAM))
117f94b253af Add support for CAMG chunk reading and possibly half-brite handling in IFF ILBM reader. Matti Hamalainen <ccr@tnsp.org> parents: 448 diff changeset	2339 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	2340 return dmError(DMERR_NOT_SUPPORTED,
1892 cbc911ffd21e Rename ILBM functions to IFF, which is more approriate as we support both ILBM and PBM variants of the IFF images. Matti Hamalainen <ccr@tnsp.org> parents: 1887 diff changeset	2341 "IFF: HAM files are not supported.\n");
449 117f94b253af Add support for CAMG chunk reading and possibly half-brite handling in IFF ILBM reader. Matti Hamalainen <ccr@tnsp.org> parents: 448 diff changeset	2342 }
117f94b253af Add support for CAMG chunk reading and possibly half-brite handling in IFF ILBM reader. Matti Hamalainen <ccr@tnsp.org> parents: 448 diff changeset	2343 break;
117f94b253af Add support for CAMG chunk reading and possibly half-brite handling in IFF ILBM reader. Matti Hamalainen <ccr@tnsp.org> parents: 448 diff changeset	2344
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	2345
443 f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	2346 default:
1901 636d3c8bcd35 Fix uneven chunk size handling in IFF reader. Matti Hamalainen <ccr@tnsp.org> parents: 1900 diff changeset	2347 dmMsg(3, "Unknown chunk ID '%s', size %d\n",
636d3c8bcd35 Fix uneven chunk size handling in IFF reader. Matti Hamalainen <ccr@tnsp.org> parents: 1900 diff changeset	2348 chunk.idStr, chunk.size);
1102 e06abfde6c39 Cosmetics pass: Remove excess whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	2349
1901 636d3c8bcd35 Fix uneven chunk size handling in IFF reader. Matti Hamalainen <ccr@tnsp.org> parents: 1900 diff changeset	2350 if (dmfseek(fp, chunk.size, SEEK_CUR) != 0)
636d3c8bcd35 Fix uneven chunk size handling in IFF reader. Matti Hamalainen <ccr@tnsp.org> parents: 1900 diff changeset	2351 {
636d3c8bcd35 Fix uneven chunk size handling in IFF reader. Matti Hamalainen <ccr@tnsp.org> parents: 1900 diff changeset	2352 return dmError(DMERR_FSEEK,
636d3c8bcd35 Fix uneven chunk size handling in IFF reader. Matti Hamalainen <ccr@tnsp.org> parents: 1900 diff changeset	2353 "IFF: Error skipping in file.");
443 f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	2354 }
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	2355 break;
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	2356 }
1102 e06abfde6c39 Cosmetics pass: Remove excess whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	2357
1895 eb03869a10d3 Clean up the IFF reader and make it more robust. Matti Hamalainen <ccr@tnsp.org> parents: 1894 diff changeset	2358 if ((res = dmSkipIFFChunkRest(fp, &chunk)) != DMERR_OK)
eb03869a10d3 Clean up the IFF reader and make it more robust. Matti Hamalainen <ccr@tnsp.org> parents: 1894 diff changeset	2359 return res;
443 f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	2360 }
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	2361
1948 5790b52c339e Check that we have a CMAP/palette for IFF images that should have it. Matti Hamalainen <ccr@tnsp.org> parents: 1945 diff changeset	2362 // Check if we should have a palette
2019 e809e323fdde Check for NULL pointer. Matti Hamalainen <ccr@tnsp.org> parents: 2016 diff changeset	2363 if (pimg != NULL && (pimg)->format == DM_COLFMT_PALETTE)
447 0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	2364 {
1948 5790b52c339e Check that we have a CMAP/palette for IFF images that should have it. Matti Hamalainen <ccr@tnsp.org> parents: 1945 diff changeset	2365 // Check that we DO have a palette ..
2094 4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	2366 if (iff.pal == NULL \|\| iff.pal->ncolors == 0)
1948 5790b52c339e Check that we have a CMAP/palette for IFF images that should have it. Matti Hamalainen <ccr@tnsp.org> parents: 1945 diff changeset	2367 {
5790b52c339e Check that we have a CMAP/palette for IFF images that should have it. Matti Hamalainen <ccr@tnsp.org> parents: 1945 diff changeset	2368 return dmError(DMERR_INVALID_DATA,
5790b52c339e Check that we have a CMAP/palette for IFF images that should have it. Matti Hamalainen <ccr@tnsp.org> parents: 1945 diff changeset	2369 "IFF: A paletted/indexed color image with no CMAP. Bailing out.\n");
5790b52c339e Check that we have a CMAP/palette for IFF images that should have it. Matti Hamalainen <ccr@tnsp.org> parents: 1945 diff changeset	2370 }
5790b52c339e Check that we have a CMAP/palette for IFF images that should have it. Matti Hamalainen <ccr@tnsp.org> parents: 1945 diff changeset	2371
449 117f94b253af Add support for CAMG chunk reading and possibly half-brite handling in IFF ILBM reader. Matti Hamalainen <ccr@tnsp.org> parents: 448 diff changeset	2372 // If halfbrite is used, duplicate the palette
117f94b253af Add support for CAMG chunk reading and possibly half-brite handling in IFF ILBM reader. Matti Hamalainen <ccr@tnsp.org> parents: 448 diff changeset	2373 if (iff.camg & IFF_CAMG_HALFBRITE)
117f94b253af Add support for CAMG chunk reading and possibly half-brite handling in IFF ILBM reader. Matti Hamalainen <ccr@tnsp.org> parents: 448 diff changeset	2374 {
2094 4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	2375 int ncolors = iff.ncolors;
2053 6dfbe976d740 Implement basic initial support for IFF ACBM format images. Matti Hamalainen <ccr@tnsp.org> parents: 2050 diff changeset	2376 if (iff.idsig != IFF_ID_ILBM)
1625 c8afa3e6c413 Print an error/warning about PBM files that have half-brite set. Matti Hamalainen <ccr@tnsp.org> parents: 1624 diff changeset	2377 {
1892 cbc911ffd21e Rename ILBM functions to IFF, which is more approriate as we support both ILBM and PBM variants of the IFF images. Matti Hamalainen <ccr@tnsp.org> parents: 1887 diff changeset	2378 dmErrorMsg("IFF: Non-planar PBM file with Halfbrite enabled! This might not work.\n");
1625 c8afa3e6c413 Print an error/warning about PBM files that have half-brite set. Matti Hamalainen <ccr@tnsp.org> parents: 1624 diff changeset	2379 }
834 9623b9b548d4 Reallocation fixes. Matti Hamalainen <ccr@tnsp.org> parents: 812 diff changeset	2380
449 117f94b253af Add support for CAMG chunk reading and possibly half-brite handling in IFF ILBM reader. Matti Hamalainen <ccr@tnsp.org> parents: 448 diff changeset	2381 if (iff.ncolors > 128)
117f94b253af Add support for CAMG chunk reading and possibly half-brite handling in IFF ILBM reader. Matti Hamalainen <ccr@tnsp.org> parents: 448 diff changeset	2382 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	2383 return dmError(DMERR_NOT_SUPPORTED,
1892 cbc911ffd21e Rename ILBM functions to IFF, which is more approriate as we support both ILBM and PBM variants of the IFF images. Matti Hamalainen <ccr@tnsp.org> parents: 1887 diff changeset	2384 "IFF: Halfbrite enabled, but ncolors > 128.\n");
449 117f94b253af Add support for CAMG chunk reading and possibly half-brite handling in IFF ILBM reader. Matti Hamalainen <ccr@tnsp.org> parents: 448 diff changeset	2385 }
117f94b253af Add support for CAMG chunk reading and possibly half-brite handling in IFF ILBM reader. Matti Hamalainen <ccr@tnsp.org> parents: 448 diff changeset	2386
2094 4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	2387 if ((res = dmPaletteResize(&iff.pal, ncolors * 2)) != DMERR_OK)
834 9623b9b548d4 Reallocation fixes. Matti Hamalainen <ccr@tnsp.org> parents: 812 diff changeset	2388 {
2094 4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	2389 dmPaletteFree(iff.pal);
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	2390 return res;
834 9623b9b548d4 Reallocation fixes. Matti Hamalainen <ccr@tnsp.org> parents: 812 diff changeset	2391 }
2094 4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	2392
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	2393 for (int i = 0; i < ncolors; i++)
449 117f94b253af Add support for CAMG chunk reading and possibly half-brite handling in IFF ILBM reader. Matti Hamalainen <ccr@tnsp.org> parents: 448 diff changeset	2394 {
2094 4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	2395 int i2 = ncolors + i;
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	2396 iff.pal->colors[i2].r = iff.pal->colors[i].r / 2;
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	2397 iff.pal->colors[i2].g = iff.pal->colors[i].g / 2;
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	2398 iff.pal->colors[i2].b = iff.pal->colors[i].b / 2;
449 117f94b253af Add support for CAMG chunk reading and possibly half-brite handling in IFF ILBM reader. Matti Hamalainen <ccr@tnsp.org> parents: 448 diff changeset	2399 }
117f94b253af Add support for CAMG chunk reading and possibly half-brite handling in IFF ILBM reader. Matti Hamalainen <ccr@tnsp.org> parents: 448 diff changeset	2400 }
1102 e06abfde6c39 Cosmetics pass: Remove excess whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	2401
447 0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	2402 (*pimg)->pal = iff.pal;
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	2403 }
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	2404
443 f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	2405 return res;
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	2406 }
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	2407
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	2408
1896 f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2409 static int dmWriteIFFChunkHdr(DMResource fp, DMIFFChunk chunk, const Uint32 id)
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2410 {
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2411 chunk->offs = dmftell(fp);
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2412 chunk->id = id;
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2413 dmMakeIFFChunkIDStr(chunk);
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2414
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2415 if (!dmf_write_be32(fp, chunk->id) \|\|
1942 f171b929b631 Do not reference uninitialized value in IFF writer, although in this case Matti Hamalainen <ccr@tnsp.org> parents: 1940 diff changeset	2416 !dmf_write_be32(fp, 0))
1896 f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2417 {
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2418 return dmError(DMERR_FREAD,
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2419 "IFF: Could not write IFF '%s' chunk header.\n",
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2420 chunk->idStr);
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2421 }
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2422 else
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2423 return DMERR_OK;
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2424 }
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2425
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2426
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2427 static int dmWriteIFFChunkFinish(DMResource fp, DMIFFChunk chunk)
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2428 {
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2429 off_t curr = dmftell(fp);
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2430 if (curr < 0)
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2431 return dmferror(fp);
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2432
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2433 chunk->size = curr - chunk->offs - (sizeof(Uint32) * 2);
1900 8c6040d5b930 Fix IFF chunk padding. Matti Hamalainen <ccr@tnsp.org> parents: 1899 diff changeset	2434 if (chunk->size & 1)
8c6040d5b930 Fix IFF chunk padding. Matti Hamalainen <ccr@tnsp.org> parents: 1899 diff changeset	2435 {
2020 57a2527ff63d Fix IFF chunk padding. Matti Hamalainen <ccr@tnsp.org> parents: 2019 diff changeset	2436 dmMsg(3, "Padding chunk ID '%s', size %d ++\n",
57a2527ff63d Fix IFF chunk padding. Matti Hamalainen <ccr@tnsp.org> parents: 2019 diff changeset	2437 chunk->idStr, chunk->size);
57a2527ff63d Fix IFF chunk padding. Matti Hamalainen <ccr@tnsp.org> parents: 2019 diff changeset	2438
1900 8c6040d5b930 Fix IFF chunk padding. Matti Hamalainen <ccr@tnsp.org> parents: 1899 diff changeset	2439 if (!dmf_write_byte(fp, 0))
8c6040d5b930 Fix IFF chunk padding. Matti Hamalainen <ccr@tnsp.org> parents: 1899 diff changeset	2440 return dmferror(fp);
8c6040d5b930 Fix IFF chunk padding. Matti Hamalainen <ccr@tnsp.org> parents: 1899 diff changeset	2441
2020 57a2527ff63d Fix IFF chunk padding. Matti Hamalainen <ccr@tnsp.org> parents: 2019 diff changeset	2442 curr++;
1900 8c6040d5b930 Fix IFF chunk padding. Matti Hamalainen <ccr@tnsp.org> parents: 1899 diff changeset	2443 }
1896 f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2444
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2445 if (dmfseek(fp, chunk->offs, SEEK_SET) < 0)
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2446 return dmferror(fp);
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2447
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2448 if (!dmf_write_be32(fp, chunk->id) \|\|
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2449 !dmf_write_be32(fp, chunk->size))
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2450 {
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2451 return dmError(DMERR_FREAD,
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2452 "IFF: Could not write IFF '%s' chunk header.\n",
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2453 chunk->idStr);
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2454 }
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2455
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2456 if (dmfseek(fp, curr, SEEK_SET) < 0)
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2457 return dmferror(fp);
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2458
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2459 return DMERR_OK;
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2460 }
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2461
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2462
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2463 enum
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2464 {
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2465 DMODE_LIT,
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2466 DMODE_RLE,
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2467 };
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2468
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2469
2055 6c6a4ea67540 Make two functions static and one not. Matti Hamalainen <ccr@tnsp.org> parents: 2054 diff changeset	2470 static BOOL dmIFFEncodeByteRun1LIT(DMResource *fp,
2050 416af5a842ec Fixes to the ByteRun1 encoder. Could use some cleanups now, tho. Matti Hamalainen <ccr@tnsp.org> parents: 2049 diff changeset	2471 const Uint8 *buf, const size_t offs,
416af5a842ec Fixes to the ByteRun1 encoder. Could use some cleanups now, tho. Matti Hamalainen <ccr@tnsp.org> parents: 2049 diff changeset	2472 const size_t count)
1896 f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2473 {
2050 416af5a842ec Fixes to the ByteRun1 encoder. Could use some cleanups now, tho. Matti Hamalainen <ccr@tnsp.org> parents: 2049 diff changeset	2474 if (count <= 0)
416af5a842ec Fixes to the ByteRun1 encoder. Could use some cleanups now, tho. Matti Hamalainen <ccr@tnsp.org> parents: 2049 diff changeset	2475 return TRUE;
416af5a842ec Fixes to the ByteRun1 encoder. Could use some cleanups now, tho. Matti Hamalainen <ccr@tnsp.org> parents: 2049 diff changeset	2476
416af5a842ec Fixes to the ByteRun1 encoder. Could use some cleanups now, tho. Matti Hamalainen <ccr@tnsp.org> parents: 2049 diff changeset	2477 Uint8 tmp = count - 1;
416af5a842ec Fixes to the ByteRun1 encoder. Could use some cleanups now, tho. Matti Hamalainen <ccr@tnsp.org> parents: 2049 diff changeset	2478
416af5a842ec Fixes to the ByteRun1 encoder. Could use some cleanups now, tho. Matti Hamalainen <ccr@tnsp.org> parents: 2049 diff changeset	2479 return
416af5a842ec Fixes to the ByteRun1 encoder. Could use some cleanups now, tho. Matti Hamalainen <ccr@tnsp.org> parents: 2049 diff changeset	2480 dmf_write_byte(fp, tmp) &&
416af5a842ec Fixes to the ByteRun1 encoder. Could use some cleanups now, tho. Matti Hamalainen <ccr@tnsp.org> parents: 2049 diff changeset	2481 dmf_write_str(fp, buf + offs, count);
416af5a842ec Fixes to the ByteRun1 encoder. Could use some cleanups now, tho. Matti Hamalainen <ccr@tnsp.org> parents: 2049 diff changeset	2482 }
416af5a842ec Fixes to the ByteRun1 encoder. Could use some cleanups now, tho. Matti Hamalainen <ccr@tnsp.org> parents: 2049 diff changeset	2483
416af5a842ec Fixes to the ByteRun1 encoder. Could use some cleanups now, tho. Matti Hamalainen <ccr@tnsp.org> parents: 2049 diff changeset	2484
2055 6c6a4ea67540 Make two functions static and one not. Matti Hamalainen <ccr@tnsp.org> parents: 2054 diff changeset	2485 static BOOL dmIFFEncodeByteRun1RLE(DMResource *fp,
2050 416af5a842ec Fixes to the ByteRun1 encoder. Could use some cleanups now, tho. Matti Hamalainen <ccr@tnsp.org> parents: 2049 diff changeset	2486 const Uint8 *buf, const size_t offs,
416af5a842ec Fixes to the ByteRun1 encoder. Could use some cleanups now, tho. Matti Hamalainen <ccr@tnsp.org> parents: 2049 diff changeset	2487 const size_t count)
416af5a842ec Fixes to the ByteRun1 encoder. Could use some cleanups now, tho. Matti Hamalainen <ccr@tnsp.org> parents: 2049 diff changeset	2488 {
416af5a842ec Fixes to the ByteRun1 encoder. Could use some cleanups now, tho. Matti Hamalainen <ccr@tnsp.org> parents: 2049 diff changeset	2489 if (count <= 0)
416af5a842ec Fixes to the ByteRun1 encoder. Could use some cleanups now, tho. Matti Hamalainen <ccr@tnsp.org> parents: 2049 diff changeset	2490 return TRUE;
416af5a842ec Fixes to the ByteRun1 encoder. Could use some cleanups now, tho. Matti Hamalainen <ccr@tnsp.org> parents: 2049 diff changeset	2491
416af5a842ec Fixes to the ByteRun1 encoder. Could use some cleanups now, tho. Matti Hamalainen <ccr@tnsp.org> parents: 2049 diff changeset	2492 Uint8
416af5a842ec Fixes to the ByteRun1 encoder. Could use some cleanups now, tho. Matti Hamalainen <ccr@tnsp.org> parents: 2049 diff changeset	2493 tmp = ((Uint8) count - 2) ^ 0xff,
416af5a842ec Fixes to the ByteRun1 encoder. Could use some cleanups now, tho. Matti Hamalainen <ccr@tnsp.org> parents: 2049 diff changeset	2494 data = buf[offs];
416af5a842ec Fixes to the ByteRun1 encoder. Could use some cleanups now, tho. Matti Hamalainen <ccr@tnsp.org> parents: 2049 diff changeset	2495
416af5a842ec Fixes to the ByteRun1 encoder. Could use some cleanups now, tho. Matti Hamalainen <ccr@tnsp.org> parents: 2049 diff changeset	2496 return
416af5a842ec Fixes to the ByteRun1 encoder. Could use some cleanups now, tho. Matti Hamalainen <ccr@tnsp.org> parents: 2049 diff changeset	2497 dmf_write_byte(fp, tmp) &&
416af5a842ec Fixes to the ByteRun1 encoder. Could use some cleanups now, tho. Matti Hamalainen <ccr@tnsp.org> parents: 2049 diff changeset	2498 dmf_write_byte(fp, data);
1896 f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2499 }
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2500
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2501
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2502 BOOL dmIFFEncodeByteRun1Row(DMResource fp, const Uint8 buf, const size_t bufLen)
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2503 {
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2504 int prev = -1, mode = DMODE_LIT;
2050 416af5a842ec Fixes to the ByteRun1 encoder. Could use some cleanups now, tho. Matti Hamalainen <ccr@tnsp.org> parents: 2049 diff changeset	2505 size_t offs, l_offs, r_offs;
416af5a842ec Fixes to the ByteRun1 encoder. Could use some cleanups now, tho. Matti Hamalainen <ccr@tnsp.org> parents: 2049 diff changeset	2506 BOOL ret = TRUE;
416af5a842ec Fixes to the ByteRun1 encoder. Could use some cleanups now, tho. Matti Hamalainen <ccr@tnsp.org> parents: 2049 diff changeset	2507
416af5a842ec Fixes to the ByteRun1 encoder. Could use some cleanups now, tho. Matti Hamalainen <ccr@tnsp.org> parents: 2049 diff changeset	2508 for (offs = l_offs = r_offs = 0; offs < bufLen; offs++)
1896 f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2509 {
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2510 Uint8 data = buf[offs];
2050 416af5a842ec Fixes to the ByteRun1 encoder. Could use some cleanups now, tho. Matti Hamalainen <ccr@tnsp.org> parents: 2049 diff changeset	2511 BOOL flush = FALSE;
416af5a842ec Fixes to the ByteRun1 encoder. Could use some cleanups now, tho. Matti Hamalainen <ccr@tnsp.org> parents: 2049 diff changeset	2512 int pmode = mode;
1896 f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2513
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2514 if (data == prev)
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2515 {
2050 416af5a842ec Fixes to the ByteRun1 encoder. Could use some cleanups now, tho. Matti Hamalainen <ccr@tnsp.org> parents: 2049 diff changeset	2516 if (mode == DMODE_LIT &&
416af5a842ec Fixes to the ByteRun1 encoder. Could use some cleanups now, tho. Matti Hamalainen <ccr@tnsp.org> parents: 2049 diff changeset	2517 offs - r_offs >= 2)
416af5a842ec Fixes to the ByteRun1 encoder. Could use some cleanups now, tho. Matti Hamalainen <ccr@tnsp.org> parents: 2049 diff changeset	2518 {
416af5a842ec Fixes to the ByteRun1 encoder. Could use some cleanups now, tho. Matti Hamalainen <ccr@tnsp.org> parents: 2049 diff changeset	2519 ret = dmIFFEncodeByteRun1LIT(fp, buf, l_offs, r_offs - l_offs);
416af5a842ec Fixes to the ByteRun1 encoder. Could use some cleanups now, tho. Matti Hamalainen <ccr@tnsp.org> parents: 2049 diff changeset	2520 mode = DMODE_RLE;
416af5a842ec Fixes to the ByteRun1 encoder. Could use some cleanups now, tho. Matti Hamalainen <ccr@tnsp.org> parents: 2049 diff changeset	2521 }
1896 f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2522 }
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2523 else
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2524 {
2050 416af5a842ec Fixes to the ByteRun1 encoder. Could use some cleanups now, tho. Matti Hamalainen <ccr@tnsp.org> parents: 2049 diff changeset	2525 if (mode != DMODE_LIT)
416af5a842ec Fixes to the ByteRun1 encoder. Could use some cleanups now, tho. Matti Hamalainen <ccr@tnsp.org> parents: 2049 diff changeset	2526 {
416af5a842ec Fixes to the ByteRun1 encoder. Could use some cleanups now, tho. Matti Hamalainen <ccr@tnsp.org> parents: 2049 diff changeset	2527 ret = dmIFFEncodeByteRun1RLE(fp, buf, r_offs, offs - r_offs);
416af5a842ec Fixes to the ByteRun1 encoder. Could use some cleanups now, tho. Matti Hamalainen <ccr@tnsp.org> parents: 2049 diff changeset	2528 mode = DMODE_LIT;
416af5a842ec Fixes to the ByteRun1 encoder. Could use some cleanups now, tho. Matti Hamalainen <ccr@tnsp.org> parents: 2049 diff changeset	2529 l_offs = offs;
416af5a842ec Fixes to the ByteRun1 encoder. Could use some cleanups now, tho. Matti Hamalainen <ccr@tnsp.org> parents: 2049 diff changeset	2530 }
416af5a842ec Fixes to the ByteRun1 encoder. Could use some cleanups now, tho. Matti Hamalainen <ccr@tnsp.org> parents: 2049 diff changeset	2531 r_offs = offs;
1896 f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2532 }
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2533
2050 416af5a842ec Fixes to the ByteRun1 encoder. Could use some cleanups now, tho. Matti Hamalainen <ccr@tnsp.org> parents: 2049 diff changeset	2534 if (!ret)
416af5a842ec Fixes to the ByteRun1 encoder. Could use some cleanups now, tho. Matti Hamalainen <ccr@tnsp.org> parents: 2049 diff changeset	2535 goto out;
416af5a842ec Fixes to the ByteRun1 encoder. Could use some cleanups now, tho. Matti Hamalainen <ccr@tnsp.org> parents: 2049 diff changeset	2536
416af5a842ec Fixes to the ByteRun1 encoder. Could use some cleanups now, tho. Matti Hamalainen <ccr@tnsp.org> parents: 2049 diff changeset	2537 // NOTE! RLE and LIT max are both 128, checked against DP2e
416af5a842ec Fixes to the ByteRun1 encoder. Could use some cleanups now, tho. Matti Hamalainen <ccr@tnsp.org> parents: 2049 diff changeset	2538 flush =
416af5a842ec Fixes to the ByteRun1 encoder. Could use some cleanups now, tho. Matti Hamalainen <ccr@tnsp.org> parents: 2049 diff changeset	2539 (pmode == DMODE_RLE && offs - r_offs >= 128) \|\|
416af5a842ec Fixes to the ByteRun1 encoder. Could use some cleanups now, tho. Matti Hamalainen <ccr@tnsp.org> parents: 2049 diff changeset	2540 (pmode == DMODE_LIT && offs - l_offs >= 128);
416af5a842ec Fixes to the ByteRun1 encoder. Could use some cleanups now, tho. Matti Hamalainen <ccr@tnsp.org> parents: 2049 diff changeset	2541
416af5a842ec Fixes to the ByteRun1 encoder. Could use some cleanups now, tho. Matti Hamalainen <ccr@tnsp.org> parents: 2049 diff changeset	2542 // Check for last byte of input
416af5a842ec Fixes to the ByteRun1 encoder. Could use some cleanups now, tho. Matti Hamalainen <ccr@tnsp.org> parents: 2049 diff changeset	2543 if (offs == bufLen - 1)
416af5a842ec Fixes to the ByteRun1 encoder. Could use some cleanups now, tho. Matti Hamalainen <ccr@tnsp.org> parents: 2049 diff changeset	2544 {
416af5a842ec Fixes to the ByteRun1 encoder. Could use some cleanups now, tho. Matti Hamalainen <ccr@tnsp.org> parents: 2049 diff changeset	2545 offs++;
416af5a842ec Fixes to the ByteRun1 encoder. Could use some cleanups now, tho. Matti Hamalainen <ccr@tnsp.org> parents: 2049 diff changeset	2546 flush = TRUE;
416af5a842ec Fixes to the ByteRun1 encoder. Could use some cleanups now, tho. Matti Hamalainen <ccr@tnsp.org> parents: 2049 diff changeset	2547 pmode = mode;
416af5a842ec Fixes to the ByteRun1 encoder. Could use some cleanups now, tho. Matti Hamalainen <ccr@tnsp.org> parents: 2049 diff changeset	2548 }
416af5a842ec Fixes to the ByteRun1 encoder. Could use some cleanups now, tho. Matti Hamalainen <ccr@tnsp.org> parents: 2049 diff changeset	2549
416af5a842ec Fixes to the ByteRun1 encoder. Could use some cleanups now, tho. Matti Hamalainen <ccr@tnsp.org> parents: 2049 diff changeset	2550 if (flush)
416af5a842ec Fixes to the ByteRun1 encoder. Could use some cleanups now, tho. Matti Hamalainen <ccr@tnsp.org> parents: 2049 diff changeset	2551 {
416af5a842ec Fixes to the ByteRun1 encoder. Could use some cleanups now, tho. Matti Hamalainen <ccr@tnsp.org> parents: 2049 diff changeset	2552 if (pmode == DMODE_RLE)
416af5a842ec Fixes to the ByteRun1 encoder. Could use some cleanups now, tho. Matti Hamalainen <ccr@tnsp.org> parents: 2049 diff changeset	2553 ret = dmIFFEncodeByteRun1RLE(fp, buf, r_offs, offs - r_offs);
416af5a842ec Fixes to the ByteRun1 encoder. Could use some cleanups now, tho. Matti Hamalainen <ccr@tnsp.org> parents: 2049 diff changeset	2554 else
416af5a842ec Fixes to the ByteRun1 encoder. Could use some cleanups now, tho. Matti Hamalainen <ccr@tnsp.org> parents: 2049 diff changeset	2555 ret = dmIFFEncodeByteRun1LIT(fp, buf, l_offs, offs - l_offs);
416af5a842ec Fixes to the ByteRun1 encoder. Could use some cleanups now, tho. Matti Hamalainen <ccr@tnsp.org> parents: 2049 diff changeset	2556
416af5a842ec Fixes to the ByteRun1 encoder. Could use some cleanups now, tho. Matti Hamalainen <ccr@tnsp.org> parents: 2049 diff changeset	2557 r_offs = l_offs = offs;
416af5a842ec Fixes to the ByteRun1 encoder. Could use some cleanups now, tho. Matti Hamalainen <ccr@tnsp.org> parents: 2049 diff changeset	2558 mode = DMODE_LIT;
416af5a842ec Fixes to the ByteRun1 encoder. Could use some cleanups now, tho. Matti Hamalainen <ccr@tnsp.org> parents: 2049 diff changeset	2559
416af5a842ec Fixes to the ByteRun1 encoder. Could use some cleanups now, tho. Matti Hamalainen <ccr@tnsp.org> parents: 2049 diff changeset	2560 if (!ret)
416af5a842ec Fixes to the ByteRun1 encoder. Could use some cleanups now, tho. Matti Hamalainen <ccr@tnsp.org> parents: 2049 diff changeset	2561 goto out;
416af5a842ec Fixes to the ByteRun1 encoder. Could use some cleanups now, tho. Matti Hamalainen <ccr@tnsp.org> parents: 2049 diff changeset	2562 }
416af5a842ec Fixes to the ByteRun1 encoder. Could use some cleanups now, tho. Matti Hamalainen <ccr@tnsp.org> parents: 2049 diff changeset	2563
1896 f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2564 prev = data;
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2565 }
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2566
2050 416af5a842ec Fixes to the ByteRun1 encoder. Could use some cleanups now, tho. Matti Hamalainen <ccr@tnsp.org> parents: 2049 diff changeset	2567 out:
416af5a842ec Fixes to the ByteRun1 encoder. Could use some cleanups now, tho. Matti Hamalainen <ccr@tnsp.org> parents: 2049 diff changeset	2568 return ret;
1896 f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2569 }
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2570
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2571
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2572 static BOOL dmIFFWriteOneRow(DMResource fp, DMIFF iff, const Uint8 *buf, const size_t bufLen)
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2573 {
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2574 if (iff->bmhd.compression == IFF_COMP_BYTERUN1)
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2575 return dmIFFEncodeByteRun1Row(fp, buf, bufLen);
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2576 else
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2577 return dmf_write_str(fp, buf, bufLen);
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2578 }
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2579
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2580
2064 3617ef01c1de Separate ILBM and PBM subformats of IFF images. Matti Hamalainen <ccr@tnsp.org> parents: 2063 diff changeset	2581 int dmWriteIFFImage(DMResource fp, const DMImage img, const DMImageConvSpec *spec)
1896 f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2582 {
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2583 DMIFF iff;
1904 5930ff7879b5 Cleanup IFF writer a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1903 diff changeset	2584 Uint8 *buf = NULL;
5930ff7879b5 Cleanup IFF writer a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1903 diff changeset	2585 size_t bufLen;
1896 f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2586 int res = DMERR_OK;
2064 3617ef01c1de Separate ILBM and PBM subformats of IFF images. Matti Hamalainen <ccr@tnsp.org> parents: 2063 diff changeset	2587
3617ef01c1de Separate ILBM and PBM subformats of IFF images. Matti Hamalainen <ccr@tnsp.org> parents: 2063 diff changeset	2588 // XXX: Non-paletted IFF not supported!
2065 451980580189 Refactor how paletted/indexed formats are handled in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 2064 diff changeset	2589 if (spec->format != DM_COLFMT_PALETTE)
1896 f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2590 {
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2591 return dmError(DMERR_NOT_SUPPORTED,
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2592 "Non-paletted IFF is not supported.\n");
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2593 }
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2594
2065 451980580189 Refactor how paletted/indexed formats are handled in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 2064 diff changeset	2595 switch (spec->fmtid)
2064 3617ef01c1de Separate ILBM and PBM subformats of IFF images. Matti Hamalainen <ccr@tnsp.org> parents: 2063 diff changeset	2596 {
3617ef01c1de Separate ILBM and PBM subformats of IFF images. Matti Hamalainen <ccr@tnsp.org> parents: 2063 diff changeset	2597 case DM_IMGFMT_IFF_ILBM: iff.idsig = IFF_ID_ILBM; iff.idstr = "ILBM"; break;
3617ef01c1de Separate ILBM and PBM subformats of IFF images. Matti Hamalainen <ccr@tnsp.org> parents: 2063 diff changeset	2598 case DM_IMGFMT_IFF_PBM : iff.idsig = IFF_ID_PBM; iff.idstr = "PBM"; break;
3617ef01c1de Separate ILBM and PBM subformats of IFF images. Matti Hamalainen <ccr@tnsp.org> parents: 2063 diff changeset	2599 case DM_IMGFMT_IFF_ACBM: iff.idsig = IFF_ID_ACBM; iff.idstr = "ACBM"; break;
2065 451980580189 Refactor how paletted/indexed formats are handled in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 2064 diff changeset	2600 default:
451980580189 Refactor how paletted/indexed formats are handled in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 2064 diff changeset	2601 return dmError(DMERR_NOT_SUPPORTED,
451980580189 Refactor how paletted/indexed formats are handled in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 2064 diff changeset	2602 "Invalid IFF format.\n");
2064 3617ef01c1de Separate ILBM and PBM subformats of IFF images. Matti Hamalainen <ccr@tnsp.org> parents: 2063 diff changeset	2603 }
2026 b137d324e13f Force 8 bitplanes for IFF PBM images. Matti Hamalainen <ccr@tnsp.org> parents: 2025 diff changeset	2604
1896 f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2605 // Setup headers
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2606 iff.bmhd.x = 0;
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2607 iff.bmhd.y = 0;
1904 5930ff7879b5 Cleanup IFF writer a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1903 diff changeset	2608 iff.bmhd.w = img->width * spec->scaleX;
5930ff7879b5 Cleanup IFF writer a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1903 diff changeset	2609 iff.bmhd.h = img->height * spec->scaleY;
5930ff7879b5 Cleanup IFF writer a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1903 diff changeset	2610 iff.bmhd.pagew = img->width * spec->scaleX;
5930ff7879b5 Cleanup IFF writer a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1903 diff changeset	2611 iff.bmhd.pageh = img->height * spec->scaleY;
1896 f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2612 iff.bmhd.pad1 = 0;
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2613 iff.bmhd.xasp = 1; // XXX TODO: compute the xasp/yasp from the img->aspect
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2614 iff.bmhd.yasp = 1;
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2615
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2616 iff.camg = 0; // XXX TODO: when/if HAM support
2094 4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	2617 iff.bmhd.masking = (img->pal && img->pal->ctransp < 0) ? IFF_MASK_NONE : spec->mask;
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	2618 iff.bmhd.transp = (img->pal && img->pal->ctransp >= 0 && spec->mask == IFF_MASK_TRANSP) ? img->pal->ctransp : 0xffff;
2064 3617ef01c1de Separate ILBM and PBM subformats of IFF images. Matti Hamalainen <ccr@tnsp.org> parents: 2063 diff changeset	2619 iff.bmhd.nplanes = (iff.idsig == IFF_ID_PBM && spec->nplanes < 8) ? 8 : spec->nplanes;
1896 f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2620
2069 83a3d05b5c1d Fixes to ACBM support. Matti Hamalainen <ccr@tnsp.org> parents: 2068 diff changeset	2621 // Apparently ACBM can't/should not use compression .. even though
83a3d05b5c1d Fixes to ACBM support. Matti Hamalainen <ccr@tnsp.org> parents: 2068 diff changeset	2622 // some files in the wild have bmhd.compression != 0 (but are not
83a3d05b5c1d Fixes to ACBM support. Matti Hamalainen <ccr@tnsp.org> parents: 2068 diff changeset	2623 // actually compressed.) To be more compliant with the spec,
83a3d05b5c1d Fixes to ACBM support. Matti Hamalainen <ccr@tnsp.org> parents: 2068 diff changeset	2624 iff.bmhd.compression = (spec->compression && iff.idsig != IFF_ID_ACBM) ? IFF_COMP_BYTERUN1 : IFF_COMP_NONE;
83a3d05b5c1d Fixes to ACBM support. Matti Hamalainen <ccr@tnsp.org> parents: 2068 diff changeset	2625
1896 f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2626 dmMsg(2, "IFF: nplanes=%d, comp=%d, mask=%d\n",
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2627 iff.bmhd.nplanes, iff.bmhd.compression, iff.bmhd.masking);
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2628
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2629 // Write IFF FORM header
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2630 if ((res = dmWriteIFFChunkHdr(fp, &iff.chFORM, IFF_ID_FORM)) != DMERR_OK)
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2631 goto out;
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2632
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2633 // Write IFF ILBM/PBM signature
2053 6dfbe976d740 Implement basic initial support for IFF ACBM format images. Matti Hamalainen <ccr@tnsp.org> parents: 2050 diff changeset	2634 if (!dmf_write_be32(fp, iff.idsig))
1896 f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2635 {
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2636 res = dmError(DMERR_FWRITE,
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2637 "IFF: Error writing %s signature.\n",
2064 3617ef01c1de Separate ILBM and PBM subformats of IFF images. Matti Hamalainen <ccr@tnsp.org> parents: 2063 diff changeset	2638 iff.idstr);
1896 f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2639 goto out;
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2640 }
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2641
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2642 // Write BMHD chunk and data
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2643 if ((res = dmWriteIFFChunkHdr(fp, &iff.chBMHD, IFF_ID_BMHD)) != DMERR_OK \|\|
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2644 !dmf_write_be16(fp, iff.bmhd.w) \|\|
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2645 !dmf_write_be16(fp, iff.bmhd.h) \|\|
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2646 !dmf_write_be16(fp, iff.bmhd.x) \|\|
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2647 !dmf_write_be16(fp, iff.bmhd.y) \|\|
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2648 !dmf_write_byte(fp, iff.bmhd.nplanes) \|\|
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2649 !dmf_write_byte(fp, iff.bmhd.masking) \|\|
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2650 !dmf_write_byte(fp, iff.bmhd.compression) \|\|
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2651 !dmf_write_byte(fp, iff.bmhd.pad1) \|\|
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2652 !dmf_write_be16(fp, iff.bmhd.transp) \|\|
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2653 !dmf_write_byte(fp, iff.bmhd.xasp) \|\|
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2654 !dmf_write_byte(fp, iff.bmhd.yasp) \|\|
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2655 !dmf_write_be16(fp, iff.bmhd.pagew) \|\|
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2656 !dmf_write_be16(fp, iff.bmhd.pageh))
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2657 {
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2658 res = dmError(DMERR_FWRITE,
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2659 "IFF: Error writing BMHD chunk.\n");
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2660 goto out;
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2661 }
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2662
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2663 if ((res = dmWriteIFFChunkFinish(fp, &iff.chBMHD)) != DMERR_OK)
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2664 goto out;
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2665
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2666 //
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2667 // CMAP
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2668 //
2094 4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	2669 if (img->pal->ncolors > 0 && spec->format == DM_COLFMT_PALETTE)
1896 f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2670 {
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2671 if ((res = dmWriteIFFChunkHdr(fp, &iff.chCMAP, IFF_ID_CMAP)) != DMERR_OK)
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2672 goto out;
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2673
2094 4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	2674 if ((res = dmPaletteWriteData(fp, img->pal, img->pal->ncolors, -1)) != DMERR_OK)
1896 f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2675 {
2094 4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	2676 res = dmError(DMERR_FWRITE,
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	2677 "IFF: Could not write CMAP palette.\n");
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	2678 goto out;
1896 f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2679 }
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2680
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2681 if ((res = dmWriteIFFChunkFinish(fp, &iff.chCMAP)) != DMERR_OK)
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2682 goto out;
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2683
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2684 dmMsg(2, "IFF: CMAP %d entries (%d bytes)\n",
2094 4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	2685 img->pal->ncolors, iff.chCMAP.size);
1896 f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2686 }
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2687
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2688 //
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2689 // CAMG
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2690 //
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2691 if ((res = dmWriteIFFChunkHdr(fp, &iff.chCMAP, IFF_ID_CAMG)) != DMERR_OK)
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2692 goto out;
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2693
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2694 if (!dmf_write_be32(fp, iff.camg))
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2695 {
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2696 return dmError(DMERR_FREAD,
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2697 "IFF: Error writing CAMG chunk.\n");
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2698 }
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2699
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2700 if ((res = dmWriteIFFChunkFinish(fp, &iff.chCMAP)) != DMERR_OK)
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2701 goto out;
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2702
2050 416af5a842ec Fixes to the ByteRun1 encoder. Could use some cleanups now, tho. Matti Hamalainen <ccr@tnsp.org> parents: 2049 diff changeset	2703
1896 f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2704 //
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2705 // Encode the body
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2706 //
2069 83a3d05b5c1d Fixes to ACBM support. Matti Hamalainen <ccr@tnsp.org> parents: 2068 diff changeset	2707 if ((res = dmWriteIFFChunkHdr(fp, &iff.chBODY,
83a3d05b5c1d Fixes to ACBM support. Matti Hamalainen <ccr@tnsp.org> parents: 2068 diff changeset	2708 (iff.idsig == IFF_ID_ACBM) ? IFF_ID_ABIT : IFF_ID_BODY)) != DMERR_OK)
1896 f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2709 goto out;
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2710
1904 5930ff7879b5 Cleanup IFF writer a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1903 diff changeset	2711 // Allocate encoding buffer
2064 3617ef01c1de Separate ILBM and PBM subformats of IFF images. Matti Hamalainen <ccr@tnsp.org> parents: 2063 diff changeset	2712 if (iff.idsig == IFF_ID_ILBM)
2082 a0a6f5a3fbbf Fix plane buffer size calculation for IFF ACBM to round up to nearest byte (minimum of 1). Matti Hamalainen <ccr@tnsp.org> parents: 2081 diff changeset	2713 bufLen = ((img->width * spec->scaleX + 15) / 16) * 2;
1904 5930ff7879b5 Cleanup IFF writer a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1903 diff changeset	2714 else
2069 83a3d05b5c1d Fixes to ACBM support. Matti Hamalainen <ccr@tnsp.org> parents: 2068 diff changeset	2715 if (iff.idsig == IFF_ID_ACBM)
2082 a0a6f5a3fbbf Fix plane buffer size calculation for IFF ACBM to round up to nearest byte (minimum of 1). Matti Hamalainen <ccr@tnsp.org> parents: 2081 diff changeset	2716 bufLen = (img->width * spec->scaleX * img->height * spec->scaleY + 7) / 8;
2069 83a3d05b5c1d Fixes to ACBM support. Matti Hamalainen <ccr@tnsp.org> parents: 2068 diff changeset	2717 else
1904 5930ff7879b5 Cleanup IFF writer a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1903 diff changeset	2718 bufLen = img->width * spec->scaleX;
5930ff7879b5 Cleanup IFF writer a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1903 diff changeset	2719
5930ff7879b5 Cleanup IFF writer a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1903 diff changeset	2720 dmMsg(2, "IFF: Line/plane row size %d bytes.\n", bufLen);
5930ff7879b5 Cleanup IFF writer a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1903 diff changeset	2721
5930ff7879b5 Cleanup IFF writer a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1903 diff changeset	2722 if ((buf = dmMalloc(bufLen)) == NULL)
5930ff7879b5 Cleanup IFF writer a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1903 diff changeset	2723 return DMERR_MALLOC;
5930ff7879b5 Cleanup IFF writer a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1903 diff changeset	2724
5930ff7879b5 Cleanup IFF writer a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1903 diff changeset	2725 // Encode the body
2069 83a3d05b5c1d Fixes to ACBM support. Matti Hamalainen <ccr@tnsp.org> parents: 2068 diff changeset	2726 if (iff.idsig == IFF_ID_ACBM)
83a3d05b5c1d Fixes to ACBM support. Matti Hamalainen <ccr@tnsp.org> parents: 2068 diff changeset	2727 {
83a3d05b5c1d Fixes to ACBM support. Matti Hamalainen <ccr@tnsp.org> parents: 2068 diff changeset	2728 for (int plane = 0; plane < iff.bmhd.nplanes; plane++)
83a3d05b5c1d Fixes to ACBM support. Matti Hamalainen <ccr@tnsp.org> parents: 2068 diff changeset	2729 {
83a3d05b5c1d Fixes to ACBM support. Matti Hamalainen <ccr@tnsp.org> parents: 2068 diff changeset	2730 // Encode bitplane
83a3d05b5c1d Fixes to ACBM support. Matti Hamalainen <ccr@tnsp.org> parents: 2068 diff changeset	2731 dmMemset(buf, 0, bufLen);
83a3d05b5c1d Fixes to ACBM support. Matti Hamalainen <ccr@tnsp.org> parents: 2068 diff changeset	2732
83a3d05b5c1d Fixes to ACBM support. Matti Hamalainen <ccr@tnsp.org> parents: 2068 diff changeset	2733 for (int yc = 0; yc < img->height * spec->scaleY; yc++)
83a3d05b5c1d Fixes to ACBM support. Matti Hamalainen <ccr@tnsp.org> parents: 2068 diff changeset	2734 {
83a3d05b5c1d Fixes to ACBM support. Matti Hamalainen <ccr@tnsp.org> parents: 2068 diff changeset	2735 Uint8 sp = img->data + (yc img->pitch);
83a3d05b5c1d Fixes to ACBM support. Matti Hamalainen <ccr@tnsp.org> parents: 2068 diff changeset	2736 Uint8 dp = buf + (yc img->width * spec->scaleX) / 8;
83a3d05b5c1d Fixes to ACBM support. Matti Hamalainen <ccr@tnsp.org> parents: 2068 diff changeset	2737 for (int xc = 0; xc < img->width * spec->scaleX; xc++)
83a3d05b5c1d Fixes to ACBM support. Matti Hamalainen <ccr@tnsp.org> parents: 2068 diff changeset	2738 dp[xc / 8] \|= ((sp[xc / spec->scaleX] >> plane) & 1) << (7 - (xc & 7));
83a3d05b5c1d Fixes to ACBM support. Matti Hamalainen <ccr@tnsp.org> parents: 2068 diff changeset	2739 }
83a3d05b5c1d Fixes to ACBM support. Matti Hamalainen <ccr@tnsp.org> parents: 2068 diff changeset	2740
83a3d05b5c1d Fixes to ACBM support. Matti Hamalainen <ccr@tnsp.org> parents: 2068 diff changeset	2741 if (!dmIFFWriteOneRow(fp, &iff, buf, bufLen))
83a3d05b5c1d Fixes to ACBM support. Matti Hamalainen <ccr@tnsp.org> parents: 2068 diff changeset	2742 {
83a3d05b5c1d Fixes to ACBM support. Matti Hamalainen <ccr@tnsp.org> parents: 2068 diff changeset	2743 res = dmError(DMERR_FWRITE,
83a3d05b5c1d Fixes to ACBM support. Matti Hamalainen <ccr@tnsp.org> parents: 2068 diff changeset	2744 "IFF: Error writing ACBM image plane %d.\n",
83a3d05b5c1d Fixes to ACBM support. Matti Hamalainen <ccr@tnsp.org> parents: 2068 diff changeset	2745 plane);
83a3d05b5c1d Fixes to ACBM support. Matti Hamalainen <ccr@tnsp.org> parents: 2068 diff changeset	2746 goto out;
83a3d05b5c1d Fixes to ACBM support. Matti Hamalainen <ccr@tnsp.org> parents: 2068 diff changeset	2747 }
83a3d05b5c1d Fixes to ACBM support. Matti Hamalainen <ccr@tnsp.org> parents: 2068 diff changeset	2748 }
83a3d05b5c1d Fixes to ACBM support. Matti Hamalainen <ccr@tnsp.org> parents: 2068 diff changeset	2749 }
83a3d05b5c1d Fixes to ACBM support. Matti Hamalainen <ccr@tnsp.org> parents: 2068 diff changeset	2750 else
1896 f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2751 {
2064 3617ef01c1de Separate ILBM and PBM subformats of IFF images. Matti Hamalainen <ccr@tnsp.org> parents: 2063 diff changeset	2752 for (int yc = 0; yc < img->height; yc++)
3617ef01c1de Separate ILBM and PBM subformats of IFF images. Matti Hamalainen <ccr@tnsp.org> parents: 2063 diff changeset	2753 for (int yscale = 0; yscale < spec->scaleY; yscale++)
1904 5930ff7879b5 Cleanup IFF writer a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1903 diff changeset	2754 {
2064 3617ef01c1de Separate ILBM and PBM subformats of IFF images. Matti Hamalainen <ccr@tnsp.org> parents: 2063 diff changeset	2755 const Uint8 sp = img->data + (yc img->pitch);
3617ef01c1de Separate ILBM and PBM subformats of IFF images. Matti Hamalainen <ccr@tnsp.org> parents: 2063 diff changeset	2756
3617ef01c1de Separate ILBM and PBM subformats of IFF images. Matti Hamalainen <ccr@tnsp.org> parents: 2063 diff changeset	2757 if (iff.idsig == IFF_ID_ILBM)
1904 5930ff7879b5 Cleanup IFF writer a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1903 diff changeset	2758 {
2064 3617ef01c1de Separate ILBM and PBM subformats of IFF images. Matti Hamalainen <ccr@tnsp.org> parents: 2063 diff changeset	2759 for (int plane = 0; plane < spec->nplanes; plane++)
1904 5930ff7879b5 Cleanup IFF writer a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1903 diff changeset	2760 {
2064 3617ef01c1de Separate ILBM and PBM subformats of IFF images. Matti Hamalainen <ccr@tnsp.org> parents: 2063 diff changeset	2761 // Encode bitplane
3617ef01c1de Separate ILBM and PBM subformats of IFF images. Matti Hamalainen <ccr@tnsp.org> parents: 2063 diff changeset	2762 dmMemset(buf, 0, bufLen);
3617ef01c1de Separate ILBM and PBM subformats of IFF images. Matti Hamalainen <ccr@tnsp.org> parents: 2063 diff changeset	2763
3617ef01c1de Separate ILBM and PBM subformats of IFF images. Matti Hamalainen <ccr@tnsp.org> parents: 2063 diff changeset	2764 for (int xc = 0; xc < img->width * spec->scaleX; xc++)
3617ef01c1de Separate ILBM and PBM subformats of IFF images. Matti Hamalainen <ccr@tnsp.org> parents: 2063 diff changeset	2765 buf[xc / 8] \|= ((sp[xc / spec->scaleX] >> plane) & 1) << (7 - (xc & 7));
3617ef01c1de Separate ILBM and PBM subformats of IFF images. Matti Hamalainen <ccr@tnsp.org> parents: 2063 diff changeset	2766
3617ef01c1de Separate ILBM and PBM subformats of IFF images. Matti Hamalainen <ccr@tnsp.org> parents: 2063 diff changeset	2767 // Compress / write data
3617ef01c1de Separate ILBM and PBM subformats of IFF images. Matti Hamalainen <ccr@tnsp.org> parents: 2063 diff changeset	2768 if (!dmIFFWriteOneRow(fp, &iff, buf, bufLen))
3617ef01c1de Separate ILBM and PBM subformats of IFF images. Matti Hamalainen <ccr@tnsp.org> parents: 2063 diff changeset	2769 {
3617ef01c1de Separate ILBM and PBM subformats of IFF images. Matti Hamalainen <ccr@tnsp.org> parents: 2063 diff changeset	2770 res = dmError(DMERR_FWRITE,
3617ef01c1de Separate ILBM and PBM subformats of IFF images. Matti Hamalainen <ccr@tnsp.org> parents: 2063 diff changeset	2771 "IFF: Error writing ILBM image plane #%d @ row %d.\n",
3617ef01c1de Separate ILBM and PBM subformats of IFF images. Matti Hamalainen <ccr@tnsp.org> parents: 2063 diff changeset	2772 plane, yc);
3617ef01c1de Separate ILBM and PBM subformats of IFF images. Matti Hamalainen <ccr@tnsp.org> parents: 2063 diff changeset	2773 goto out;
3617ef01c1de Separate ILBM and PBM subformats of IFF images. Matti Hamalainen <ccr@tnsp.org> parents: 2063 diff changeset	2774 }
3617ef01c1de Separate ILBM and PBM subformats of IFF images. Matti Hamalainen <ccr@tnsp.org> parents: 2063 diff changeset	2775 }
3617ef01c1de Separate ILBM and PBM subformats of IFF images. Matti Hamalainen <ccr@tnsp.org> parents: 2063 diff changeset	2776
3617ef01c1de Separate ILBM and PBM subformats of IFF images. Matti Hamalainen <ccr@tnsp.org> parents: 2063 diff changeset	2777 // Write mask data, if any
3617ef01c1de Separate ILBM and PBM subformats of IFF images. Matti Hamalainen <ccr@tnsp.org> parents: 2063 diff changeset	2778 if (iff.bmhd.masking == IFF_MASK_HAS_MASK)
3617ef01c1de Separate ILBM and PBM subformats of IFF images. Matti Hamalainen <ccr@tnsp.org> parents: 2063 diff changeset	2779 {
3617ef01c1de Separate ILBM and PBM subformats of IFF images. Matti Hamalainen <ccr@tnsp.org> parents: 2063 diff changeset	2780 dmMemset(buf, 0, bufLen);
3617ef01c1de Separate ILBM and PBM subformats of IFF images. Matti Hamalainen <ccr@tnsp.org> parents: 2063 diff changeset	2781
3617ef01c1de Separate ILBM and PBM subformats of IFF images. Matti Hamalainen <ccr@tnsp.org> parents: 2063 diff changeset	2782 for (int xc = 0; xc < img->width * spec->scaleX; xc++)
2094 4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2093 diff changeset	2783 buf[xc / 8] \|= (sp[xc / spec->scaleX] == img->pal->ctransp) << (7 - (xc & 7));
2064 3617ef01c1de Separate ILBM and PBM subformats of IFF images. Matti Hamalainen <ccr@tnsp.org> parents: 2063 diff changeset	2784
3617ef01c1de Separate ILBM and PBM subformats of IFF images. Matti Hamalainen <ccr@tnsp.org> parents: 2063 diff changeset	2785 if (!dmIFFWriteOneRow(fp, &iff, buf, bufLen))
3617ef01c1de Separate ILBM and PBM subformats of IFF images. Matti Hamalainen <ccr@tnsp.org> parents: 2063 diff changeset	2786 {
3617ef01c1de Separate ILBM and PBM subformats of IFF images. Matti Hamalainen <ccr@tnsp.org> parents: 2063 diff changeset	2787 res = dmError(DMERR_FWRITE,
3617ef01c1de Separate ILBM and PBM subformats of IFF images. Matti Hamalainen <ccr@tnsp.org> parents: 2063 diff changeset	2788 "IFF: Error writing ILBM mask plane %d.\n", yc);
3617ef01c1de Separate ILBM and PBM subformats of IFF images. Matti Hamalainen <ccr@tnsp.org> parents: 2063 diff changeset	2789 goto out;
3617ef01c1de Separate ILBM and PBM subformats of IFF images. Matti Hamalainen <ccr@tnsp.org> parents: 2063 diff changeset	2790 }
1904 5930ff7879b5 Cleanup IFF writer a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1903 diff changeset	2791 }
5930ff7879b5 Cleanup IFF writer a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1903 diff changeset	2792 }
2064 3617ef01c1de Separate ILBM and PBM subformats of IFF images. Matti Hamalainen <ccr@tnsp.org> parents: 2063 diff changeset	2793 else
1904 5930ff7879b5 Cleanup IFF writer a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1903 diff changeset	2794 {
5930ff7879b5 Cleanup IFF writer a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1903 diff changeset	2795 for (int xc = 0; xc < img->width * spec->scaleX; xc++)
2064 3617ef01c1de Separate ILBM and PBM subformats of IFF images. Matti Hamalainen <ccr@tnsp.org> parents: 2063 diff changeset	2796 buf[xc] = sp[xc / spec->scaleX];
1904 5930ff7879b5 Cleanup IFF writer a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1903 diff changeset	2797
5930ff7879b5 Cleanup IFF writer a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1903 diff changeset	2798 if (!dmIFFWriteOneRow(fp, &iff, buf, bufLen))
5930ff7879b5 Cleanup IFF writer a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1903 diff changeset	2799 {
5930ff7879b5 Cleanup IFF writer a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1903 diff changeset	2800 res = dmError(DMERR_FWRITE,
2064 3617ef01c1de Separate ILBM and PBM subformats of IFF images. Matti Hamalainen <ccr@tnsp.org> parents: 2063 diff changeset	2801 "IFF: Error writing PBM image row #%d.\n", yc);
1904 5930ff7879b5 Cleanup IFF writer a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1903 diff changeset	2802 goto out;
5930ff7879b5 Cleanup IFF writer a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1903 diff changeset	2803 }
5930ff7879b5 Cleanup IFF writer a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1903 diff changeset	2804 }
5930ff7879b5 Cleanup IFF writer a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1903 diff changeset	2805 }
1896 f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2806 }
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2807
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2808 if ((res = dmWriteIFFChunkFinish(fp, &iff.chBODY)) != DMERR_OK)
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2809 goto out;
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2810
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2811 // Finish the FORM chunk
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2812 if ((res = dmWriteIFFChunkFinish(fp, &iff.chFORM)) != DMERR_OK)
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2813 goto out;
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2814
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2815 out:
1904 5930ff7879b5 Cleanup IFF writer a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1903 diff changeset	2816 dmFree(buf);
1896 f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2817 return res;
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2818 }
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2819
f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1895 diff changeset	2820
1613 70b04c16aa40 Move format probe functions near to their other functions. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	2821 //
70b04c16aa40 Move format probe functions near to their other functions. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	2822 // List of formats
70b04c16aa40 Move format probe functions near to their other functions. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	2823 //
1616 36d073c45327 Refactor the format handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1615 diff changeset	2824 const DMImageFormat dmImageFormatList[] =
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2825 {
1616 36d073c45327 Refactor the format handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1615 diff changeset	2826 #ifdef DM_USE_LIBPNG
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2827 {
1616 36d073c45327 Refactor the format handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1615 diff changeset	2828 "png", "Portable Network Graphics",
2095 80786a28caf0 Mark image format flags with the color formats they support. Matti Hamalainen <ccr@tnsp.org> parents: 2094 diff changeset	2829 DM_IMGFMT_PNG, DM_FMT_RDWR \| DM_COLFMT_ANY,
1886 1af79412f249 Remove the stdio FILE support from libgfx API, now only DMResource is supported. Matti Hamalainen <ccr@tnsp.org> parents: 1881 diff changeset	2830 fmtProbePNG, dmReadPNGImage, dmWritePNGImage,
1616 36d073c45327 Refactor the format handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1615 diff changeset	2831 },
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2832 #endif
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2833 {
1616 36d073c45327 Refactor the format handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1615 diff changeset	2834 "ppm", "Portable PixMap",
2095 80786a28caf0 Mark image format flags with the color formats they support. Matti Hamalainen <ccr@tnsp.org> parents: 2094 diff changeset	2835 DM_IMGFMT_PPM, DM_FMT_RDWR \| DM_COLFMT_GRAYSCALE \| DM_COLFMT_RGB,
2092 614b161c0aa5 Initial support for reading PPM/PGM. Matti Hamalainen <ccr@tnsp.org> parents: 2091 diff changeset	2836 fmtProbePPM, dmReadPPMImage, dmWritePPMImage,
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2837 },
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2838 {
1616 36d073c45327 Refactor the format handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1615 diff changeset	2839 "pcx", "Z-Soft Paintbrush",
2095 80786a28caf0 Mark image format flags with the color formats they support. Matti Hamalainen <ccr@tnsp.org> parents: 2094 diff changeset	2840 DM_IMGFMT_PCX, DM_FMT_RDWR \| DM_COLFMT_PALETTE \| DM_COLFMT_RGB,
1886 1af79412f249 Remove the stdio FILE support from libgfx API, now only DMResource is supported. Matti Hamalainen <ccr@tnsp.org> parents: 1881 diff changeset	2841 fmtProbePCX, dmReadPCXImage, dmWritePCXImage,
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2842 },
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2843 {
2071 3dac7a781317 s/"lbm"/"ilbm"/ Matti Hamalainen <ccr@tnsp.org> parents: 2069 diff changeset	2844 "ilbm", "IFF ILBM (interleaved/old DP2)",
2095 80786a28caf0 Mark image format flags with the color formats they support. Matti Hamalainen <ccr@tnsp.org> parents: 2094 diff changeset	2845 DM_IMGFMT_IFF_ILBM, DM_FMT_RDWR \| DM_COLFMT_PALETTE,
2068 e4dc8fbaa5ad Improve IFF probing. Matti Hamalainen <ccr@tnsp.org> parents: 2067 diff changeset	2846 fmtProbeIFF_ILBM, dmReadIFFImage, dmWriteIFFImage,
2064 3617ef01c1de Separate ILBM and PBM subformats of IFF images. Matti Hamalainen <ccr@tnsp.org> parents: 2063 diff changeset	2847 },
3617ef01c1de Separate ILBM and PBM subformats of IFF images. Matti Hamalainen <ccr@tnsp.org> parents: 2063 diff changeset	2848 {
3617ef01c1de Separate ILBM and PBM subformats of IFF images. Matti Hamalainen <ccr@tnsp.org> parents: 2063 diff changeset	2849 "pbm", "IFF PBM (DP2e)",
2095 80786a28caf0 Mark image format flags with the color formats they support. Matti Hamalainen <ccr@tnsp.org> parents: 2094 diff changeset	2850 DM_IMGFMT_IFF_PBM, DM_FMT_RDWR \| DM_COLFMT_PALETTE,
2068 e4dc8fbaa5ad Improve IFF probing. Matti Hamalainen <ccr@tnsp.org> parents: 2067 diff changeset	2851 fmtProbeIFF_PBM, dmReadIFFImage, dmWriteIFFImage,
e4dc8fbaa5ad Improve IFF probing. Matti Hamalainen <ccr@tnsp.org> parents: 2067 diff changeset	2852 },
e4dc8fbaa5ad Improve IFF probing. Matti Hamalainen <ccr@tnsp.org> parents: 2067 diff changeset	2853 {
e4dc8fbaa5ad Improve IFF probing. Matti Hamalainen <ccr@tnsp.org> parents: 2067 diff changeset	2854 "acbm", "IFF ACBM (Amiga Basic)",
2095 80786a28caf0 Mark image format flags with the color formats they support. Matti Hamalainen <ccr@tnsp.org> parents: 2094 diff changeset	2855 DM_IMGFMT_IFF_ACBM, DM_FMT_RDWR \| DM_COLFMT_PALETTE,
2068 e4dc8fbaa5ad Improve IFF probing. Matti Hamalainen <ccr@tnsp.org> parents: 2067 diff changeset	2856 fmtProbeIFF_ACBM, dmReadIFFImage, dmWriteIFFImage,
443 f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	2857 },
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	2858 {
1616 36d073c45327 Refactor the format handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1615 diff changeset	2859 "raw", "Plain bitplaned (planar or non-planar) RAW",
2095 80786a28caf0 Mark image format flags with the color formats they support. Matti Hamalainen <ccr@tnsp.org> parents: 2094 diff changeset	2860 DM_IMGFMT_RAW, DM_FMT_WR \| DM_COLFMT_PALETTE,
1886 1af79412f249 Remove the stdio FILE support from libgfx API, now only DMResource is supported. Matti Hamalainen <ccr@tnsp.org> parents: 1881 diff changeset	2861 NULL, NULL, dmWriteRAWImage,
566 d400e32b62d9 Add a slightly different raw output format. Matti Hamalainen <ccr@tnsp.org> parents: 487 diff changeset	2862 },
d400e32b62d9 Add a slightly different raw output format. Matti Hamalainen <ccr@tnsp.org> parents: 487 diff changeset	2863 {
1616 36d073c45327 Refactor the format handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1615 diff changeset	2864 "araw", "IFFMaster Amiga RAW",
2095 80786a28caf0 Mark image format flags with the color formats they support. Matti Hamalainen <ccr@tnsp.org> parents: 2094 diff changeset	2865 DM_IMGFMT_ARAW, DM_FMT_WR \| DM_COLFMT_PALETTE,
1886 1af79412f249 Remove the stdio FILE support from libgfx API, now only DMResource is supported. Matti Hamalainen <ccr@tnsp.org> parents: 1881 diff changeset	2866 NULL, NULL, dmWriteRAWImage,
2047 3829c292df02 Add 'cdump' image output format, mainly for debugging purposes. Matti Hamalainen <ccr@tnsp.org> parents: 2026 diff changeset	2867 },
3829c292df02 Add 'cdump' image output format, mainly for debugging purposes. Matti Hamalainen <ccr@tnsp.org> parents: 2026 diff changeset	2868 {
2057 02fa60b27af5 Correct description of 'cdump' format. Matti Hamalainen <ccr@tnsp.org> parents: 2055 diff changeset	2869 "cdump", "'C' dump (image data only)",
2095 80786a28caf0 Mark image format flags with the color formats they support. Matti Hamalainen <ccr@tnsp.org> parents: 2094 diff changeset	2870 DM_IMGFMT_CDUMP, DM_FMT_WR \| DM_COLFMT_ANY,
2047 3829c292df02 Add 'cdump' image output format, mainly for debugging purposes. Matti Hamalainen <ccr@tnsp.org> parents: 2026 diff changeset	2871 NULL, NULL, dmWriteCDumpImage,
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2872 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2873 };
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2874
1616 36d073c45327 Refactor the format handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1615 diff changeset	2875 const int ndmImageFormatList = sizeof(dmImageFormatList) / sizeof(dmImageFormatList[0]);
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2876
1616 36d073c45327 Refactor the format handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1615 diff changeset	2877
36d073c45327 Refactor the format handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1615 diff changeset	2878 int dmImageProbeGeneric(const Uint8 buf, const size_t len, const DMImageFormat pfmt, int index)
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2879 {
1616 36d073c45327 Refactor the format handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1615 diff changeset	2880 int scoreMax = DM_PROBE_SCORE_FALSE, scoreIndex = -1;
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2881
1616 36d073c45327 Refactor the format handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1615 diff changeset	2882 for (int i = 0; i < ndmImageFormatList; i++)
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2883 {
1616 36d073c45327 Refactor the format handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1615 diff changeset	2884 const DMImageFormat *fmt = &dmImageFormatList[i];
442 a67600e186d0 Fix probing to handle NULL probe functions. Matti Hamalainen <ccr@tnsp.org> parents: 440 diff changeset	2885 if (fmt->probe != NULL)
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2886 {
442 a67600e186d0 Fix probing to handle NULL probe functions. Matti Hamalainen <ccr@tnsp.org> parents: 440 diff changeset	2887 int score = fmt->probe(buf, len);
a67600e186d0 Fix probing to handle NULL probe functions. Matti Hamalainen <ccr@tnsp.org> parents: 440 diff changeset	2888 if (score > scoreMax)
a67600e186d0 Fix probing to handle NULL probe functions. Matti Hamalainen <ccr@tnsp.org> parents: 440 diff changeset	2889 {
a67600e186d0 Fix probing to handle NULL probe functions. Matti Hamalainen <ccr@tnsp.org> parents: 440 diff changeset	2890 scoreMax = score;
a67600e186d0 Fix probing to handle NULL probe functions. Matti Hamalainen <ccr@tnsp.org> parents: 440 diff changeset	2891 scoreIndex = i;
a67600e186d0 Fix probing to handle NULL probe functions. Matti Hamalainen <ccr@tnsp.org> parents: 440 diff changeset	2892 }
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2893 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2894 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2895
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2896 if (scoreIndex >= 0)
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2897 {
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2898 *pfmt = &dmImageFormatList[scoreIndex];
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2899 *index = scoreIndex;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2900 return scoreMax;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2901 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2902 else
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2903 return DM_PROBE_SCORE_FALSE;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2904 }

Mercurial > hg > dmlib

annotate tools/libgfx.c @ 2100:81fb21dd3265