dmlib: tools/libgfx.c annotate

annotate tools/libgfx.c @ 2091:3b3acb6b4ba0

Cleanups.

author	Matti Hamalainen <ccr@tnsp.org>
date	Thu, 28 Feb 2019 12:18:27 +0200
parents	aedadff9e116
children	614b161c0aa5

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

Mercurial > hg > dmlib

annotate tools/libgfx.c @ 2091:3b3acb6b4ba0