dmlib: tools/libgfx.c annotate

annotate tools/libgfx.c @ 1339:65f8fd1bf76e

Cleanups.

author	Matti Hamalainen <ccr@tnsp.org>
date	Tue, 22 Aug 2017 15:01:23 +0300
parents	5ad7d780a09b
children	ae2ba8cb510f

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
1308 8f71ca1900ea Update header blurps and copyrights. Matti Hamalainen <ccr@tnsp.org> parents: 1307 diff changeset	4 * (C) Copyright 2012-2017 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 #include "dmfile.h"
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	10
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	11 #ifdef DM_USE_LIBPNG
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	12 #include <png.h>
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	13 #endif
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	14
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	15
1285 e4bda4909d72 Make libgfx error mode a global variable, at least for now. Matti Hamalainen <ccr@tnsp.org> parents: 1284 diff changeset	16 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	17
e4bda4909d72 Make libgfx error mode a global variable, at least for now. Matti Hamalainen <ccr@tnsp.org> parents: 1284 diff changeset	18
1309 5ad7d780a09b Move bitstream reading functions to libgfx, as they were only used there. Matti Hamalainen <ccr@tnsp.org> parents: 1308 diff changeset	19 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	20 {
5ad7d780a09b Move bitstream reading functions to libgfx, as they were only used there. Matti Hamalainen <ccr@tnsp.org> parents: 1308 diff changeset	21 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	22 ctx->outByteCount = 0;
5ad7d780a09b Move bitstream reading functions to libgfx, as they were only used there. Matti Hamalainen <ccr@tnsp.org> parents: 1308 diff changeset	23 ctx->outBitCount = 8;
5ad7d780a09b Move bitstream reading functions to libgfx, as they were only used there. Matti Hamalainen <ccr@tnsp.org> parents: 1308 diff changeset	24 }
5ad7d780a09b Move bitstream reading functions to libgfx, as they were only used there. Matti Hamalainen <ccr@tnsp.org> parents: 1308 diff changeset	25
5ad7d780a09b Move bitstream reading functions to libgfx, as they were only used there. Matti Hamalainen <ccr@tnsp.org> parents: 1308 diff changeset	26
5ad7d780a09b Move bitstream reading functions to libgfx, as they were only used there. Matti Hamalainen <ccr@tnsp.org> parents: 1308 diff changeset	27 BOOL dmPutBits(DMBitStreamContext *ctx, const int val, const int n)
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 int i;
5ad7d780a09b Move bitstream reading functions to libgfx, as they were only used there. Matti Hamalainen <ccr@tnsp.org> parents: 1308 diff changeset	30 unsigned int mask = 1 << (n - 1);
5ad7d780a09b Move bitstream reading functions to libgfx, as they were only used there. Matti Hamalainen <ccr@tnsp.org> parents: 1308 diff changeset	31
5ad7d780a09b Move bitstream reading functions to libgfx, as they were only used there. Matti Hamalainen <ccr@tnsp.org> parents: 1308 diff changeset	32 for (i = 0; i < n; i++)
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
5ad7d780a09b Move bitstream reading functions to libgfx, as they were only used there. Matti Hamalainen <ccr@tnsp.org> parents: 1308 diff changeset	36 if (val & mask)
5ad7d780a09b Move bitstream reading functions to libgfx, as they were only used there. Matti Hamalainen <ccr@tnsp.org> parents: 1308 diff changeset	37 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	38
5ad7d780a09b Move bitstream reading functions to libgfx, as they were only used there. Matti Hamalainen <ccr@tnsp.org> parents: 1308 diff changeset	39 mask >>= 1;
5ad7d780a09b Move bitstream reading functions to libgfx, as they were only used there. Matti Hamalainen <ccr@tnsp.org> parents: 1308 diff changeset	40 ctx->outBitCount--;
5ad7d780a09b Move bitstream reading functions to libgfx, as they were only used there. Matti Hamalainen <ccr@tnsp.org> parents: 1308 diff changeset	41
5ad7d780a09b Move bitstream reading functions to libgfx, as they were only used there. Matti Hamalainen <ccr@tnsp.org> parents: 1308 diff changeset	42 if (ctx->outBitCount == 0)
5ad7d780a09b Move bitstream reading functions to libgfx, as they were only used there. Matti Hamalainen <ccr@tnsp.org> parents: 1308 diff changeset	43 {
5ad7d780a09b Move bitstream reading functions to libgfx, as they were only used there. Matti Hamalainen <ccr@tnsp.org> parents: 1308 diff changeset	44 if (!ctx->putByte(ctx, ctx->outBuf & 0xff))
5ad7d780a09b Move bitstream reading functions to libgfx, as they were only used there. Matti Hamalainen <ccr@tnsp.org> parents: 1308 diff changeset	45 return FALSE;
5ad7d780a09b Move bitstream reading functions to libgfx, as they were only used there. Matti Hamalainen <ccr@tnsp.org> parents: 1308 diff changeset	46
5ad7d780a09b Move bitstream reading functions to libgfx, as they were only used there. Matti Hamalainen <ccr@tnsp.org> parents: 1308 diff changeset	47 ctx->outBitCount = 8;
5ad7d780a09b Move bitstream reading functions to libgfx, as they were only used there. Matti Hamalainen <ccr@tnsp.org> parents: 1308 diff changeset	48 ctx->outByteCount++;
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 }
5ad7d780a09b Move bitstream reading functions to libgfx, as they were only used there. Matti Hamalainen <ccr@tnsp.org> parents: 1308 diff changeset	51
5ad7d780a09b Move bitstream reading functions to libgfx, as they were only used there. Matti Hamalainen <ccr@tnsp.org> parents: 1308 diff changeset	52 return TRUE;
5ad7d780a09b Move bitstream reading functions to libgfx, as they were only used there. Matti Hamalainen <ccr@tnsp.org> parents: 1308 diff changeset	53 }
5ad7d780a09b Move bitstream reading functions to libgfx, as they were only used there. Matti Hamalainen <ccr@tnsp.org> parents: 1308 diff changeset	54
5ad7d780a09b Move bitstream reading functions to libgfx, as they were only used there. Matti Hamalainen <ccr@tnsp.org> parents: 1308 diff changeset	55
5ad7d780a09b Move bitstream reading functions to libgfx, as they were only used there. Matti Hamalainen <ccr@tnsp.org> parents: 1308 diff changeset	56 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	57 {
5ad7d780a09b Move bitstream reading functions to libgfx, as they were only used there. Matti Hamalainen <ccr@tnsp.org> parents: 1308 diff changeset	58 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	59 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	60
5ad7d780a09b Move bitstream reading functions to libgfx, as they were only used there. Matti Hamalainen <ccr@tnsp.org> parents: 1308 diff changeset	61 if (ctx->outBitCount != 8)
5ad7d780a09b Move bitstream reading functions to libgfx, as they were only used there. Matti Hamalainen <ccr@tnsp.org> parents: 1308 diff changeset	62 dmPutBits(ctx, 0, ctx->outBitCount);
5ad7d780a09b Move bitstream reading functions to libgfx, as they were only used there. Matti Hamalainen <ccr@tnsp.org> parents: 1308 diff changeset	63
5ad7d780a09b Move bitstream reading functions to libgfx, as they were only used there. Matti Hamalainen <ccr@tnsp.org> parents: 1308 diff changeset	64 return 0;
5ad7d780a09b Move bitstream reading functions to libgfx, as they were only used there. Matti Hamalainen <ccr@tnsp.org> parents: 1308 diff changeset	65 }
5ad7d780a09b Move bitstream reading functions to libgfx, as they were only used there. Matti Hamalainen <ccr@tnsp.org> parents: 1308 diff changeset	66
5ad7d780a09b Move bitstream reading functions to libgfx, as they were only used there. Matti Hamalainen <ccr@tnsp.org> parents: 1308 diff changeset	67
5ad7d780a09b Move bitstream reading functions to libgfx, as they were only used there. Matti Hamalainen <ccr@tnsp.org> parents: 1308 diff changeset	68 static BOOL dmPutByteFILE(DMBitStreamContext *ctx, const Uint8 val)
5ad7d780a09b Move bitstream reading functions to libgfx, as they were only used there. Matti Hamalainen <ccr@tnsp.org> parents: 1308 diff changeset	69 {
5ad7d780a09b Move bitstream reading functions to libgfx, as they were only used there. Matti Hamalainen <ccr@tnsp.org> parents: 1308 diff changeset	70 return fputc(val, (FILE *) ctx->handle) == val;
5ad7d780a09b Move bitstream reading functions to libgfx, as they were only used there. Matti Hamalainen <ccr@tnsp.org> parents: 1308 diff changeset	71 }
5ad7d780a09b Move bitstream reading functions to libgfx, as they were only used there. Matti Hamalainen <ccr@tnsp.org> parents: 1308 diff changeset	72
5ad7d780a09b Move bitstream reading functions to libgfx, as they were only used there. Matti Hamalainen <ccr@tnsp.org> parents: 1308 diff changeset	73
5ad7d780a09b Move bitstream reading functions to libgfx, as they were only used there. Matti Hamalainen <ccr@tnsp.org> parents: 1308 diff changeset	74 int dmInitBitStreamFILE(DMBitStreamContext ctx, FILE fp)
5ad7d780a09b Move bitstream reading functions to libgfx, as they were only used there. Matti Hamalainen <ccr@tnsp.org> parents: 1308 diff changeset	75 {
5ad7d780a09b Move bitstream reading functions to libgfx, as they were only used there. Matti Hamalainen <ccr@tnsp.org> parents: 1308 diff changeset	76 if (ctx == NULL \|\| fp == NULL)
5ad7d780a09b Move bitstream reading functions to libgfx, as they were only used there. Matti Hamalainen <ccr@tnsp.org> parents: 1308 diff changeset	77 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	78
5ad7d780a09b Move bitstream reading functions to libgfx, as they were only used there. Matti Hamalainen <ccr@tnsp.org> parents: 1308 diff changeset	79 ctx->putByte = dmPutByteFILE;
5ad7d780a09b Move bitstream reading functions to libgfx, as they were only used there. Matti Hamalainen <ccr@tnsp.org> parents: 1308 diff changeset	80 ctx->handle = (void *) fp;
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 dmInitBitStreamContext(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 return DMERR_OK;
5ad7d780a09b Move bitstream reading functions to libgfx, as they were only used there. Matti Hamalainen <ccr@tnsp.org> parents: 1308 diff changeset	85 }
1285 e4bda4909d72 Make libgfx error mode a global variable, at least for now. Matti Hamalainen <ccr@tnsp.org> parents: 1284 diff changeset	86
1339 65f8fd1bf76e Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1309 diff changeset	87
487 b89598501cec Move dmCompareColor() to libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	88 BOOL dmCompareColor(const DMColor c1, const DMColor c2, BOOL alpha)
b89598501cec Move dmCompareColor() to libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	89 {
b89598501cec Move dmCompareColor() to libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	90 if (c1->r == c2->r &&
b89598501cec Move dmCompareColor() to libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	91 c1->g == c2->g &&
b89598501cec Move dmCompareColor() to libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	92 c1->b == c2->b)
b89598501cec Move dmCompareColor() to libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	93 return alpha ? (c1->a == c2->a) : TRUE;
b89598501cec Move dmCompareColor() to libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	94 else
b89598501cec Move dmCompareColor() to libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	95 return FALSE;
b89598501cec Move dmCompareColor() to libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	96 }
b89598501cec Move dmCompareColor() to libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	97
b89598501cec Move dmCompareColor() to libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 472 diff changeset	98
1286 b812fad6f33e Work on libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1285 diff changeset	99 int dmImageGetBytesPerPixel(const int format)
b812fad6f33e Work on libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1285 diff changeset	100 {
b812fad6f33e Work on libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1285 diff changeset	101 switch (format)
b812fad6f33e Work on libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1285 diff changeset	102 {
b812fad6f33e Work on libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1285 diff changeset	103 case DM_IFMT_PALETTE : return 1;
b812fad6f33e Work on libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1285 diff changeset	104 case DM_IFMT_RGB : return 3;
b812fad6f33e Work on libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1285 diff changeset	105 case DM_IFMT_RGBA : return 4;
b812fad6f33e Work on libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1285 diff changeset	106 default: return -1;
b812fad6f33e Work on libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1285 diff changeset	107 }
b812fad6f33e Work on libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1285 diff changeset	108 }
b812fad6f33e Work on libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1285 diff changeset	109
b812fad6f33e Work on libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1285 diff changeset	110
b812fad6f33e Work on libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1285 diff changeset	111 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	112 {
928 ebe0d93e03c0 Use dmMalloc0() instead of dmCalloc() here. Matti Hamalainen <ccr@tnsp.org> parents: 902 diff changeset	113 DMImage *img = dmMalloc0(sizeof(DMImage));
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	114 if (img == NULL)
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	115 return NULL;
1102 e06abfde6c39 Cosmetics pass: Remove excess whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	116
1286 b812fad6f33e Work on libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1285 diff changeset	117 img->width = width;
b812fad6f33e Work on libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1285 diff changeset	118 img->height = height;
b812fad6f33e Work on libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1285 diff changeset	119 img->format = format;
b812fad6f33e Work on libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1285 diff changeset	120 img->bpp = (bpp <= 0) ? dmImageGetBytesPerPixel(format) * 8 : bpp;
b812fad6f33e Work on libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1285 diff changeset	121 img->pitch = width * img->bpp;
b812fad6f33e Work on libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1285 diff changeset	122 img->size = img->pitch * img->height;
b812fad6f33e Work on libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1285 diff changeset	123 img->ctransp = -1;
930 efbad8817b79 Some cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 929 diff changeset	124
929 e1378398be0f Add size field for allocated data size in DMImage. Matti Hamalainen <ccr@tnsp.org> parents: 928 diff changeset	125 if ((img->data = dmMalloc(img->size)) == NULL)
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	126 {
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	127 dmFree(img);
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	128 return NULL;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	129 }
1102 e06abfde6c39 Cosmetics pass: Remove excess whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	130
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	131 return img;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	132 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	133
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	134
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	135 void dmImageFree(DMImage *img)
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	136 {
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	137 if (img != NULL)
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	138 {
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	139 if (!img->constpal)
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	140 {
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	141 dmFree(img->pal);
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	142 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	143 dmFree(img->data);
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	144 dmFree(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
460 0af039b6c0ae Improve transparent color handling. Matti Hamalainen <ccr@tnsp.org> parents: 453 diff changeset	149 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	150 {
460 0af039b6c0ae Improve transparent color handling. Matti Hamalainen <ccr@tnsp.org> parents: 453 diff changeset	151 int i;
0af039b6c0ae Improve transparent color handling. Matti Hamalainen <ccr@tnsp.org> parents: 453 diff changeset	152
451 fdc91f2a0d27 Modularize palette reading and handling code. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	153 if (ppal == NULL)
fdc91f2a0d27 Modularize palette reading and handling code. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	154 return FALSE;
fdc91f2a0d27 Modularize palette reading and handling code. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	155
460 0af039b6c0ae Improve transparent color handling. Matti Hamalainen <ccr@tnsp.org> parents: 453 diff changeset	156 // Allocate desired amount of palette
0af039b6c0ae Improve transparent color handling. Matti Hamalainen <ccr@tnsp.org> parents: 453 diff changeset	157 if ((*ppal = dmCalloc(ncolors, sizeof(DMColor))) == NULL)
0af039b6c0ae Improve transparent color handling. Matti Hamalainen <ccr@tnsp.org> parents: 453 diff changeset	158 return FALSE;
0af039b6c0ae Improve transparent color handling. Matti Hamalainen <ccr@tnsp.org> parents: 453 diff changeset	159
0af039b6c0ae Improve transparent color handling. Matti Hamalainen <ccr@tnsp.org> parents: 453 diff changeset	160 // Set alpha values to max, except for transparent color
0af039b6c0ae Improve transparent color handling. Matti Hamalainen <ccr@tnsp.org> parents: 453 diff changeset	161 for (i = 0; i < ncolors; i++)
0af039b6c0ae Improve transparent color handling. Matti Hamalainen <ccr@tnsp.org> parents: 453 diff changeset	162 {
0af039b6c0ae Improve transparent color handling. Matti Hamalainen <ccr@tnsp.org> parents: 453 diff changeset	163 (*ppal)[i].a = (i == ctransp) ? 0 : 255;
0af039b6c0ae Improve transparent color handling. Matti Hamalainen <ccr@tnsp.org> parents: 453 diff changeset	164 }
0af039b6c0ae Improve transparent color handling. Matti Hamalainen <ccr@tnsp.org> parents: 453 diff changeset	165
0af039b6c0ae Improve transparent color handling. Matti Hamalainen <ccr@tnsp.org> parents: 453 diff changeset	166 return TRUE;
451 fdc91f2a0d27 Modularize palette reading and handling code. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	167 }
fdc91f2a0d27 Modularize palette reading and handling code. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	168
fdc91f2a0d27 Modularize palette reading and handling code. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	169
460 0af039b6c0ae Improve transparent color handling. Matti Hamalainen <ccr@tnsp.org> parents: 453 diff changeset	170 BOOL dmImageAllocPalette(DMImage *img, int ncolors, int ctransp)
451 fdc91f2a0d27 Modularize palette reading and handling code. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	171 {
fdc91f2a0d27 Modularize palette reading and handling code. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	172 if (img == NULL)
fdc91f2a0d27 Modularize palette reading and handling code. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	173 return FALSE;
1102 e06abfde6c39 Cosmetics pass: Remove excess whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	174
451 fdc91f2a0d27 Modularize palette reading and handling code. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	175 img->ncolors = ncolors;
460 0af039b6c0ae Improve transparent color handling. Matti Hamalainen <ccr@tnsp.org> parents: 453 diff changeset	176 img->ctransp = ctransp;
0af039b6c0ae Improve transparent color handling. Matti Hamalainen <ccr@tnsp.org> parents: 453 diff changeset	177 return dmPaletteAlloc(&(img->pal), ncolors, ctransp);
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
fdc91f2a0d27 Modularize palette reading and handling code. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	181 static BOOL dmReadPaletteData(FILE fp, DMColor pal, int ncolors)
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 int i;
1102 e06abfde6c39 Cosmetics pass: Remove excess whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	184
451 fdc91f2a0d27 Modularize palette reading and handling code. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	185 for (i = 0; i < ncolors; i++)
fdc91f2a0d27 Modularize palette reading and handling code. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	186 {
fdc91f2a0d27 Modularize palette reading and handling code. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	187 Uint8 colR, colG, colB;
fdc91f2a0d27 Modularize palette reading and handling code. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	188 if (!dm_fread_byte(fp, &colR) \|\|
fdc91f2a0d27 Modularize palette reading and handling code. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	189 !dm_fread_byte(fp, &colG) \|\|
fdc91f2a0d27 Modularize palette reading and handling code. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	190 !dm_fread_byte(fp, &colB))
fdc91f2a0d27 Modularize palette reading and handling code. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	191 return FALSE;
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 pal[i].r = colR;
fdc91f2a0d27 Modularize palette reading and handling code. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	194 pal[i].g = colG;
fdc91f2a0d27 Modularize palette reading and handling code. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	195 pal[i].b = colB;
fdc91f2a0d27 Modularize palette reading and handling code. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	196 }
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 return TRUE;
fdc91f2a0d27 Modularize palette reading and handling code. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	199 }
fdc91f2a0d27 Modularize palette reading and handling code. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	200
fdc91f2a0d27 Modularize palette reading and handling code. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	201
1301 e03f20d0f785 Constify. Matti Hamalainen <ccr@tnsp.org> parents: 1300 diff changeset	202 int dmWriteImageData(DMImage img, void cbdata, int (writeRowCB)(void , const Uint8 , const size_t), const DMImageConvSpec spec)
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	203 {
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	204 int x, y, yscale, xscale, res = 0, rowSize, rowWidth;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	205 Uint8 *row = NULL;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	206
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	207 // 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	208 rowWidth = img->width * spec->scaleX;
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	209 rowSize = rowWidth * dmImageGetBytesPerPixel(spec->format);
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	210
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	211 if ((row = dmMalloc(rowSize + 16)) == NULL)
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	212 {
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	213 res = DMERR_MALLOC;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	214 goto done;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	215 }
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 // Generate the image
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	218 for (y = 0; y < img->height; y++)
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	219 {
436 86f956e4580f Cosmetics, rename a variable. Matti Hamalainen <ccr@tnsp.org> parents: 435 diff changeset	220 Uint8 *ptr1 = row,
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	221 *ptr2 = ptr1 + rowWidth,
1291 2c4acbc3e7bf More work on libgfx etc. Matti Hamalainen <ccr@tnsp.org> parents: 1290 diff changeset	222 *ptr3 = ptr2 + rowWidth,
2c4acbc3e7bf More work on libgfx etc. Matti Hamalainen <ccr@tnsp.org> parents: 1290 diff changeset	223 *ptr4 = ptr3 + rowWidth;
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	224
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	225 for (x = 0; x < img->width; x++)
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	226 {
1291 2c4acbc3e7bf More work on libgfx etc. Matti Hamalainen <ccr@tnsp.org> parents: 1290 diff changeset	227 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	228 qr, qg, qb, qa;
2c4acbc3e7bf More work on libgfx etc. Matti Hamalainen <ccr@tnsp.org> parents: 1290 diff changeset	229
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	230 switch (spec->format)
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	231 {
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	232 case DM_IFMT_PALETTE:
902 c6c480e8e1c8 Add separate X and Y scaling to gfxconv and libgfx outputters. Matti Hamalainen <ccr@tnsp.org> parents: 858 diff changeset	233 for (xscale = 0; xscale < spec->scaleX; xscale++)
436 86f956e4580f Cosmetics, rename a variable. Matti Hamalainen <ccr@tnsp.org> parents: 435 diff changeset	234 *ptr1++ = c;
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	235 break;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	236
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	237 case DM_IFMT_RGBA:
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	238 qr = img->pal[c].r;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	239 qg = img->pal[c].g;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	240 qb = img->pal[c].b;
460 0af039b6c0ae Improve transparent color handling. Matti Hamalainen <ccr@tnsp.org> parents: 453 diff changeset	241 qa = img->pal[c].a;
1292 92e99ea23811 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 1291 diff changeset	242
1291 2c4acbc3e7bf More work on libgfx etc. Matti Hamalainen <ccr@tnsp.org> parents: 1290 diff changeset	243 if (spec->planar)
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	244 {
1291 2c4acbc3e7bf More work on libgfx etc. Matti Hamalainen <ccr@tnsp.org> parents: 1290 diff changeset	245 for (xscale = 0; xscale < spec->scaleX; xscale++)
2c4acbc3e7bf More work on libgfx etc. Matti Hamalainen <ccr@tnsp.org> parents: 1290 diff changeset	246 {
2c4acbc3e7bf More work on libgfx etc. Matti Hamalainen <ccr@tnsp.org> parents: 1290 diff changeset	247 *ptr1++ = qr;
2c4acbc3e7bf More work on libgfx etc. Matti Hamalainen <ccr@tnsp.org> parents: 1290 diff changeset	248 *ptr2++ = qg;
2c4acbc3e7bf More work on libgfx etc. Matti Hamalainen <ccr@tnsp.org> parents: 1290 diff changeset	249 *ptr3++ = qb;
2c4acbc3e7bf More work on libgfx etc. Matti Hamalainen <ccr@tnsp.org> parents: 1290 diff changeset	250 *ptr4++ = qa;
2c4acbc3e7bf More work on libgfx etc. Matti Hamalainen <ccr@tnsp.org> parents: 1290 diff changeset	251 }
2c4acbc3e7bf More work on libgfx etc. Matti Hamalainen <ccr@tnsp.org> parents: 1290 diff changeset	252 }
2c4acbc3e7bf More work on libgfx etc. Matti Hamalainen <ccr@tnsp.org> parents: 1290 diff changeset	253 else
2c4acbc3e7bf More work on libgfx etc. Matti Hamalainen <ccr@tnsp.org> parents: 1290 diff changeset	254 {
2c4acbc3e7bf More work on libgfx etc. Matti Hamalainen <ccr@tnsp.org> parents: 1290 diff changeset	255 for (xscale = 0; xscale < spec->scaleX; xscale++)
2c4acbc3e7bf More work on libgfx etc. Matti Hamalainen <ccr@tnsp.org> parents: 1290 diff changeset	256 {
2c4acbc3e7bf More work on libgfx etc. Matti Hamalainen <ccr@tnsp.org> parents: 1290 diff changeset	257 *ptr1++ = qr;
2c4acbc3e7bf More work on libgfx etc. Matti Hamalainen <ccr@tnsp.org> parents: 1290 diff changeset	258 *ptr1++ = qg;
2c4acbc3e7bf More work on libgfx etc. Matti Hamalainen <ccr@tnsp.org> parents: 1290 diff changeset	259 *ptr1++ = qb;
2c4acbc3e7bf More work on libgfx etc. Matti Hamalainen <ccr@tnsp.org> parents: 1290 diff changeset	260 *ptr1++ = qa;
2c4acbc3e7bf More work on libgfx etc. Matti Hamalainen <ccr@tnsp.org> parents: 1290 diff changeset	261 }
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	262 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	263 break;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	264
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	265 case DM_IFMT_RGB:
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	266 qr = img->pal[c].r;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	267 qg = img->pal[c].g;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	268 qb = img->pal[c].b;
1102 e06abfde6c39 Cosmetics pass: Remove excess whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	269
1291 2c4acbc3e7bf More work on libgfx etc. Matti Hamalainen <ccr@tnsp.org> parents: 1290 diff changeset	270 if (spec->planar)
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	271 {
1291 2c4acbc3e7bf More work on libgfx etc. Matti Hamalainen <ccr@tnsp.org> parents: 1290 diff changeset	272 for (xscale = 0; xscale < spec->scaleX; xscale++)
2c4acbc3e7bf More work on libgfx etc. Matti Hamalainen <ccr@tnsp.org> parents: 1290 diff changeset	273 {
2c4acbc3e7bf More work on libgfx etc. Matti Hamalainen <ccr@tnsp.org> parents: 1290 diff changeset	274 *ptr1++ = qr;
2c4acbc3e7bf More work on libgfx etc. Matti Hamalainen <ccr@tnsp.org> parents: 1290 diff changeset	275 *ptr2++ = qg;
2c4acbc3e7bf More work on libgfx etc. Matti Hamalainen <ccr@tnsp.org> parents: 1290 diff changeset	276 *ptr3++ = qb;
2c4acbc3e7bf More work on libgfx etc. Matti Hamalainen <ccr@tnsp.org> parents: 1290 diff changeset	277 }
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	278 }
1291 2c4acbc3e7bf More work on libgfx etc. Matti Hamalainen <ccr@tnsp.org> parents: 1290 diff changeset	279 else
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	280 {
1291 2c4acbc3e7bf More work on libgfx etc. Matti Hamalainen <ccr@tnsp.org> parents: 1290 diff changeset	281 for (xscale = 0; xscale < spec->scaleX; xscale++)
2c4acbc3e7bf More work on libgfx etc. Matti Hamalainen <ccr@tnsp.org> parents: 1290 diff changeset	282 {
2c4acbc3e7bf More work on libgfx etc. Matti Hamalainen <ccr@tnsp.org> parents: 1290 diff changeset	283 *ptr1++ = qr;
2c4acbc3e7bf More work on libgfx etc. Matti Hamalainen <ccr@tnsp.org> parents: 1290 diff changeset	284 *ptr1++ = qg;
2c4acbc3e7bf More work on libgfx etc. Matti Hamalainen <ccr@tnsp.org> parents: 1290 diff changeset	285 *ptr1++ = qb;
2c4acbc3e7bf More work on libgfx etc. Matti Hamalainen <ccr@tnsp.org> parents: 1290 diff changeset	286 }
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	287 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	288 break;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	289 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	290 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	291
902 c6c480e8e1c8 Add separate X and Y scaling to gfxconv and libgfx outputters. Matti Hamalainen <ccr@tnsp.org> parents: 858 diff changeset	292 for (yscale = 0; yscale < spec->scaleY; yscale++)
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	293 {
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	294 if ((res = writeRowCB(cbdata, row, rowSize)) != DMERR_OK)
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	295 goto done;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	296 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	297 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	298
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	299 done:
1102 e06abfde6c39 Cosmetics pass: Remove excess whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	300 dmFree(row);
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	301 return res;
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
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	305 #define DMCOL(x) (((x) >> 4) & 0xf)
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	306
462 ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 461 diff changeset	307 int dmWriteIFFMasterRAWPalette(FILE fp, DMImage img, int ncolors,
ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 461 diff changeset	308 const char indent, const char type)
435 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 int i;
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 for (i = 0; i < ncolors; i++)
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	313 {
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	314 int color;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	315 if (i < img->ncolors)
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 color = (DMCOL(img->pal[i].r) << 8) \|
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	318 (DMCOL(img->pal[i].g) << 4) \|
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	319 (DMCOL(img->pal[i].b));
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	320 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	321 else
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	322 color = 0;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	323
462 ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 461 diff changeset	324 fprintf(fp, "%s%s $%04X\n",
ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 461 diff changeset	325 indent != NULL ? indent : "\t",
472 0359697eeb46 Oops, the ARAW palette output should use dc.w, not dw.b .. :P Matti Hamalainen <ccr@tnsp.org> parents: 467 diff changeset	326 type != NULL ? type : "dc.w",
462 ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 461 diff changeset	327 color);
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	328 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	329
462 ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 461 diff changeset	330 return DMERR_OK;
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	331 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	332
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	333
1290 e7dc9bb9777e Rename struct DMImageSpec to DMImageConvSpec. Matti Hamalainen <ccr@tnsp.org> parents: 1288 diff changeset	334 int dmWriteRAWImageFILE(FILE fp, DMImage img, const DMImageConvSpec *spec)
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	335 {
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	336 int xc, yc, plane, res;
800 c63e24f9aa9a Modularize bitstream reader. Matti Hamalainen <ccr@tnsp.org> parents: 566 diff changeset	337 DMBitStreamContext bs;
1102 e06abfde6c39 Cosmetics pass: Remove excess whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	338
800 c63e24f9aa9a Modularize bitstream reader. Matti Hamalainen <ccr@tnsp.org> parents: 566 diff changeset	339 if ((res = dmInitBitStreamFILE(&bs, fp)) != DMERR_OK)
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	340 return res;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	341
1291 2c4acbc3e7bf More work on libgfx etc. Matti Hamalainen <ccr@tnsp.org> parents: 1290 diff changeset	342 if (spec->planar)
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	343 {
1339 65f8fd1bf76e Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1309 diff changeset	344 // Output bitplanes in planar format
65f8fd1bf76e Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1309 diff changeset	345 // (each plane of line sequentially)
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	346 for (yc = 0; yc < img->height; yc++)
1339 65f8fd1bf76e Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1309 diff changeset	347 for (plane = 0; plane < spec->nplanes; plane++)
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	348 {
1339 65f8fd1bf76e Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1309 diff changeset	349 Uint8 sp = img->data + yc img->pitch;
65f8fd1bf76e Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1309 diff changeset	350 for (xc = 0; xc < img->width; xc++)
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	351 {
1339 65f8fd1bf76e Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1309 diff changeset	352 if (!dmPutBits(&bs, (sp[xc] & (1 << plane)) ? 1 : 0, 1))
65f8fd1bf76e Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1309 diff changeset	353 return DMERR_FWRITE;
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	354 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	355 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	356 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	357 else
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	358 {
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	359 // Output each bitplane in sequence
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	360 for (plane = 0; plane < spec->nplanes; plane++)
1339 65f8fd1bf76e Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1309 diff changeset	361 for (yc = 0; yc < img->height; yc++)
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	362 {
1339 65f8fd1bf76e Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1309 diff changeset	363 Uint8 sp = img->data + yc img->pitch;
65f8fd1bf76e Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1309 diff changeset	364 for (xc = 0; xc < img->width; xc++)
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	365 {
1339 65f8fd1bf76e Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1309 diff changeset	366 if (!dmPutBits(&bs, (sp[xc] & (1 << plane)) ? 1 : 0, 1))
65f8fd1bf76e Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1309 diff changeset	367 return DMERR_FWRITE;
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	368 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	369 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	370 }
1102 e06abfde6c39 Cosmetics pass: Remove excess whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	371
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	372 return dmFlushBitStream(&bs);
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	373 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	374
566 d400e32b62d9 Add a slightly different raw output format. Matti Hamalainen <ccr@tnsp.org> parents: 487 diff changeset	375
1290 e7dc9bb9777e Rename struct DMImageSpec to DMImageConvSpec. Matti Hamalainen <ccr@tnsp.org> parents: 1288 diff changeset	376 int dmWriteRAWImage(const char filename, DMImage img, const DMImageConvSpec *spec)
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	377 {
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	378 FILE *fp;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	379 int res;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	380
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	381 if ((fp = fopen(filename, "wb")) == NULL)
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	382 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	383 return dmError(DMERR_FOPEN,
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	384 "RAW: Could not open file '%s' for writing.\n",
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	385 filename);
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	386 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	387
566 d400e32b62d9 Add a slightly different raw output format. Matti Hamalainen <ccr@tnsp.org> parents: 487 diff changeset	388 res = dmWriteRAWImageFILE(fp, img, spec);
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	389
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	390 fclose(fp);
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	391 return res;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	392 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	393
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	394
1301 e03f20d0f785 Constify. Matti Hamalainen <ccr@tnsp.org> parents: 1300 diff changeset	395 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	396 {
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	397 if (fwrite(row, sizeof(Uint8), len, (FILE *) cbdata) == len)
f8126fa1df9b Use dmlib error code return value in cases where a plain boolean was used Matti Hamalainen <ccr@tnsp.org> parents: 800 diff changeset	398 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	399 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	400 return DMERR_FWRITE;
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	401 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	402
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	403
1290 e7dc9bb9777e Rename struct DMImageSpec to DMImageConvSpec. Matti Hamalainen <ccr@tnsp.org> parents: 1288 diff changeset	404 int dmWritePPMImageFILE(FILE fp, DMImage img, const DMImageConvSpec *spec)
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	405 {
1290 e7dc9bb9777e Rename struct DMImageSpec to DMImageConvSpec. Matti Hamalainen <ccr@tnsp.org> parents: 1288 diff changeset	406 DMImageConvSpec tmpSpec;
1288 6c8b19d1d196 More work on libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1287 diff changeset	407
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	408 // Write PPM header
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	409 fprintf(fp,
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	410 "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	411 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	412 img->height * spec->scaleY);
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	413
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	414 // Write image data
1290 e7dc9bb9777e Rename struct DMImageSpec to DMImageConvSpec. Matti Hamalainen <ccr@tnsp.org> parents: 1288 diff changeset	415 memcpy(&tmpSpec, spec, sizeof(DMImageConvSpec));
1288 6c8b19d1d196 More work on libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1287 diff changeset	416 tmpSpec.format = DM_IFMT_RGB;
6c8b19d1d196 More work on libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1287 diff changeset	417 return dmWriteImageData(img, (void *) fp, dmWritePPMRow, &tmpSpec);
435 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
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	420
1290 e7dc9bb9777e Rename struct DMImageSpec to DMImageConvSpec. Matti Hamalainen <ccr@tnsp.org> parents: 1288 diff changeset	421 int dmWritePPMImage(const char filename, DMImage img, const DMImageConvSpec *spec)
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	422 {
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	423 FILE *fp;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	424 int res;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	425
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	426 // Create output file
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	427 if ((fp = fopen(filename, "wb")) == NULL)
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	428 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	429 return dmError(DMERR_FOPEN,
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	430 "PPM: could not open file '%s' for writing.\n",
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	431 filename);
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	432 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	433
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	434 res = dmWritePPMImageFILE(fp, img, spec);
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	435
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	436 fclose(fp);
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	437 return res;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	438 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	439
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	440
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	441 #ifdef DM_USE_LIBPNG
1301 e03f20d0f785 Constify. Matti Hamalainen <ccr@tnsp.org> parents: 1300 diff changeset	442 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	443 {
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	444 png_structp png_ptr = cbdata;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	445 (void) len;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	446
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	447 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	448 return DMERR_INTERNAL;
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	449
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	450 png_write_row(png_ptr, row);
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	451
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	452 return DMERR_OK;
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	453 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	454
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	455
1290 e7dc9bb9777e Rename struct DMImageSpec to DMImageConvSpec. Matti Hamalainen <ccr@tnsp.org> parents: 1288 diff changeset	456 int dmWritePNGImageFILE(FILE fp, DMImage img, const DMImageConvSpec *spec)
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	457 {
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	458 png_structp png_ptr = NULL;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	459 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	460 int fmt, res;
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	461
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	462 // Create PNG structures
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	463 png_ptr = png_create_write_struct(
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	464 PNG_LIBPNG_VER_STRING,
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	465 NULL, NULL, NULL);
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	466
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	467 if (png_ptr == NULL)
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	468 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	469 res = dmError(DMERR_MALLOC,
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	470 "PNG: png_create_write_struct() failed.\n");
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	471 goto error;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	472 }
1102 e06abfde6c39 Cosmetics pass: Remove excess whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	473
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	474 info_ptr = png_create_info_struct(png_ptr);
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	475 if (info_ptr == NULL)
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	476 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	477 res = dmError(DMERR_INIT_FAIL,
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	478 "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	479 png_ptr);
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	480 goto error;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	481 }
1102 e06abfde6c39 Cosmetics pass: Remove excess whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	482
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	483 if (setjmp(png_jmpbuf(png_ptr)))
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	484 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	485 res = dmError(DMERR_INIT_FAIL,
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	486 "PNG: Error during image writing..\n");
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	487 goto error;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	488 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	489
1304 e968b259605b Fix a warning about potentially clobbered variable due to setjmp() use. Matti Hamalainen <ccr@tnsp.org> parents: 1303 diff changeset	490 res = DMERR_OK;
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	491 png_init_io(png_ptr, fp);
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	492
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	493 // Write PNG header info
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	494 switch (spec->format)
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	495 {
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	496 case DM_IFMT_PALETTE: fmt = PNG_COLOR_TYPE_PALETTE; break;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	497 case DM_IFMT_RGB : fmt = PNG_COLOR_TYPE_RGB; break;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	498 case DM_IFMT_RGBA : fmt = PNG_COLOR_TYPE_RGB_ALPHA; break;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	499 default:
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	500 res = dmError(DMERR_NOT_SUPPORTED,
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	501 "PNG: Unsupported image format %d.\n",
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	502 spec->format);
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	503 goto error;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	504 }
1102 e06abfde6c39 Cosmetics pass: Remove excess whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	505
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	506 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	507 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	508 img->height * spec->scaleY,
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	509 8, /* bits per component */
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	510 fmt,
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	511 PNG_INTERLACE_NONE,
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	512 PNG_COMPRESSION_TYPE_DEFAULT,
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	513 PNG_FILTER_TYPE_DEFAULT);
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	514
1287 32051ad352c8 Adjust debug messages and debug message levels in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1286 diff changeset	515 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	516 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	517 img->height * spec->scaleY,
460 0af039b6c0ae Improve transparent color handling. Matti Hamalainen <ccr@tnsp.org> parents: 453 diff changeset	518 8, fmt);
0af039b6c0ae Improve transparent color handling. Matti Hamalainen <ccr@tnsp.org> parents: 453 diff changeset	519
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	520 // Palette
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	521 if (spec->format == DM_IFMT_PALETTE)
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	522 {
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	523 int i;
858 e7019bd83cca Fix potential longjmp clobbering of variable. Matti Hamalainen <ccr@tnsp.org> parents: 834 diff changeset	524 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	525
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	526 if (palette == NULL)
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	527 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	528 res = dmError(DMERR_MALLOC,
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	529 "PNG: Could not allocate palette structure.");
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	530 goto error;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	531 }
1102 e06abfde6c39 Cosmetics pass: Remove excess whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	532
1167 848a88ce7a57 Use dmMemset(). Matti Hamalainen <ccr@tnsp.org> parents: 1152 diff changeset	533 dmMemset(palette, 0, PNG_MAX_PALETTE_LENGTH * sizeof(png_color));
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	534
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	535 for (i = 0; i < img->ncolors; i++)
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	536 {
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	537 palette[i].red = img->pal[i].r;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	538 palette[i].green = img->pal[i].g;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	539 palette[i].blue = img->pal[i].b;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	540 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	541
460 0af039b6c0ae Improve transparent color handling. Matti Hamalainen <ccr@tnsp.org> parents: 453 diff changeset	542 png_set_PLTE(png_ptr, info_ptr, palette, img->ncolors);
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	543 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	544
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	545 // png_set_gAMA(png_ptr, info_ptr, 2.2);
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	546
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	547 png_write_info(png_ptr, info_ptr);
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	548
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	549
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	550 // Write compressed image data
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	551 dmWriteImageData(img, (void *) png_ptr, dmWritePNGRow, spec);
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	552
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	553 // Write footer
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	554 png_write_end(png_ptr, NULL);
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	555
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	556 error:
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	557 if (png_ptr && info_ptr)
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	558 png_destroy_write_struct(&png_ptr, &info_ptr);
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 return res;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	561 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	562
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	563
1290 e7dc9bb9777e Rename struct DMImageSpec to DMImageConvSpec. Matti Hamalainen <ccr@tnsp.org> parents: 1288 diff changeset	564 int dmWritePNGImage(const char filename, DMImage img, const DMImageConvSpec *spec)
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	565 {
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	566 int res;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	567 FILE *fp;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	568
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	569 if ((fp = fopen(filename, "wb")) == NULL)
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	570 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	571 return dmError(DMERR_FOPEN,
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	572 "PNG: could not open file '%s' for writing.\n",
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	573 filename);
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	574 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	575
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	576 res = dmWritePNGImageFILE(fp, img, spec);
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	577
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	578 fclose(fp);
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	579 return res;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	580 }
453 349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	581
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	582
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	583 int dmReadPNGImageFILE(FILE fp, DMImage *pimg)
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	584 {
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	585 png_structp png_ptr = NULL;
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	586 png_infop info_ptr = NULL;
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	587 png_colorp palette = NULL;
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	588 png_bytep *row_pointers = NULL;
460 0af039b6c0ae Improve transparent color handling. Matti Hamalainen <ccr@tnsp.org> parents: 453 diff changeset	589 png_bytep trans = NULL;
453 349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	590 png_uint_32 width, height;
460 0af039b6c0ae Improve transparent color handling. Matti Hamalainen <ccr@tnsp.org> parents: 453 diff changeset	591 int i, bit_depth, color_type, ncolors, ntrans;
453 349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	592 int res = DMERR_OK;
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	593 DMImage *img;
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	594
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	595 // Create PNG structures
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	596 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	597 PNG_LIBPNG_VER_STRING,
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	598 NULL, NULL, NULL);
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	599
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	600 if (png_ptr == NULL)
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 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_MALLOC,
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	603 "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	604 goto error;
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	605 }
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	606
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	607 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	608 if (info_ptr == NULL)
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 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: 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	612 png_ptr);
453 349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	613 goto error;
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	614 }
1102 e06abfde6c39 Cosmetics pass: Remove excess whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	615
453 349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	616 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	617 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	618 res = dmError(DMERR_INIT_FAIL,
1291 2c4acbc3e7bf More work on libgfx etc. Matti Hamalainen <ccr@tnsp.org> parents: 1290 diff changeset	619 "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	620 goto error;
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	621 }
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	622
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	623 png_init_io(png_ptr, fp);
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	624
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	625 // Read image information
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	626 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	627
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	628 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	629 &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	630
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	631 if (width < 1 \|\| height < 1)
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	632 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	633 res = dmError(DMERR_INVALID_DATA,
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	634 "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	635 width, height);
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	636 goto error;
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	637 }
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	638
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	639 switch (color_type)
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	640 {
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	641 case PNG_COLOR_TYPE_GRAY:
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	642 if (bit_depth < 8)
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	643 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	644
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	645 if (bit_depth > 8)
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	646 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	647 res = dmError(DMERR_NOT_SUPPORTED,
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	648 "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	649 bit_depth);
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	650 goto error;
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	651 }
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	652 break;
1102 e06abfde6c39 Cosmetics pass: Remove excess whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	653
453 349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	654 case PNG_COLOR_TYPE_PALETTE:
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	655 png_set_packing(png_ptr);
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	656 break;
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	657
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	658 default:
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	659 res = dmError(DMERR_NOT_SUPPORTED,
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	660 "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	661 goto error;
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	662 }
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	663
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	664 // Allocate image
1287 32051ad352c8 Adjust debug messages and debug message levels in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1286 diff changeset	665 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	666 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	667
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	668 if ((*pimg = img = dmImageAlloc(width, height,
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	669 DM_IFMT_PALETTE,
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	670 // 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	671 -1 /* bit_depth */)) == NULL)
453 349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	672 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	673 res = dmError(DMERR_MALLOC,
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	674 "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	675 goto error;
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	676 }
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	677
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	678 // ...
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	679 row_pointers = png_malloc(png_ptr, height * sizeof(png_bytep));
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	680 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	681 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	682
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	683 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	684
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	685 png_read_end(png_ptr, NULL);
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	686
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	687 // Create palette
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	688 switch (color_type)
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	689 {
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	690 case PNG_COLOR_TYPE_GRAY:
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	691 ncolors = 256;
1287 32051ad352c8 Adjust debug messages and debug message levels in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1286 diff changeset	692 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	693
460 0af039b6c0ae Improve transparent color handling. Matti Hamalainen <ccr@tnsp.org> parents: 453 diff changeset	694 if (!dmImageAllocPalette(img, ncolors, -1))
453 349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	695 {
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	696 res = DMERR_MALLOC;
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	697 goto error;
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	698 }
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	699
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	700 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	701 {
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	702 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	703 }
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	704 break;
1102 e06abfde6c39 Cosmetics pass: Remove excess whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	705
453 349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	706 case PNG_COLOR_TYPE_PALETTE:
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	707 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	708 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	709 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	710 {
467 80d09ea85e75 Check for NULL pointers from png_get_tRNS and png_get_PLTE. Matti Hamalainen <ccr@tnsp.org> parents: 465 diff changeset	711 if (!dmImageAllocPalette(img, ncolors, -1))
80d09ea85e75 Check for NULL pointers from png_get_tRNS and png_get_PLTE. Matti Hamalainen <ccr@tnsp.org> parents: 465 diff changeset	712 {
80d09ea85e75 Check for NULL pointers from png_get_tRNS and png_get_PLTE. Matti Hamalainen <ccr@tnsp.org> parents: 465 diff changeset	713 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	714 goto error;
80d09ea85e75 Check for NULL pointers from png_get_tRNS and png_get_PLTE. Matti Hamalainen <ccr@tnsp.org> parents: 465 diff changeset	715 }
453 349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	716
467 80d09ea85e75 Check for NULL pointers from png_get_tRNS and png_get_PLTE. Matti Hamalainen <ccr@tnsp.org> parents: 465 diff changeset	717 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	718 {
80d09ea85e75 Check for NULL pointers from png_get_tRNS and png_get_PLTE. Matti Hamalainen <ccr@tnsp.org> parents: 465 diff changeset	719 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	720 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	721 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	722 }
453 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 break;
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	725 }
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	726
460 0af039b6c0ae Improve transparent color handling. Matti Hamalainen <ccr@tnsp.org> parents: 453 diff changeset	727 if (color_type == PNG_COLOR_TYPE_PALETTE \|\|
0af039b6c0ae Improve transparent color handling. Matti Hamalainen <ccr@tnsp.org> parents: 453 diff changeset	728 color_type == PNG_COLOR_TYPE_GRAY)
0af039b6c0ae Improve transparent color handling. Matti Hamalainen <ccr@tnsp.org> parents: 453 diff changeset	729 {
0af039b6c0ae Improve transparent color handling. Matti Hamalainen <ccr@tnsp.org> parents: 453 diff changeset	730 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	731 if (trans != NULL && ntrans > 0)
460 0af039b6c0ae Improve transparent color handling. Matti Hamalainen <ccr@tnsp.org> parents: 453 diff changeset	732 {
467 80d09ea85e75 Check for NULL pointers from png_get_tRNS and png_get_PLTE. Matti Hamalainen <ccr@tnsp.org> parents: 465 diff changeset	733 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	734 {
80d09ea85e75 Check for NULL pointers from png_get_tRNS and png_get_PLTE. Matti Hamalainen <ccr@tnsp.org> parents: 465 diff changeset	735 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	736 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	737 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	738 }
460 0af039b6c0ae Improve transparent color handling. Matti Hamalainen <ccr@tnsp.org> parents: 453 diff changeset	739 }
1102 e06abfde6c39 Cosmetics pass: Remove excess whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	740 }
460 0af039b6c0ae Improve transparent color handling. Matti Hamalainen <ccr@tnsp.org> parents: 453 diff changeset	741
453 349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	742 error:
460 0af039b6c0ae Improve transparent color handling. Matti Hamalainen <ccr@tnsp.org> parents: 453 diff changeset	743 // png_free(png_ptr, palette);
453 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 if (png_ptr && info_ptr)
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	746 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	747
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	748 return res;
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	749 }
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	750
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	751
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	752 int dmReadPNGImage(const char filename, DMImage *img)
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	753 {
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	754 int res;
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	755 FILE *fp;
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	756
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	757 if ((fp = fopen(filename, "rb")) == NULL)
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	758 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	759 return dmError(DMERR_FOPEN,
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	760 "PNG: Could not open file '%s' for reading.\n",
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	761 filename);
453 349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	762 }
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	763
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	764 res = dmReadPNGImageFILE(fp, img);
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	765
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	766 fclose(fp);
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	767 return res;
349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	768 }
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	769 #endif
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	770
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	771
1279 0d3f5f44c0c4 Somewhat improve PCX read support in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1265 diff changeset	772 #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	773
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	774 typedef struct
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	775 {
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	776 Uint8 r,g,b;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	777 } DMPCXColor;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	778
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	779
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	780 typedef struct
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	781 {
1279 0d3f5f44c0c4 Somewhat improve PCX read support in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1265 diff changeset	782 Uint8 manufacturer, // always 0x0a
1288 6c8b19d1d196 More work on libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1287 diff changeset	783 version, // Z-Soft PC Paintbrush version:
6c8b19d1d196 More work on libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1287 diff changeset	784 // 0 = v2.5
6c8b19d1d196 More work on libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1287 diff changeset	785 // 2 = v2.8 with palette,
6c8b19d1d196 More work on libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1287 diff changeset	786 // 3 = v2.8 without palette
6c8b19d1d196 More work on libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1287 diff changeset	787 // 4 = PC Paintbrush for Windows
6c8b19d1d196 More work on libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1287 diff changeset	788 // 5 = v3.0 or better
1279 0d3f5f44c0c4 Somewhat improve PCX read support in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1265 diff changeset	789 encoding, // usually 0x01 = RLE, 0x00 = uncompressed
0d3f5f44c0c4 Somewhat improve PCX read support in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1265 diff changeset	790 bitsPerPlane; // bits per pixel per plane
0d3f5f44c0c4 Somewhat improve PCX read support in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1265 diff changeset	791
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	792 Uint16 xmin, ymin, xmax, ymax;
1279 0d3f5f44c0c4 Somewhat improve PCX read support in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1265 diff changeset	793 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	794 DMPCXColor colorMap[DMPCX_PAL_COLORS];
0d3f5f44c0c4 Somewhat improve PCX read support in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1265 diff changeset	795 Uint8 reserved; // should be set to 0
0d3f5f44c0c4 Somewhat improve PCX read support in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1265 diff changeset	796 Uint8 nplanes; // number of planes
0d3f5f44c0c4 Somewhat improve PCX read support in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1265 diff changeset	797 Uint16 bpl; // bytes per plane LINE
0d3f5f44c0c4 Somewhat improve PCX read support in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1265 diff changeset	798 Uint16 palInfo; // 1 = color/BW, 2 = grayscale
0d3f5f44c0c4 Somewhat improve PCX read support in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1265 diff changeset	799 Uint16 hScreenSize, vScreenSize;
0d3f5f44c0c4 Somewhat improve PCX read support in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1265 diff changeset	800 Uint8 filler[54];
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	801 } DMPCXHeader;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	802
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	803
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	804 typedef struct
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	805 {
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	806 DMPCXHeader *header;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	807 Uint8 *buf;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	808 size_t bufLen, bufOffs;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	809 FILE *fp;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	810 } DMPCXData;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	811
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	812
1298 f0d6aac3adc4 Some cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1297 diff changeset	813 // Returns one byte from row buffer (of length len) at offset soffs,
f0d6aac3adc4 Some cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1297 diff changeset	814 // OR zero if the offset is outside buffer.
1301 e03f20d0f785 Constify. Matti Hamalainen <ccr@tnsp.org> parents: 1300 diff changeset	815 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	816 {
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	817 return (soffs < len) ? row[soffs] : 0;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	818 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	819
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	820 static BOOL dmPCXFlush(DMPCXData *pcx)
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	821 {
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	822 BOOL ret = TRUE;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	823 if (pcx->bufOffs > 0)
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	824 ret = fwrite(pcx->buf, sizeof(Uint8), pcx->bufOffs, pcx->fp) == pcx->bufOffs;
1297 5bd64397453b More work on PCX writer. Matti Hamalainen <ccr@tnsp.org> parents: 1296 diff changeset	825
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	826 pcx->bufOffs = 0;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	827 return ret;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	828 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	829
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	830 static inline BOOL dmPCXPutByte(DMPCXData *pcx, const Uint8 val)
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	831 {
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	832 if (pcx->bufOffs < pcx->bufLen)
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	833 {
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	834 pcx->buf[pcx->bufOffs++] = val;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	835 return TRUE;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	836 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	837 else
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	838 return dmPCXFlush(pcx);
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	839 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	840
1297 5bd64397453b More work on PCX writer. Matti Hamalainen <ccr@tnsp.org> parents: 1296 diff changeset	841
5bd64397453b More work on PCX writer. Matti Hamalainen <ccr@tnsp.org> parents: 1296 diff changeset	842 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	843 {
5bd64397453b More work on PCX writer. Matti Hamalainen <ccr@tnsp.org> parents: 1296 diff changeset	844 if (count == 1 && (data & 0xC0) != 0xC0)
5bd64397453b More work on PCX writer. Matti Hamalainen <ccr@tnsp.org> parents: 1296 diff changeset	845 {
5bd64397453b More work on PCX writer. Matti Hamalainen <ccr@tnsp.org> parents: 1296 diff changeset	846 if (!dmPCXPutByte(pcx, data))
5bd64397453b More work on PCX writer. Matti Hamalainen <ccr@tnsp.org> parents: 1296 diff changeset	847 return DMERR_FWRITE;
5bd64397453b More work on PCX writer. Matti Hamalainen <ccr@tnsp.org> parents: 1296 diff changeset	848 }
5bd64397453b More work on PCX writer. Matti Hamalainen <ccr@tnsp.org> parents: 1296 diff changeset	849 else
5bd64397453b More work on PCX writer. Matti Hamalainen <ccr@tnsp.org> parents: 1296 diff changeset	850 {
5bd64397453b More work on PCX writer. Matti Hamalainen <ccr@tnsp.org> parents: 1296 diff changeset	851 if (!dmPCXPutByte(pcx, 0xC0 \| count) \|\|
5bd64397453b More work on PCX writer. Matti Hamalainen <ccr@tnsp.org> parents: 1296 diff changeset	852 !dmPCXPutByte(pcx, data))
5bd64397453b More work on PCX writer. Matti Hamalainen <ccr@tnsp.org> parents: 1296 diff changeset	853 return DMERR_FWRITE;
5bd64397453b More work on PCX writer. Matti Hamalainen <ccr@tnsp.org> parents: 1296 diff changeset	854 }
5bd64397453b More work on PCX writer. Matti Hamalainen <ccr@tnsp.org> parents: 1296 diff changeset	855 return DMERR_OK;
5bd64397453b More work on PCX writer. Matti Hamalainen <ccr@tnsp.org> parents: 1296 diff changeset	856 }
5bd64397453b More work on PCX writer. Matti Hamalainen <ccr@tnsp.org> parents: 1296 diff changeset	857
5bd64397453b More work on PCX writer. Matti Hamalainen <ccr@tnsp.org> parents: 1296 diff changeset	858
1301 e03f20d0f785 Constify. Matti Hamalainen <ccr@tnsp.org> parents: 1300 diff changeset	859 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	860 {
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	861 DMPCXData pcx = (DMPCXData ) cbdata;
1297 5bd64397453b More work on PCX writer. Matti Hamalainen <ccr@tnsp.org> parents: 1296 diff changeset	862 int err;
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	863 size_t soffs = 0;
1102 e06abfde6c39 Cosmetics pass: Remove excess whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	864
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	865 pcx->bufOffs = 0;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	866
1279 0d3f5f44c0c4 Somewhat improve PCX read support in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1265 diff changeset	867 for (int plane = 0; plane < pcx->header->nplanes; plane++)
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	868 {
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	869 Uint8 data = dmPCXGetByte(row, len, soffs++),
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	870 count = 1;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	871
1297 5bd64397453b More work on PCX writer. Matti Hamalainen <ccr@tnsp.org> parents: 1296 diff changeset	872 size_t blen = pcx->header->bpl * pcx->header->nplanes;
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	873 while (soffs < blen)
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	874 {
1297 5bd64397453b More work on PCX writer. Matti Hamalainen <ccr@tnsp.org> parents: 1296 diff changeset	875 if (data == dmPCXGetByte(row, len, soffs) && count < 0x3F)
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	876 {
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	877 count++;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	878 soffs++;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	879 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	880 else
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	881 {
1297 5bd64397453b More work on PCX writer. Matti Hamalainen <ccr@tnsp.org> parents: 1296 diff changeset	882 if ((err = dmPCXPutData(pcx, data, count)) != DMERR_OK)
5bd64397453b More work on PCX writer. Matti Hamalainen <ccr@tnsp.org> parents: 1296 diff changeset	883 return err;
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	884
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	885 data = dmPCXGetByte(row, len, soffs++);
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	886 count = 1;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	887 }
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
1297 5bd64397453b More work on PCX writer. Matti Hamalainen <ccr@tnsp.org> parents: 1296 diff changeset	890 if ((err = dmPCXPutData(pcx, data, count)) != DMERR_OK)
5bd64397453b More work on PCX writer. Matti Hamalainen <ccr@tnsp.org> parents: 1296 diff changeset	891 return err;
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	892
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	893 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	894 return DMERR_FWRITE;
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	895 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	896
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	897
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	898 return DMERR_OK;
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	899 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	900
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	901
1302 38614c07c2e2 Now with "almost" working 24bit PCX output. Almost. Matti Hamalainen <ccr@tnsp.org> parents: 1301 diff changeset	902 int dmWritePCXImageFILE(FILE fp, DMImage img, const DMImageConvSpec *pspec)
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	903 {
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	904 DMPCXData pcx;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	905 DMPCXHeader hdr;
1303 be30466fbc47 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1302 diff changeset	906 DMImageConvSpec spec;
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	907 int res;
1302 38614c07c2e2 Now with "almost" working 24bit PCX output. Almost. Matti Hamalainen <ccr@tnsp.org> parents: 1301 diff changeset	908
1303 be30466fbc47 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1302 diff changeset	909 // Always force planar for PCX
1302 38614c07c2e2 Now with "almost" working 24bit PCX output. Almost. Matti Hamalainen <ccr@tnsp.org> parents: 1301 diff changeset	910 memcpy(&spec, pspec, sizeof(DMImageConvSpec));
38614c07c2e2 Now with "almost" working 24bit PCX output. Almost. Matti Hamalainen <ccr@tnsp.org> parents: 1301 diff changeset	911 spec.planar = TRUE;
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	912
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	913 // Create output file
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	914 pcx.buf = NULL;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	915 pcx.header = &hdr;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	916 pcx.fp = fp;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	917
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	918 // Create PCX header
1167 848a88ce7a57 Use dmMemset(). Matti Hamalainen <ccr@tnsp.org> parents: 1152 diff changeset	919 dmMemset(&hdr, 0, sizeof(hdr));
1302 38614c07c2e2 Now with "almost" working 24bit PCX output. Almost. Matti Hamalainen <ccr@tnsp.org> parents: 1301 diff changeset	920 if (spec.paletted && img->pal != NULL)
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	921 {
1279 0d3f5f44c0c4 Somewhat improve PCX read support in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1265 diff changeset	922 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	923 {
1279 0d3f5f44c0c4 Somewhat improve PCX read support in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1265 diff changeset	924 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	925 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	926 hdr.colorMap[i].b = img->pal[i].b;
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	927 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	928 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	929 hdr.manufacturer = 10;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	930 hdr.version = 5;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	931 hdr.encoding = 1;
1302 38614c07c2e2 Now with "almost" working 24bit PCX output. Almost. Matti Hamalainen <ccr@tnsp.org> parents: 1301 diff changeset	932 hdr.hres = img->width * spec.scaleX;
38614c07c2e2 Now with "almost" working 24bit PCX output. Almost. Matti Hamalainen <ccr@tnsp.org> parents: 1301 diff changeset	933 hdr.vres = img->height * spec.scaleY;
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	934 hdr.xmin = hdr.ymin = 0;
1302 38614c07c2e2 Now with "almost" working 24bit PCX output. Almost. Matti Hamalainen <ccr@tnsp.org> parents: 1301 diff changeset	935 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	936 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	937 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	938 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	939 hdr.vScreenSize = hdr.vres;
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	940
1291 2c4acbc3e7bf More work on libgfx etc. Matti Hamalainen <ccr@tnsp.org> parents: 1290 diff changeset	941 // TODO XXX .. maybe actually compute these asdf
2c4acbc3e7bf More work on libgfx etc. Matti Hamalainen <ccr@tnsp.org> parents: 1290 diff changeset	942 hdr.bitsPerPlane = 8;
1302 38614c07c2e2 Now with "almost" working 24bit PCX output. Almost. Matti Hamalainen <ccr@tnsp.org> parents: 1301 diff changeset	943 hdr.nplanes = dmImageGetBytesPerPixel(spec.format);
1291 2c4acbc3e7bf More work on libgfx etc. Matti Hamalainen <ccr@tnsp.org> parents: 1290 diff changeset	944
1302 38614c07c2e2 Now with "almost" working 24bit PCX output. Almost. Matti Hamalainen <ccr@tnsp.org> parents: 1301 diff changeset	945 res = img->width * spec.scaleX;
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	946 hdr.bpl = res / 2;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	947 if (res % 2) hdr.bpl++;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	948 hdr.bpl *= 2;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	949
1297 5bd64397453b More work on PCX writer. Matti Hamalainen <ccr@tnsp.org> parents: 1296 diff changeset	950 dmMsg(2,
5bd64397453b More work on PCX writer. Matti Hamalainen <ccr@tnsp.org> parents: 1296 diff changeset	951 "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	952 hdr.xmin, hdr.ymin, hdr.xmax, hdr.ymax,
5bd64397453b More work on PCX writer. Matti Hamalainen <ccr@tnsp.org> parents: 1296 diff changeset	953 hdr.hres, hdr.vres,
5bd64397453b More work on PCX writer. Matti Hamalainen <ccr@tnsp.org> parents: 1296 diff changeset	954 hdr.hScreenSize, hdr.vScreenSize);
5bd64397453b More work on PCX writer. Matti Hamalainen <ccr@tnsp.org> parents: 1296 diff changeset	955
1302 38614c07c2e2 Now with "almost" working 24bit PCX output. Almost. Matti Hamalainen <ccr@tnsp.org> parents: 1301 diff changeset	956 dmMsg(2, "PCX: nplanes=%d, bpp=%d, bpl=%d, isPaletted=%s, planar=%s\n",
38614c07c2e2 Now with "almost" working 24bit PCX output. Almost. Matti Hamalainen <ccr@tnsp.org> parents: 1301 diff changeset	957 hdr.nplanes, hdr.bitsPerPlane, hdr.bpl,
38614c07c2e2 Now with "almost" working 24bit PCX output. Almost. Matti Hamalainen <ccr@tnsp.org> parents: 1301 diff changeset	958 spec.paletted ? "yes" : "no",
38614c07c2e2 Now with "almost" working 24bit PCX output. Almost. Matti Hamalainen <ccr@tnsp.org> parents: 1301 diff changeset	959 spec.planar ? "yes" : "no"
38614c07c2e2 Now with "almost" working 24bit PCX output. Almost. Matti Hamalainen <ccr@tnsp.org> parents: 1301 diff changeset	960 );
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	961
1291 2c4acbc3e7bf More work on libgfx etc. Matti Hamalainen <ccr@tnsp.org> parents: 1290 diff changeset	962 // TODO XXX this is also bogus
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	963 pcx.bufLen = hdr.bpl * 4;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	964 if ((pcx.buf = dmMalloc(pcx.bufLen)) == NULL)
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	965 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	966 res = dmError(DMERR_MALLOC,
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	967 "PCX: Could not allocate %d bytes for RLE compression buffer.\n",
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	968 pcx.bufLen);
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	969 goto error;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	970 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	971
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	972 // Write PCX header
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	973 if (!dm_fwrite_byte(pcx.fp, hdr.manufacturer) \|\|
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	974 !dm_fwrite_byte(pcx.fp, hdr.version) \|\|
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	975 !dm_fwrite_byte(pcx.fp, hdr.encoding) \|\|
1279 0d3f5f44c0c4 Somewhat improve PCX read support in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1265 diff changeset	976 !dm_fwrite_byte(pcx.fp, hdr.bitsPerPlane))
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	977 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	978 res = dmError(DMERR_FWRITE,
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	979 "PCX: Could not write basic header data.\n");
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	980 goto error;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	981 }
1102 e06abfde6c39 Cosmetics pass: Remove excess whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	982
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	983 if (!dm_fwrite_le16(pcx.fp, hdr.xmin) \|\|
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	984 !dm_fwrite_le16(pcx.fp, hdr.ymin) \|\|
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	985 !dm_fwrite_le16(pcx.fp, hdr.xmax) \|\|
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	986 !dm_fwrite_le16(pcx.fp, hdr.ymax) \|\|
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	987 !dm_fwrite_le16(pcx.fp, hdr.hres) \|\|
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	988 !dm_fwrite_le16(pcx.fp, hdr.vres))
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	989 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	990 res = dmError(DMERR_FWRITE,
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	991 "PCX: Could not write image dimensions.\n");
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	992 goto error;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	993 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	994
1279 0d3f5f44c0c4 Somewhat improve PCX read support in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1265 diff changeset	995 if (!dm_fwrite_str(pcx.fp, (Uint8 *) &hdr.colorMap, sizeof(hdr.colorMap)))
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	996 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	997 res = dmError(DMERR_FWRITE,
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	998 "PCX: Could not write colormap.\n");
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	999 goto error;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1000 }
1102 e06abfde6c39 Cosmetics pass: Remove excess whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	1001
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1002 if (!dm_fwrite_byte(pcx.fp, hdr.reserved) \|\|
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1003 !dm_fwrite_byte(pcx.fp, hdr.nplanes) \|\|
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1004 !dm_fwrite_le16(pcx.fp, hdr.bpl) \|\|
1279 0d3f5f44c0c4 Somewhat improve PCX read support in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1265 diff changeset	1005 !dm_fwrite_le16(pcx.fp, hdr.palInfo) \|\|
1283 642a0dd98c6e Oops, forgot to adjust the writing and reading when adding two members to Matti Hamalainen <ccr@tnsp.org> parents: 1281 diff changeset	1006 !dm_fwrite_le16(pcx.fp, hdr.hScreenSize) \|\|
642a0dd98c6e Oops, forgot to adjust the writing and reading when adding two members to Matti Hamalainen <ccr@tnsp.org> parents: 1281 diff changeset	1007 !dm_fwrite_le16(pcx.fp, hdr.vScreenSize) \|\|
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1008 !dm_fwrite_str(pcx.fp, (Uint8 *) &hdr.filler, sizeof(hdr.filler)))
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1009 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1010 res = dmError(DMERR_FWRITE,
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1011 "PCX: Could not write header remainder.\n");
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1012 goto error;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1013 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1014
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1015 // Write image data
1302 38614c07c2e2 Now with "almost" working 24bit PCX output. Almost. Matti Hamalainen <ccr@tnsp.org> parents: 1301 diff changeset	1016 res = dmWriteImageData(img, (void *) &pcx, dmWritePCXRow, &spec);
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1017
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1018 // Write VGA palette
1302 38614c07c2e2 Now with "almost" working 24bit PCX output. Almost. Matti Hamalainen <ccr@tnsp.org> parents: 1301 diff changeset	1019 if (spec.paletted)
435 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 int i;
1294 9f2117f1584a Improve error checking in PCX writer. Matti Hamalainen <ccr@tnsp.org> parents: 1292 diff changeset	1022 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	1023
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1024 dm_fwrite_byte(pcx.fp, 0x0C);
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1025
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1026 for (i = 0; i < img->ncolors; i++)
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1027 {
1294 9f2117f1584a Improve error checking in PCX writer. Matti Hamalainen <ccr@tnsp.org> parents: 1292 diff changeset	1028 if (!dm_fwrite_byte(pcx.fp, img->pal[i].r) \|\|
9f2117f1584a Improve error checking in PCX writer. Matti Hamalainen <ccr@tnsp.org> parents: 1292 diff changeset	1029 !dm_fwrite_byte(pcx.fp, img->pal[i].g) \|\|
9f2117f1584a Improve error checking in PCX writer. Matti Hamalainen <ccr@tnsp.org> parents: 1292 diff changeset	1030 !dm_fwrite_byte(pcx.fp, img->pal[i].b))
9f2117f1584a Improve error checking in PCX writer. Matti Hamalainen <ccr@tnsp.org> parents: 1292 diff changeset	1031 {
9f2117f1584a Improve error checking in PCX writer. Matti Hamalainen <ccr@tnsp.org> parents: 1292 diff changeset	1032 res = dmError(DMERR_FWRITE,
9f2117f1584a Improve error checking in PCX writer. Matti Hamalainen <ccr@tnsp.org> parents: 1292 diff changeset	1033 "PCX: Could not write palette data.\n");
9f2117f1584a Improve error checking in PCX writer. Matti Hamalainen <ccr@tnsp.org> parents: 1292 diff changeset	1034 goto error;
9f2117f1584a Improve error checking in PCX writer. Matti Hamalainen <ccr@tnsp.org> parents: 1292 diff changeset	1035 }
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1036 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1037
1102 e06abfde6c39 Cosmetics pass: Remove excess whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	1038 // Pad the palette, if necessary
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1039 for (; i < 256; i++)
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1040 {
1294 9f2117f1584a Improve error checking in PCX writer. Matti Hamalainen <ccr@tnsp.org> parents: 1292 diff changeset	1041 if (!dm_fwrite_byte(pcx.fp, 0) \|\|
9f2117f1584a Improve error checking in PCX writer. Matti Hamalainen <ccr@tnsp.org> parents: 1292 diff changeset	1042 !dm_fwrite_byte(pcx.fp, 0) \|\|
9f2117f1584a Improve error checking in PCX writer. Matti Hamalainen <ccr@tnsp.org> parents: 1292 diff changeset	1043 !dm_fwrite_byte(pcx.fp, 0))
9f2117f1584a Improve error checking in PCX writer. Matti Hamalainen <ccr@tnsp.org> parents: 1292 diff changeset	1044 {
9f2117f1584a Improve error checking in PCX writer. Matti Hamalainen <ccr@tnsp.org> parents: 1292 diff changeset	1045 res = dmError(DMERR_FWRITE,
9f2117f1584a Improve error checking in PCX writer. Matti Hamalainen <ccr@tnsp.org> parents: 1292 diff changeset	1046 "PCX: Could not write palette data.\n");
9f2117f1584a Improve error checking in PCX writer. Matti Hamalainen <ccr@tnsp.org> parents: 1292 diff changeset	1047 goto error;
9f2117f1584a Improve error checking in PCX writer. Matti Hamalainen <ccr@tnsp.org> parents: 1292 diff changeset	1048 }
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1049 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1050 }
1102 e06abfde6c39 Cosmetics pass: Remove excess whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	1051
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1052 error:
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1053 dmFree(pcx.buf);
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1054 return res;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1055 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1056
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1057
1290 e7dc9bb9777e Rename struct DMImageSpec to DMImageConvSpec. Matti Hamalainen <ccr@tnsp.org> parents: 1288 diff changeset	1058 int dmWritePCXImage(const char filename, DMImage img, const DMImageConvSpec *spec)
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1059 {
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1060 FILE *fp;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1061 int res;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1062
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1063 if ((fp = fopen(filename, "wb")) == NULL)
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1064 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1065 return dmError(DMERR_FOPEN,
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1066 "PCX: Could not open file '%s' for writing.\n",
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1067 filename);
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1068 }
1102 e06abfde6c39 Cosmetics pass: Remove excess whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	1069
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1070 res = dmWritePCXImageFILE(fp, img, spec);
1102 e06abfde6c39 Cosmetics pass: Remove excess whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	1071
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1072 fclose(fp);
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1073 return res;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1074 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1075
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1076
1285 e4bda4909d72 Make libgfx error mode a global variable, at least for now. Matti Hamalainen <ccr@tnsp.org> parents: 1284 diff changeset	1077 static BOOL dmPCXDecodeRLERow(FILE fp, Uint8 buf, const size_t bufLen)
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1078 {
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1079 size_t offs = 0;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1080 do
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1081 {
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1082 int count;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1083 Uint8 data;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1084
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1085 if (!dm_fread_byte(fp, &data))
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1086 return FALSE;
1102 e06abfde6c39 Cosmetics pass: Remove excess whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	1087
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1088 if ((data & 0xC0) == 0xC0)
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1089 {
1284 28be63226b05 More work on PCX loader. Matti Hamalainen <ccr@tnsp.org> parents: 1283 diff changeset	1090 BOOL skip = FALSE;
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1091 count = data & 0x3F;
1284 28be63226b05 More work on PCX loader. Matti Hamalainen <ccr@tnsp.org> parents: 1283 diff changeset	1092 if (count == 0)
28be63226b05 More work on PCX loader. Matti Hamalainen <ccr@tnsp.org> parents: 1283 diff changeset	1093 {
1285 e4bda4909d72 Make libgfx error mode a global variable, at least for now. Matti Hamalainen <ccr@tnsp.org> parents: 1284 diff changeset	1094 switch (dmGFXErrorMode)
1284 28be63226b05 More work on PCX loader. Matti Hamalainen <ccr@tnsp.org> parents: 1283 diff changeset	1095 {
1285 e4bda4909d72 Make libgfx error mode a global variable, at least for now. Matti Hamalainen <ccr@tnsp.org> parents: 1284 diff changeset	1096 case DM_ERRMODE_RECOV_1:
1284 28be63226b05 More work on PCX loader. Matti Hamalainen <ccr@tnsp.org> parents: 1283 diff changeset	1097 // Use as literal
28be63226b05 More work on PCX loader. Matti Hamalainen <ccr@tnsp.org> parents: 1283 diff changeset	1098 skip = TRUE;
28be63226b05 More work on PCX loader. Matti Hamalainen <ccr@tnsp.org> parents: 1283 diff changeset	1099 count = 1;
28be63226b05 More work on PCX loader. Matti Hamalainen <ccr@tnsp.org> parents: 1283 diff changeset	1100 break;
28be63226b05 More work on PCX loader. Matti Hamalainen <ccr@tnsp.org> parents: 1283 diff changeset	1101
1285 e4bda4909d72 Make libgfx error mode a global variable, at least for now. Matti Hamalainen <ccr@tnsp.org> parents: 1284 diff changeset	1102 case DM_ERRMODE_RECOV_2:
1284 28be63226b05 More work on PCX loader. Matti Hamalainen <ccr@tnsp.org> parents: 1283 diff changeset	1103 // Ignore completely
28be63226b05 More work on PCX loader. Matti Hamalainen <ccr@tnsp.org> parents: 1283 diff changeset	1104 skip = TRUE;
28be63226b05 More work on PCX loader. Matti Hamalainen <ccr@tnsp.org> parents: 1283 diff changeset	1105 break;
28be63226b05 More work on PCX loader. Matti Hamalainen <ccr@tnsp.org> parents: 1283 diff changeset	1106
1285 e4bda4909d72 Make libgfx error mode a global variable, at least for now. Matti Hamalainen <ccr@tnsp.org> parents: 1284 diff changeset	1107 case DM_ERRMODE_FAIL:
1284 28be63226b05 More work on PCX loader. Matti Hamalainen <ccr@tnsp.org> parents: 1283 diff changeset	1108 default:
28be63226b05 More work on PCX loader. Matti Hamalainen <ccr@tnsp.org> parents: 1283 diff changeset	1109 // Error out on "invalid" data
28be63226b05 More work on PCX loader. Matti Hamalainen <ccr@tnsp.org> parents: 1283 diff changeset	1110 return FALSE;
28be63226b05 More work on PCX loader. Matti Hamalainen <ccr@tnsp.org> parents: 1283 diff changeset	1111 }
28be63226b05 More work on PCX loader. Matti Hamalainen <ccr@tnsp.org> parents: 1283 diff changeset	1112 }
28be63226b05 More work on PCX loader. Matti Hamalainen <ccr@tnsp.org> parents: 1283 diff changeset	1113
28be63226b05 More work on PCX loader. Matti Hamalainen <ccr@tnsp.org> parents: 1283 diff changeset	1114 if (!skip && !dm_fread_byte(fp, &data))
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1115 return FALSE;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1116 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1117 else
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1118 count = 1;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1119
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1120 while (count-- && offs < bufLen)
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1121 buf[offs++] = data;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1122
1284 28be63226b05 More work on PCX loader. Matti Hamalainen <ccr@tnsp.org> parents: 1283 diff changeset	1123 // 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	1124 if (count > 0 && dmGFXErrorMode == DM_ERRMODE_FAIL)
1284 28be63226b05 More work on PCX loader. Matti Hamalainen <ccr@tnsp.org> parents: 1283 diff changeset	1125 return FALSE;
28be63226b05 More work on PCX loader. Matti Hamalainen <ccr@tnsp.org> parents: 1283 diff changeset	1126
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1127 } while (offs < bufLen);
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1128
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1129 return TRUE;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1130 }
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
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1133 int dmReadPCXImageFILE(FILE fp, DMImage *pimg)
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1134 {
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1135 DMImage *img;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1136 DMPCXData pcx;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1137 DMPCXHeader hdr;
1279 0d3f5f44c0c4 Somewhat improve PCX read support in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1265 diff changeset	1138 int res = 0;
1286 b812fad6f33e Work on libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1285 diff changeset	1139 BOOL isPaletted;
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1140 pcx.buf = NULL;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1141
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1142 // Read PCX header
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1143 if (!dm_fread_byte(fp, &hdr.manufacturer) \|\|
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1144 !dm_fread_byte(fp, &hdr.version) \|\|
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1145 !dm_fread_byte(fp, &hdr.encoding) \|\|
1298 f0d6aac3adc4 Some cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1297 diff changeset	1146 !dm_fread_byte(fp, &hdr.bitsPerPlane) \|\|
f0d6aac3adc4 Some cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1297 diff changeset	1147 !dm_fread_le16(fp, &hdr.xmin) \|\|
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1148 !dm_fread_le16(fp, &hdr.ymin) \|\|
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1149 !dm_fread_le16(fp, &hdr.xmax) \|\|
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1150 !dm_fread_le16(fp, &hdr.ymax) \|\|
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1151 !dm_fread_le16(fp, &hdr.hres) \|\|
1298 f0d6aac3adc4 Some cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1297 diff changeset	1152 !dm_fread_le16(fp, &hdr.vres) \|\|
f0d6aac3adc4 Some cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1297 diff changeset	1153 !dm_fread_str(fp, (Uint8 *) &hdr.colorMap, sizeof(hdr.colorMap)) \|\|
f0d6aac3adc4 Some cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1297 diff changeset	1154 !dm_fread_byte(fp, &hdr.reserved) \|\|
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1155 !dm_fread_byte(fp, &hdr.nplanes) \|\|
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1156 !dm_fread_le16(fp, &hdr.bpl) \|\|
1279 0d3f5f44c0c4 Somewhat improve PCX read support in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1265 diff changeset	1157 !dm_fread_le16(fp, &hdr.palInfo) \|\|
1283 642a0dd98c6e Oops, forgot to adjust the writing and reading when adding two members to Matti Hamalainen <ccr@tnsp.org> parents: 1281 diff changeset	1158 !dm_fread_le16(fp, &hdr.hScreenSize) \|\|
642a0dd98c6e Oops, forgot to adjust the writing and reading when adding two members to Matti Hamalainen <ccr@tnsp.org> parents: 1281 diff changeset	1159 !dm_fread_le16(fp, &hdr.vScreenSize) \|\|
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1160 !dm_fread_str(fp, (Uint8 *) &hdr.filler, sizeof(hdr.filler)))
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1161 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1162 res = dmError(DMERR_FREAD,
1298 f0d6aac3adc4 Some cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1297 diff changeset	1163 "PCX: Could not read image header data.\n");
f0d6aac3adc4 Some cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1297 diff changeset	1164 goto error;
f0d6aac3adc4 Some cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1297 diff changeset	1165 }
f0d6aac3adc4 Some cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1297 diff changeset	1166
f0d6aac3adc4 Some cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1297 diff changeset	1167 if (hdr.manufacturer != 10 \|\|
f0d6aac3adc4 Some cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1297 diff changeset	1168 hdr.version > 5 \|\|
f0d6aac3adc4 Some cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1297 diff changeset	1169 hdr.encoding != 1)
f0d6aac3adc4 Some cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1297 diff changeset	1170 {
f0d6aac3adc4 Some cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1297 diff changeset	1171 res = dmError(DMERR_NOT_SUPPORTED,
f0d6aac3adc4 Some cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1297 diff changeset	1172 "PCX: Not a PCX file, or unsupported variant.\n");
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1173 goto error;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1174 }
1102 e06abfde6c39 Cosmetics pass: Remove excess whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	1175
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	1176 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	1177 {
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	1178 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	1179 "PCX: Probably invalid combination of nplanes and bpp, attempting to fix ..\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	1180
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	1181 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	1182 }
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	1183
1295 7a986f33895e Fix isPaletted check in PCX reader :P Matti Hamalainen <ccr@tnsp.org> parents: 1294 diff changeset	1184 isPaletted = (hdr.bitsPerPlane * hdr.nplanes) <= 8;
1291 2c4acbc3e7bf More work on libgfx etc. Matti Hamalainen <ccr@tnsp.org> parents: 1290 diff changeset	1185
2c4acbc3e7bf More work on libgfx etc. Matti Hamalainen <ccr@tnsp.org> parents: 1290 diff changeset	1186 dmMsg(2,
2c4acbc3e7bf More work on libgfx etc. Matti Hamalainen <ccr@tnsp.org> parents: 1290 diff changeset	1187 "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	1188 hdr.xmin, hdr.ymin, hdr.xmax, hdr.ymax,
2c4acbc3e7bf More work on libgfx etc. Matti Hamalainen <ccr@tnsp.org> parents: 1290 diff changeset	1189 hdr.hres, hdr.vres,
2c4acbc3e7bf More work on libgfx etc. Matti Hamalainen <ccr@tnsp.org> parents: 1290 diff changeset	1190 hdr.hScreenSize, hdr.vScreenSize);
2c4acbc3e7bf More work on libgfx etc. Matti Hamalainen <ccr@tnsp.org> parents: 1290 diff changeset	1191
2c4acbc3e7bf More work on libgfx etc. Matti Hamalainen <ccr@tnsp.org> parents: 1290 diff changeset	1192 dmMsg(2,
2c4acbc3e7bf More work on libgfx etc. Matti Hamalainen <ccr@tnsp.org> parents: 1290 diff changeset	1193 "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	1194 hdr.nplanes, hdr.bitsPerPlane, hdr.bpl, isPaletted ? "yes" : "no");
2c4acbc3e7bf More work on libgfx etc. Matti Hamalainen <ccr@tnsp.org> parents: 1290 diff changeset	1195
1279 0d3f5f44c0c4 Somewhat improve PCX read support in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1265 diff changeset	1196 if (hdr.nplanes < 1 \|\| hdr.nplanes > 8)
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1197 {
1279 0d3f5f44c0c4 Somewhat improve PCX read support in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1265 diff changeset	1198 res = dmError(DMERR_NOT_SUPPORTED,
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1199 "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	1200 hdr.nplanes);
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1201 goto error;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1202 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1203
1286 b812fad6f33e Work on libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1285 diff changeset	1204 if (!isPaletted)
b812fad6f33e Work on libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1285 diff changeset	1205 {
b812fad6f33e Work on libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1285 diff changeset	1206 res = dmError(DMERR_NOT_SUPPORTED,
b812fad6f33e Work on libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1285 diff changeset	1207 "PCX: Non-indexed (truecolour) PCX images not supported for loading.\n");
b812fad6f33e Work on libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1285 diff changeset	1208 goto error;
b812fad6f33e Work on libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1285 diff changeset	1209 }
b812fad6f33e Work on libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1285 diff changeset	1210
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1211 // Allocate image
1286 b812fad6f33e Work on libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1285 diff changeset	1212 if ((*pimg = img = dmImageAlloc(hdr.xmax - hdr.xmin + 1, hdr.ymax - hdr.ymin + 1,
b812fad6f33e Work on libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1285 diff changeset	1213 isPaletted ? DM_IFMT_PALETTE : DM_IFMT_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	1214 // 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	1215 // 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	1216 -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	1217 )) == NULL)
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1218 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1219 res = dmError(DMERR_MALLOC,
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1220 "PCX: Could not allocate image structure.\n");
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1221 goto error;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1222 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1223
1298 f0d6aac3adc4 Some cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1297 diff changeset	1224 // Sanity check bytes per line value
1279 0d3f5f44c0c4 Somewhat improve PCX read support in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1265 diff changeset	1225 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	1226 {
0d3f5f44c0c4 Somewhat improve PCX read support in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1265 diff changeset	1227 res = dmError(DMERR_MALLOC,
0d3f5f44c0c4 Somewhat improve PCX read support in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1265 diff changeset	1228 "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	1229 hdr.bpl, (img->width * hdr.bitsPerPlane) / 8);
0d3f5f44c0c4 Somewhat improve PCX read support in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1265 diff changeset	1230 goto error;
0d3f5f44c0c4 Somewhat improve PCX read support in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1265 diff changeset	1231 }
0d3f5f44c0c4 Somewhat improve PCX read support in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1265 diff changeset	1232
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1233 pcx.bufLen = hdr.nplanes * hdr.bpl;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1234 if ((pcx.buf = dmMalloc(pcx.bufLen)) == NULL)
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1235 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1236 res = dmError(DMERR_MALLOC,
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1237 "PCX: Could not allocate RLE buffer.\n");
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1238 goto error;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1239 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1240
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	1241 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	1242 "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	1243 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	1244
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1245 // Read image data
1279 0d3f5f44c0c4 Somewhat improve PCX read support in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1265 diff changeset	1246 Uint8 *dp = img->data;
0d3f5f44c0c4 Somewhat improve PCX read support in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1265 diff changeset	1247 for (int yc = 0; yc < img->height; yc++)
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1248 {
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1249 // 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	1250 if (!dmPCXDecodeRLERow(fp, pcx.buf, pcx.bufLen))
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1251 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1252 res = dmError(DMERR_INVALID_DATA,
1279 0d3f5f44c0c4 Somewhat improve PCX read support in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1265 diff changeset	1253 "PCX: Error decoding RLE compressed data.\n");
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1254 goto error;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1255 }
1296 228cab109c6a More work on PCX reader. Matti Hamalainen <ccr@tnsp.org> parents: 1295 diff changeset	1256
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1257 // Decode bitplanes
1279 0d3f5f44c0c4 Somewhat improve PCX read support in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1265 diff changeset	1258 switch (hdr.bitsPerPlane)
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1259 {
1296 228cab109c6a More work on PCX reader. Matti Hamalainen <ccr@tnsp.org> parents: 1295 diff changeset	1260 case 32:
228cab109c6a More work on PCX reader. Matti Hamalainen <ccr@tnsp.org> parents: 1295 diff changeset	1261 case 24:
228cab109c6a More work on PCX reader. Matti Hamalainen <ccr@tnsp.org> parents: 1295 diff changeset	1262 case 16:
1279 0d3f5f44c0c4 Somewhat improve PCX read support in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1265 diff changeset	1263 case 8:
0d3f5f44c0c4 Somewhat improve PCX read support in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1265 diff changeset	1264 {
1286 b812fad6f33e Work on libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1285 diff changeset	1265 // Actually bytes and bits per plane per pixel ..
b812fad6f33e Work on libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1285 diff changeset	1266 const int bytesPerPlane = hdr.bitsPerPlane / 8;
1279 0d3f5f44c0c4 Somewhat improve PCX read support in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1265 diff changeset	1267
1286 b812fad6f33e Work on libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1285 diff changeset	1268 for (int nplane = 0; nplane < hdr.nplanes; nplane++)
b812fad6f33e Work on libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1285 diff changeset	1269 {
b812fad6f33e Work on libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1285 diff changeset	1270 Uint8 dptr = dp + (nplane bytesPerPlane),
b812fad6f33e Work on libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1285 diff changeset	1271 sptr = pcx.buf + (hdr.bpl nplane);
b812fad6f33e Work on libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1285 diff changeset	1272
b812fad6f33e Work on libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1285 diff changeset	1273 memcpy(dptr, sptr, img->width * bytesPerPlane);
b812fad6f33e Work on libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1285 diff changeset	1274 }
1279 0d3f5f44c0c4 Somewhat improve PCX read support in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1265 diff changeset	1275 }
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1276 break;
1102 e06abfde6c39 Cosmetics pass: Remove excess whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	1277
1280 300a51e98fc3 Bump version and copyright. Matti Hamalainen <ccr@tnsp.org> parents: 1279 diff changeset	1278 case 1:
1296 228cab109c6a More work on PCX reader. Matti Hamalainen <ccr@tnsp.org> parents: 1295 diff changeset	1279 memset(dp, 0, img->width);
228cab109c6a More work on PCX reader. Matti Hamalainen <ccr@tnsp.org> parents: 1295 diff changeset	1280
1280 300a51e98fc3 Bump version and copyright. Matti Hamalainen <ccr@tnsp.org> parents: 1279 diff changeset	1281 for (int nplane = 0; nplane < hdr.nplanes; nplane++)
300a51e98fc3 Bump version and copyright. Matti Hamalainen <ccr@tnsp.org> parents: 1279 diff changeset	1282 {
1296 228cab109c6a More work on PCX reader. Matti Hamalainen <ccr@tnsp.org> parents: 1295 diff changeset	1283 Uint8 sptr = pcx.buf + (hdr.bpl nplane);
1280 300a51e98fc3 Bump version and copyright. Matti Hamalainen <ccr@tnsp.org> parents: 1279 diff changeset	1284
300a51e98fc3 Bump version and copyright. Matti Hamalainen <ccr@tnsp.org> parents: 1279 diff changeset	1285 for (int xc = 0; xc < img->width; xc++)
1296 228cab109c6a More work on PCX reader. Matti Hamalainen <ccr@tnsp.org> parents: 1295 diff changeset	1286 {
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	1287 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	1288 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	1289 }
1280 300a51e98fc3 Bump version and copyright. Matti Hamalainen <ccr@tnsp.org> parents: 1279 diff changeset	1290 }
300a51e98fc3 Bump version and copyright. Matti Hamalainen <ccr@tnsp.org> parents: 1279 diff changeset	1291 break;
300a51e98fc3 Bump version and copyright. Matti Hamalainen <ccr@tnsp.org> parents: 1279 diff changeset	1292
1279 0d3f5f44c0c4 Somewhat improve PCX read support in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1265 diff changeset	1293 default:
1285 e4bda4909d72 Make libgfx error mode a global variable, at least for now. Matti Hamalainen <ccr@tnsp.org> parents: 1284 diff changeset	1294 res = dmError(DMERR_NOT_SUPPORTED,
1279 0d3f5f44c0c4 Somewhat improve PCX read support in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1265 diff changeset	1295 "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	1296 hdr.bitsPerPlane);
0d3f5f44c0c4 Somewhat improve PCX read support in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1265 diff changeset	1297 goto error;
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1298 }
1102 e06abfde6c39 Cosmetics pass: Remove excess whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	1299
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1300 dp += img->pitch;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1301 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1302
1279 0d3f5f44c0c4 Somewhat improve PCX read support in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1265 diff changeset	1303 // Read additional VGA palette, if available
1286 b812fad6f33e Work on libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1285 diff changeset	1304 if (isPaletted)
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1305 {
1279 0d3f5f44c0c4 Somewhat improve PCX read support in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1265 diff changeset	1306 int ncolors;
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1307 Uint8 tmpb;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1308 BOOL read;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1309
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1310 if (!dm_fread_byte(fp, &tmpb) \|\| tmpb != 0x0C)
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1311 {
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1312 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	1313 ncolors = DMPCX_PAL_COLORS;
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1314 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1315 else
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1316 {
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1317 read = TRUE;
451 fdc91f2a0d27 Modularize palette reading and handling code. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1318 ncolors = 256;
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1319 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1320
460 0af039b6c0ae Improve transparent color handling. Matti Hamalainen <ccr@tnsp.org> parents: 453 diff changeset	1321 if (!dmImageAllocPalette(img, ncolors, -1))
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1322 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1323 res = dmError(DMERR_MALLOC,
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1324 "PCX: Could not allocate palette data!\n");
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1325 goto error;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1326 }
1102 e06abfde6c39 Cosmetics pass: Remove excess whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	1327
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1328 if (read)
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1329 {
1279 0d3f5f44c0c4 Somewhat improve PCX read support in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1265 diff changeset	1330 // Okay, attempt to read the palette data
1296 228cab109c6a More work on PCX reader. Matti Hamalainen <ccr@tnsp.org> parents: 1295 diff changeset	1331 dmMsg(2, "PCX: Reading palette of %d colors\n", ncolors);
451 fdc91f2a0d27 Modularize palette reading and handling code. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1332 if (!dmReadPaletteData(fp, img->pal, ncolors))
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1333 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1334 res = dmError(DMERR_FREAD,
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1335 "PCX: Error reading palette.\n");
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1336 goto error;
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1337 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1338 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1339 else
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1340 {
1279 0d3f5f44c0c4 Somewhat improve PCX read support in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1265 diff changeset	1341 // 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	1342 // the header palette to our internal palette structure.
1296 228cab109c6a More work on PCX reader. Matti Hamalainen <ccr@tnsp.org> parents: 1295 diff changeset	1343 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	1344 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	1345 {
1279 0d3f5f44c0c4 Somewhat improve PCX read support in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1265 diff changeset	1346 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	1347 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	1348 img->pal[i].b = hdr.colorMap[i].b;
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1349 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1350 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1351 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1352
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1353 error:
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1354 dmFree(pcx.buf);
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1355 return res;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1356 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1357
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1358
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1359 int dmReadPCXImage(const char filename, DMImage *pimg)
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1360 {
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1361 FILE *fp;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1362 int res;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1363
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1364 if ((fp = fopen(filename, "rb")) == NULL)
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1365 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1366 return dmError(DMERR_FOPEN,
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1367 "PCX: Could not open file '%s' for reading.\n",
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1368 filename);
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1369 }
1102 e06abfde6c39 Cosmetics pass: Remove excess whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	1370
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1371 res = dmReadPCXImageFILE(fp, pimg);
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1372
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1373 fclose(fp);
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1374 return res;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1375 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1376
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1377
443 f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1378 #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	1379 #define IFF_ID_ILBM 0x494C424D // "ILBM"
464 358776103ceb Add support for IFF PBMs. Matti Hamalainen <ccr@tnsp.org> parents: 462 diff changeset	1380 #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	1381 #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	1382 #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	1383 #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	1384 #define IFF_ID_CAMG 0x43414D47 // "CAMG"
443 f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1385
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1386 #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	1387 #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	1388 #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	1389 #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	1390
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1391 #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	1392 #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	1393
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	1394 #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	1395 #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	1396 #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	1397
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1398 typedef struct
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1399 {
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1400 Uint32 id;
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1401 Uint32 size;
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1402 int count;
445 1d65efb29986 Simplify. Matti Hamalainen <ccr@tnsp.org> parents: 444 diff changeset	1403 char str[6];
443 f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1404 } DMIFFChunk;
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1405
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1406
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1407 typedef struct
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1408 {
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1409 Uint16 w, h;
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1410 Sint16 x, y;
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1411 Uint8 nplanes;
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1412 Uint8 masking;
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1413 Uint8 compression;
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1414 Uint8 pad1;
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1415 Uint16 transp;
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1416 Uint8 xasp, yasp;
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1417 Sint16 pagew, pageh;
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1418 } DMIFFBMHD;
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1419
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1420
444 7d588807f91d Clean up the IFF parser a bit. Matti Hamalainen <ccr@tnsp.org> parents: 443 diff changeset	1421 typedef struct
7d588807f91d Clean up the IFF parser a bit. Matti Hamalainen <ccr@tnsp.org> parents: 443 diff changeset	1422 {
7d588807f91d Clean up the IFF parser a bit. Matti Hamalainen <ccr@tnsp.org> parents: 443 diff changeset	1423 DMIFFChunk chBMHD, chCMAP, chBODY;
7d588807f91d Clean up the IFF parser a bit. Matti Hamalainen <ccr@tnsp.org> parents: 443 diff changeset	1424 DMIFFBMHD bmhd;
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	1425 Uint32 camg;
444 7d588807f91d Clean up the IFF parser a bit. Matti Hamalainen <ccr@tnsp.org> parents: 443 diff changeset	1426 int ncolors;
7d588807f91d Clean up the IFF parser a bit. Matti Hamalainen <ccr@tnsp.org> parents: 443 diff changeset	1427 DMColor *pal;
1286 b812fad6f33e Work on libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1285 diff changeset	1428 BOOL planar;
444 7d588807f91d Clean up the IFF parser a bit. Matti Hamalainen <ccr@tnsp.org> parents: 443 diff changeset	1429 } DMIFF;
7d588807f91d Clean up the IFF parser a bit. Matti Hamalainen <ccr@tnsp.org> parents: 443 diff changeset	1430
7d588807f91d Clean up the IFF parser a bit. Matti Hamalainen <ccr@tnsp.org> parents: 443 diff changeset	1431
443 f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1432 static BOOL dmReadIFFChunk(FILE fp, DMIFFChunk chunk)
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1433 {
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1434 if (!dm_fread_be32(fp, &chunk->id) \|\|
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1435 !dm_fread_be32(fp, &chunk->size))
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1436 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1437 dmError(DMERR_FREAD,
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1438 "ILBM: Could not read IFF chunk header.\n");
1264 aa6e8a24b94b Oops, when did I break this? IFF ILBM reader should now work again. Matti Hamalainen <ccr@tnsp.org> parents: 1167 diff changeset	1439 return FALSE;
443 f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1440 }
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1441 else
1264 aa6e8a24b94b Oops, when did I break this? IFF ILBM reader should now work again. Matti Hamalainen <ccr@tnsp.org> parents: 1167 diff changeset	1442 return TRUE;
443 f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1443 }
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1444
445 1d65efb29986 Simplify. Matti Hamalainen <ccr@tnsp.org> parents: 444 diff changeset	1445 static char * dmGetIFFChunkID(DMIFFChunk *chunk)
443 f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1446 {
445 1d65efb29986 Simplify. Matti Hamalainen <ccr@tnsp.org> parents: 444 diff changeset	1447 chunk->str[0] = (chunk->id >> 24) & 0xff;
1d65efb29986 Simplify. Matti Hamalainen <ccr@tnsp.org> parents: 444 diff changeset	1448 chunk->str[1] = (chunk->id >> 16) & 0xff;
1d65efb29986 Simplify. Matti Hamalainen <ccr@tnsp.org> parents: 444 diff changeset	1449 chunk->str[2] = (chunk->id >> 8) & 0xff;
1d65efb29986 Simplify. Matti Hamalainen <ccr@tnsp.org> parents: 444 diff changeset	1450 chunk->str[3] = (chunk->id) & 0xff;
1d65efb29986 Simplify. Matti Hamalainen <ccr@tnsp.org> parents: 444 diff changeset	1451 chunk->str[4] = 0;
1d65efb29986 Simplify. Matti Hamalainen <ccr@tnsp.org> parents: 444 diff changeset	1452 return chunk->str;
443 f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1453 }
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1454
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1455 static int dmSkipIFFChunkRest(FILE fp, const DMIFFChunk chunk, const Uint32 used)
444 7d588807f91d Clean up the IFF parser a bit. Matti Hamalainen <ccr@tnsp.org> parents: 443 diff changeset	1456 {
7d588807f91d Clean up the IFF parser a bit. Matti Hamalainen <ccr@tnsp.org> parents: 443 diff changeset	1457 if (chunk->size > used)
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	1458 {
465 ffd5e730d313 Adjust verbosity levels. Matti Hamalainen <ccr@tnsp.org> parents: 464 diff changeset	1459 dmMsg(4, "ILBM: Skipping %d bytes (%d of %d consumed)\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	1460 chunk->size - used, used, chunk->size);
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1461
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1462 if (fseeko(fp, chunk->size - used, SEEK_CUR) != 0)
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1463 {
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1464 return dmError(DMERR_FSEEK,
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1465 "ILBM: Failed to skip chunk end.\n");
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1466 }
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1467 else
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1468 return DMERR_OK;
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	1469 }
444 7d588807f91d Clean up the IFF parser a bit. Matti Hamalainen <ccr@tnsp.org> parents: 443 diff changeset	1470 else
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1471 return DMERR_OK;
444 7d588807f91d Clean up the IFF parser a bit. Matti Hamalainen <ccr@tnsp.org> parents: 443 diff changeset	1472 }
7d588807f91d Clean up the IFF parser a bit. Matti Hamalainen <ccr@tnsp.org> parents: 443 diff changeset	1473
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1474 static int dmCheckIFFChunk(DMIFFChunk dest, DMIFFChunk chunk,
445 1d65efb29986 Simplify. Matti Hamalainen <ccr@tnsp.org> parents: 444 diff changeset	1475 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	1476 {
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1477 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	1478 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1479 return dmError(DMERR_INVALID_DATA,
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1480 "ILBM: Multiple instances of chunk %s found.\n",
445 1d65efb29986 Simplify. Matti Hamalainen <ccr@tnsp.org> parents: 444 diff changeset	1481 dmGetIFFChunkID(chunk));
443 f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1482 }
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1483
443 f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1484 dest->count++;
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1485
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1486 if (chunk->size < minSize)
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1487 {
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1488 return dmError(DMERR_OUT_OF_DATA,
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1489 "ILBM: Chunk is too small.\n");
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1490 }
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1491
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1492 return DMERR_OK;
443 f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1493 }
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1494
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1495
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	1496 static BOOL dmIFFDecodeByteRun1Row(FILE fp, Uint8 buf, const size_t 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	1497 {
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	1498 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	1499 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	1500 {
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	1501 Sint8 dcount;
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	1502 Uint8 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	1503
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	1504 if (!dm_fread_byte(fp, (Uint8 *) &dcount))
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	1505 return FALSE;
1102 e06abfde6c39 Cosmetics pass: Remove excess whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	1506
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	1507 if (dcount == -128)
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	1508 {
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	1509 if (!dm_fread_byte(fp, &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	1510 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	1511 }
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	1512 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	1513 if (dcount < 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	1514 {
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	1515 int count = (-dcount) + 1;
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	1516 if (!dm_fread_byte(fp, &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	1517 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	1518
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	1519 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	1520 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	1521 }
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	1522 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	1523 {
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	1524 int count = dcount + 1;
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	1525 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	1526 {
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	1527 if (!dm_fread_byte(fp, &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	1528 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	1529
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	1530 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	1531 }
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	1532 }
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	1533 } 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	1534
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	1535 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	1536 }
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	1537
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	1538
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	1539 static BOOL dmIFFReadOneRow(FILE fp, DMIFF iff, Uint8 *buf, const size_t 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	1540 {
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	1541 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	1542 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	1543 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	1544 return dm_fread_str(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	1545 }
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	1546
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	1547
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	1548 void dmDecodeBitPlane(Uint8 dp, Uint8 src, const int width, const int nplane)
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	1549 {
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	1550 int xc;
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	1551 for (xc = 0; xc < width; xc++)
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	1552 {
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	1553 const Uint8 data = (src[xc / 8] >> (7 - (xc & 7))) & 1;
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	1554 dp[xc] \|= (data << nplane);
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	1555 }
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	1556 }
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	1557
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	1558
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	1559 int dmDecodeILBMBody(FILE fp, DMIFF iff, DMImage *pimg, Uint32 read)
444 7d588807f91d Clean up the IFF parser a bit. Matti Hamalainen <ccr@tnsp.org> parents: 443 diff changeset	1560 {
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	1561 DMImage *img;
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	1562 Uint8 *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	1563 size_t 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	1564 int yc, res = DMERR_OK;
1102 e06abfde6c39 Cosmetics pass: Remove excess whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	1565
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	1566 *read = 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	1567
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	1568 // Allocate image
1286 b812fad6f33e Work on libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1285 diff changeset	1569 if ((*pimg = img = dmImageAlloc(iff->bmhd.w, iff->bmhd.h,
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	1570 iff->bmhd.nplanes <= 8 ? DM_IFMT_PALETTE : DM_IFMT_RGBA,
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	1571 // 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	1572 //iff->bmhd.nplanes <= 8 ? iff->bmhd.nplanes : -1
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	1573 -1
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	1574 )) == NULL)
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	1575 return DMERR_MALLOC;
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	1576
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	1577 // Allocate planar decoding buffer
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	1578 bufLen = ((img->width + 15) / 16) * 2;
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	1579 if ((buf = dmMalloc(bufLen)) == NULL)
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	1580 return DMERR_MALLOC;
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	1581
1287 32051ad352c8 Adjust debug messages and debug message levels in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1286 diff changeset	1582 dmMsg(2, "ILBM: plane row size %d bytes.\n", bufLen);
1102 e06abfde6c39 Cosmetics pass: Remove excess whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	1583
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	1584 // Decode the chunk
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	1585 for (yc = 0; yc < img->height; yc++)
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	1586 {
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	1587 int plane;
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	1588 const int nplanes = iff->bmhd.nplanes;
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	1589 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	1590
1167 848a88ce7a57 Use dmMemset(). Matti Hamalainen <ccr@tnsp.org> parents: 1152 diff changeset	1591 dmMemset(dp, 0, img->pitch);
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	1592
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	1593 for (plane = 0; plane < nplanes; plane++)
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	1594 {
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	1595 // Decompress or read 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	1596 if (!dmIFFReadOneRow(fp, iff, 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	1597 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1598 res = dmError(DMERR_FREAD,
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1599 "ILBM: Error in reading image plane #%d @ %d.\n",
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1600 plane, 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	1601 goto error;
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	1602 }
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	1603
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	1604 // Decode bitplane
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	1605 dmDecodeBitPlane(dp, buf, img->width, plane);
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	1606
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	1607 *read += 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	1608 }
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	1609
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	1610 // Read mask 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	1611 if (iff->bmhd.masking == IFF_MASK_HAS_MASK)
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 {
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	1613 int xc;
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	1614
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	1615 // Decompress or read 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	1616 if (!dmIFFReadOneRow(fp, iff, 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	1617 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1618 res = dmError(DMERR_FREAD,
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1619 "ILBM: Error in reading mask plane.\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	1620 goto error;
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	1621 }
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	1622
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	1623 // Decode mask
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	1624 for (xc = 0; xc < img->width; xc++)
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	1625 {
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	1626 const Uint8 data = (buf[xc / 8] >> (7 - (xc & 7))) & 1;
1102 e06abfde6c39 Cosmetics pass: Remove excess whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 958 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 // Black out any pixels with mask bit 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	1629 if (!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	1630 dp[xc] = 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	1631 }
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	1632
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	1633 *read += 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	1634 }
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	1635 }
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	1636
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	1637 error:
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	1638 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	1639 return res;
444 7d588807f91d Clean up the IFF parser a bit. Matti Hamalainen <ccr@tnsp.org> parents: 443 diff changeset	1640 }
7d588807f91d Clean up the IFF parser a bit. Matti Hamalainen <ccr@tnsp.org> parents: 443 diff changeset	1641
7d588807f91d Clean up the IFF parser a bit. Matti Hamalainen <ccr@tnsp.org> parents: 443 diff changeset	1642
464 358776103ceb Add support for IFF PBMs. Matti Hamalainen <ccr@tnsp.org> parents: 462 diff changeset	1643 int dmDecodePBMBody(FILE fp, DMIFF iff, DMImage *pimg, Uint32 read)
358776103ceb Add support for IFF PBMs. Matti Hamalainen <ccr@tnsp.org> parents: 462 diff changeset	1644 {
358776103ceb Add support for IFF PBMs. Matti Hamalainen <ccr@tnsp.org> parents: 462 diff changeset	1645 DMImage *img;
358776103ceb Add support for IFF PBMs. Matti Hamalainen <ccr@tnsp.org> parents: 462 diff changeset	1646 int yc, res = DMERR_OK;
358776103ceb Add support for IFF PBMs. Matti Hamalainen <ccr@tnsp.org> parents: 462 diff changeset	1647
358776103ceb Add support for IFF PBMs. Matti Hamalainen <ccr@tnsp.org> parents: 462 diff changeset	1648 *read = 0;
358776103ceb Add support for IFF PBMs. Matti Hamalainen <ccr@tnsp.org> parents: 462 diff changeset	1649
358776103ceb Add support for IFF PBMs. Matti Hamalainen <ccr@tnsp.org> parents: 462 diff changeset	1650 // Allocate image
1286 b812fad6f33e Work on libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1285 diff changeset	1651 if ((*pimg = img = dmImageAlloc(iff->bmhd.w, iff->bmhd.h,
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	1652 iff->bmhd.nplanes <= 8 ? DM_IFMT_PALETTE : DM_IFMT_RGBA,
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	1653 // 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	1654 //iff->bmhd.nplanes <= 8 ? iff->bmhd.nplanes : -1
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	1655 -1
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	1656 )) == NULL)
464 358776103ceb Add support for IFF PBMs. Matti Hamalainen <ccr@tnsp.org> parents: 462 diff changeset	1657 return DMERR_MALLOC;
358776103ceb Add support for IFF PBMs. Matti Hamalainen <ccr@tnsp.org> parents: 462 diff changeset	1658
358776103ceb Add support for IFF PBMs. Matti Hamalainen <ccr@tnsp.org> parents: 462 diff changeset	1659 // Decode the chunk
358776103ceb Add support for IFF PBMs. Matti Hamalainen <ccr@tnsp.org> parents: 462 diff changeset	1660 for (yc = 0; yc < img->height; yc++)
358776103ceb Add support for IFF PBMs. Matti Hamalainen <ccr@tnsp.org> parents: 462 diff changeset	1661 {
358776103ceb Add support for IFF PBMs. Matti Hamalainen <ccr@tnsp.org> parents: 462 diff changeset	1662 Uint8 dp = img->data + (yc img->pitch);
358776103ceb Add support for IFF PBMs. Matti Hamalainen <ccr@tnsp.org> parents: 462 diff changeset	1663
358776103ceb Add support for IFF PBMs. Matti Hamalainen <ccr@tnsp.org> parents: 462 diff changeset	1664 if (!dmIFFReadOneRow(fp, iff, dp, img->width))
358776103ceb Add support for IFF PBMs. Matti Hamalainen <ccr@tnsp.org> parents: 462 diff changeset	1665 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1666 res = dmError(DMERR_FREAD,
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1667 "ILBM: Error in reading image row #%d.\n", yc);
464 358776103ceb Add support for IFF PBMs. Matti Hamalainen <ccr@tnsp.org> parents: 462 diff changeset	1668 goto error;
358776103ceb Add support for IFF PBMs. Matti Hamalainen <ccr@tnsp.org> parents: 462 diff changeset	1669 }
358776103ceb Add support for IFF PBMs. Matti Hamalainen <ccr@tnsp.org> parents: 462 diff changeset	1670
358776103ceb Add support for IFF PBMs. Matti Hamalainen <ccr@tnsp.org> parents: 462 diff changeset	1671 *read += img->width;
358776103ceb Add support for IFF PBMs. Matti Hamalainen <ccr@tnsp.org> parents: 462 diff changeset	1672 }
358776103ceb Add support for IFF PBMs. Matti Hamalainen <ccr@tnsp.org> parents: 462 diff changeset	1673
358776103ceb Add support for IFF PBMs. Matti Hamalainen <ccr@tnsp.org> parents: 462 diff changeset	1674 error:
358776103ceb Add support for IFF PBMs. Matti Hamalainen <ccr@tnsp.org> parents: 462 diff changeset	1675 return res;
358776103ceb Add support for IFF PBMs. Matti Hamalainen <ccr@tnsp.org> parents: 462 diff changeset	1676 }
358776103ceb Add support for IFF PBMs. Matti Hamalainen <ccr@tnsp.org> parents: 462 diff changeset	1677
358776103ceb Add support for IFF PBMs. Matti Hamalainen <ccr@tnsp.org> parents: 462 diff changeset	1678
443 f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1679 int dmReadILBMImageFILE(FILE fp, DMImage *pimg)
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1680 {
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1681 Uint32 idILBM;
444 7d588807f91d Clean up the IFF parser a bit. Matti Hamalainen <ccr@tnsp.org> parents: 443 diff changeset	1682 DMIFFChunk chunk;
7d588807f91d Clean up the IFF parser a bit. Matti Hamalainen <ccr@tnsp.org> parents: 443 diff changeset	1683 DMIFF iff;
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	1684 Uint32 read;
444 7d588807f91d Clean up the IFF parser a bit. Matti Hamalainen <ccr@tnsp.org> parents: 443 diff changeset	1685 BOOL parsed = FALSE;
7d588807f91d Clean up the IFF parser a bit. Matti Hamalainen <ccr@tnsp.org> parents: 443 diff changeset	1686 int i, res = DMERR_OK;
443 f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1687
1167 848a88ce7a57 Use dmMemset(). Matti Hamalainen <ccr@tnsp.org> parents: 1152 diff changeset	1688 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	1689
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1690 // Read IFF FORM header
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1691 if (!dmReadIFFChunk(fp, &chunk) \|\|
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1692 chunk.id != IFF_ID_FORM \|\|
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1693 chunk.size < 32)
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1694 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1695 return dmError(DMERR_NOT_SUPPORTED,
1265 4e074b9b4789 Improve IFF FORM validity error message. Matti Hamalainen <ccr@tnsp.org> parents: 1264 diff changeset	1696 "ILBM: Not a IFF file (%08X vs %08X / %d).\n",
4e074b9b4789 Improve IFF FORM validity error message. Matti Hamalainen <ccr@tnsp.org> parents: 1264 diff changeset	1697 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	1698 }
1102 e06abfde6c39 Cosmetics pass: Remove excess whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	1699
443 f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1700 // Check IFF ILBM signature
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1701 if (!dm_fread_be32(fp, &idILBM) \|\|
464 358776103ceb Add support for IFF PBMs. Matti Hamalainen <ccr@tnsp.org> parents: 462 diff changeset	1702 (idILBM != IFF_ID_ILBM && idILBM != IFF_ID_PBM))
443 f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1703 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1704 return dmError(DMERR_INVALID_DATA,
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1705 "ILBM: Not a ILBM file.\n");
443 f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1706 }
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1707
464 358776103ceb Add support for IFF PBMs. Matti Hamalainen <ccr@tnsp.org> parents: 462 diff changeset	1708 iff.planar = (idILBM == IFF_ID_ILBM);
358776103ceb Add support for IFF PBMs. Matti Hamalainen <ccr@tnsp.org> parents: 462 diff changeset	1709
443 f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1710 while (!parsed && !feof(fp))
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1711 {
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1712 if (!dmReadIFFChunk(fp, &chunk))
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1713 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1714 return dmError(DMERR_FREAD,
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1715 "ILBM: Error reading IFF ILBM data.\n");
443 f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1716 }
1102 e06abfde6c39 Cosmetics pass: Remove excess whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	1717
443 f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1718 switch (chunk.id)
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1719 {
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1720 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	1721 // 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	1722 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	1723 return res;
443 f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1724
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	1725 // Read BMHD data
444 7d588807f91d Clean up the IFF parser a bit. Matti Hamalainen <ccr@tnsp.org> parents: 443 diff changeset	1726 if (!dm_fread_be16(fp, &iff.bmhd.w) \|\|
7d588807f91d Clean up the IFF parser a bit. Matti Hamalainen <ccr@tnsp.org> parents: 443 diff changeset	1727 !dm_fread_be16(fp, &iff.bmhd.h) \|\|
7d588807f91d Clean up the IFF parser a bit. Matti Hamalainen <ccr@tnsp.org> parents: 443 diff changeset	1728 !dm_fread_be16(fp, (Uint16 *) &iff.bmhd.x) \|\|
7d588807f91d Clean up the IFF parser a bit. Matti Hamalainen <ccr@tnsp.org> parents: 443 diff changeset	1729 !dm_fread_be16(fp, (Uint16 *) &iff.bmhd.y) \|\|
7d588807f91d Clean up the IFF parser a bit. Matti Hamalainen <ccr@tnsp.org> parents: 443 diff changeset	1730 !dm_fread_byte(fp, &iff.bmhd.nplanes) \|\|
7d588807f91d Clean up the IFF parser a bit. Matti Hamalainen <ccr@tnsp.org> parents: 443 diff changeset	1731 !dm_fread_byte(fp, &iff.bmhd.masking) \|\|
7d588807f91d Clean up the IFF parser a bit. Matti Hamalainen <ccr@tnsp.org> parents: 443 diff changeset	1732 !dm_fread_byte(fp, &iff.bmhd.compression) \|\|
7d588807f91d Clean up the IFF parser a bit. Matti Hamalainen <ccr@tnsp.org> parents: 443 diff changeset	1733 !dm_fread_byte(fp, &iff.bmhd.pad1) \|\|
7d588807f91d Clean up the IFF parser a bit. Matti Hamalainen <ccr@tnsp.org> parents: 443 diff changeset	1734 !dm_fread_be16(fp, &iff.bmhd.transp) \|\|
7d588807f91d Clean up the IFF parser a bit. Matti Hamalainen <ccr@tnsp.org> parents: 443 diff changeset	1735 !dm_fread_byte(fp, &iff.bmhd.xasp) \|\|
7d588807f91d Clean up the IFF parser a bit. Matti Hamalainen <ccr@tnsp.org> parents: 443 diff changeset	1736 !dm_fread_byte(fp, &iff.bmhd.yasp) \|\|
7d588807f91d Clean up the IFF parser a bit. Matti Hamalainen <ccr@tnsp.org> parents: 443 diff changeset	1737 !dm_fread_be16(fp, (Uint16 *) &iff.bmhd.pagew) \|\|
7d588807f91d Clean up the IFF parser a bit. Matti Hamalainen <ccr@tnsp.org> parents: 443 diff changeset	1738 !dm_fread_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	1739 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1740 return dmError(DMERR_FREAD,
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1741 "ILBM: 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	1742 }
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1743
1287 32051ad352c8 Adjust debug messages and debug message levels in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1286 diff changeset	1744 dmMsg(2, "ILBM: BMHD %d x %d @ %d, %d : nplanes=%d, comp=%d, mask=%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	1745 iff.bmhd.w, iff.bmhd.h, iff.bmhd.x, iff.bmhd.y,
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	1746 iff.bmhd.nplanes, iff.bmhd.compression, iff.bmhd.masking);
1102 e06abfde6c39 Cosmetics pass: Remove excess whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	1747
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	1748 // 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	1749 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	1750 (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	1751 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	1752 (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	1753 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	1754 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	1755 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1756 return dmError(DMERR_NOT_SUPPORTED,
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1757 "ILBM: 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	1758 }
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	1759
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1760 if ((res = dmSkipIFFChunkRest(fp, &chunk, sizeof(iff.bmhd))) != DMERR_OK)
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1761 return res;
443 f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1762 break;
444 7d588807f91d Clean up the IFF parser a bit. Matti Hamalainen <ccr@tnsp.org> parents: 443 diff changeset	1763
443 f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1764
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1765 case IFF_ID_CMAP:
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1766 // 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	1767 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	1768 return res;
443 f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1769
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1770 // Check for sanity
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1771 if (chunk.size % 3 != 0)
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1772 {
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1773 // Non-fatal
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1774 dmError(DMERR_INVALID_DATA,
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1775 "ILBM: CMAP chunk size not divisible by 3, possibly broken file.\n");
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1776 }
443 f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1777
444 7d588807f91d Clean up the IFF parser a bit. Matti Hamalainen <ccr@tnsp.org> parents: 443 diff changeset	1778 iff.ncolors = chunk.size / 3;
1287 32051ad352c8 Adjust debug messages and debug message levels in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1286 diff changeset	1779 dmMsg(2, "ILBM: CMAP %d entries (%d bytes)\n",
444 7d588807f91d Clean up the IFF parser a bit. Matti Hamalainen <ccr@tnsp.org> parents: 443 diff changeset	1780 iff.ncolors, chunk.size, 1 << iff.bmhd.nplanes);
443 f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1781
444 7d588807f91d Clean up the IFF parser a bit. Matti Hamalainen <ccr@tnsp.org> parents: 443 diff changeset	1782 if (iff.bmhd.nplanes > 0 && iff.ncolors != 1 << iff.bmhd.nplanes)
1287 32051ad352c8 Adjust debug messages and debug message levels in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1286 diff changeset	1783 dmMsg(2, "ILBM: 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	1784
451 fdc91f2a0d27 Modularize palette reading and handling code. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1785 // Read palette
fdc91f2a0d27 Modularize palette reading and handling code. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1786 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	1787 {
461 c7a3aacbd55e Implement transparent color in IFF ILBM reader and ctransp setting in PNG reader. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	1788 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	1789 (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	1790 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1791 return dmError(DMERR_MALLOC,
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1792 "ILBM: Could not allocate palette data.\n");
451 fdc91f2a0d27 Modularize palette reading and handling code. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1793 }
fdc91f2a0d27 Modularize palette reading and handling code. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1794 if (!dmReadPaletteData(fp, iff.pal, iff.ncolors))
fdc91f2a0d27 Modularize palette reading and handling code. Matti Hamalainen <ccr@tnsp.org> parents: 449 diff changeset	1795 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1796 return dmError(DMERR_FREAD,
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1797 "ILBM: 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	1798 }
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1799 }
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1800
444 7d588807f91d Clean up the IFF parser a bit. Matti Hamalainen <ccr@tnsp.org> parents: 443 diff changeset	1801 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	1802 parsed = TRUE;
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1803 break;
1102 e06abfde6c39 Cosmetics pass: Remove excess whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	1804
443 f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1805 case IFF_ID_BODY:
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	1806 // 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	1807 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	1808 return res;
443 f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1809
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	1810 // Check for sanity
444 7d588807f91d Clean up the IFF parser a bit. Matti Hamalainen <ccr@tnsp.org> parents: 443 diff changeset	1811 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	1812 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1813 return dmError(DMERR_INVALID_DATA,
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1814 "ILBM: BODY chunk before BMHD?\n");
443 f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1815 }
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1816
1287 32051ad352c8 Adjust debug messages and debug message levels in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1286 diff changeset	1817 dmMsg(2, "ILBM: BODY chunk size %d bytes\n", chunk.size);
1102 e06abfde6c39 Cosmetics pass: Remove excess whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	1818
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	1819 // Decode the body
464 358776103ceb Add support for IFF PBMs. Matti Hamalainen <ccr@tnsp.org> parents: 462 diff changeset	1820 if (iff.planar)
358776103ceb Add support for IFF PBMs. Matti Hamalainen <ccr@tnsp.org> parents: 462 diff changeset	1821 {
358776103ceb Add support for IFF PBMs. Matti Hamalainen <ccr@tnsp.org> parents: 462 diff changeset	1822 if ((res = dmDecodeILBMBody(fp, &iff, pimg, &read)) != DMERR_OK)
358776103ceb Add support for IFF PBMs. Matti Hamalainen <ccr@tnsp.org> parents: 462 diff changeset	1823 return res;
358776103ceb Add support for IFF PBMs. Matti Hamalainen <ccr@tnsp.org> parents: 462 diff changeset	1824 }
358776103ceb Add support for IFF PBMs. Matti Hamalainen <ccr@tnsp.org> parents: 462 diff changeset	1825 else
358776103ceb Add support for IFF PBMs. Matti Hamalainen <ccr@tnsp.org> parents: 462 diff changeset	1826 {
358776103ceb Add support for IFF PBMs. Matti Hamalainen <ccr@tnsp.org> parents: 462 diff changeset	1827 if ((res = dmDecodePBMBody(fp, &iff, pimg, &read)) != DMERR_OK)
358776103ceb Add support for IFF PBMs. Matti Hamalainen <ccr@tnsp.org> parents: 462 diff changeset	1828 return res;
358776103ceb Add support for IFF PBMs. Matti Hamalainen <ccr@tnsp.org> parents: 462 diff changeset	1829 }
444 7d588807f91d Clean up the IFF parser a bit. Matti Hamalainen <ccr@tnsp.org> parents: 443 diff changeset	1830
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1831 if ((res = dmSkipIFFChunkRest(fp, &chunk, read)) != DMERR_OK)
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1832 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	1833
444 7d588807f91d Clean up the IFF parser a bit. Matti Hamalainen <ccr@tnsp.org> parents: 443 diff changeset	1834 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	1835 parsed = TRUE;
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1836 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	1837
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	1838
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	1839 case IFF_ID_CAMG:
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	1840 if (!dm_fread_be32(fp, &iff.camg))
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	1841 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1842 return dmError(DMERR_FREAD,
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1843 "ILBM: 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	1844 }
1102 e06abfde6c39 Cosmetics pass: Remove excess whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	1845
1287 32051ad352c8 Adjust debug messages and debug message levels in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1286 diff changeset	1846 dmMsg(2, "ILBM: 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	1847
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	1848 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	1849 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1850 return dmError(DMERR_NOT_SUPPORTED,
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1851 "ILBM: 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	1852 }
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	1853
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1854 if ((res = dmSkipIFFChunkRest(fp, &chunk, sizeof(Uint32))) != DMERR_OK)
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1855 return res;
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	1856 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	1857
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1858
443 f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1859 default:
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1860 {
465 ffd5e730d313 Adjust verbosity levels. Matti Hamalainen <ccr@tnsp.org> parents: 464 diff changeset	1861 dmMsg(4, "Unknown chunk ID '%s', size %d\n",
445 1d65efb29986 Simplify. Matti Hamalainen <ccr@tnsp.org> parents: 444 diff changeset	1862 dmGetIFFChunkID(&chunk), chunk.size);
1102 e06abfde6c39 Cosmetics pass: Remove excess whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	1863
443 f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1864 if (fseeko(fp, chunk.size, SEEK_CUR) != 0)
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1865 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1866 return dmError(DMERR_FSEEK,
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1867 "ILBM: 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	1868 }
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1869 }
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1870 break;
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1871 }
1102 e06abfde6c39 Cosmetics pass: Remove excess whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	1872
443 f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1873 if (chunk.size & 1)
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1874 fgetc(fp);
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1875 }
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1876
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	1877 // Set colormap after finishing
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	1878 if (iff.pal != NULL && iff.ncolors > 0 && *pimg != NULL)
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 {
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	1880 // 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	1881 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	1882 {
834 9623b9b548d4 Reallocation fixes. Matti Hamalainen <ccr@tnsp.org> parents: 812 diff changeset	1883 void *ptmp;
9623b9b548d4 Reallocation fixes. Matti Hamalainen <ccr@tnsp.org> parents: 812 diff changeset	1884
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	1885 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	1886 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1887 return dmError(DMERR_NOT_SUPPORTED,
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1888 "ILBM: 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	1889 }
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	1890
834 9623b9b548d4 Reallocation fixes. Matti Hamalainen <ccr@tnsp.org> parents: 812 diff changeset	1891 if ((ptmp = dmRealloc(iff.pal, sizeof(DMColor) * iff.ncolors * 2)) == NULL)
9623b9b548d4 Reallocation fixes. Matti Hamalainen <ccr@tnsp.org> parents: 812 diff changeset	1892 {
9623b9b548d4 Reallocation fixes. Matti Hamalainen <ccr@tnsp.org> parents: 812 diff changeset	1893 dmFree(iff.pal);
9623b9b548d4 Reallocation fixes. Matti Hamalainen <ccr@tnsp.org> parents: 812 diff changeset	1894 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	1895 return DMERR_MALLOC;
834 9623b9b548d4 Reallocation fixes. Matti Hamalainen <ccr@tnsp.org> parents: 812 diff changeset	1896 }
9623b9b548d4 Reallocation fixes. Matti Hamalainen <ccr@tnsp.org> parents: 812 diff changeset	1897 else
9623b9b548d4 Reallocation fixes. Matti Hamalainen <ccr@tnsp.org> parents: 812 diff changeset	1898 iff.pal = ptmp;
1102 e06abfde6c39 Cosmetics pass: Remove excess whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	1899
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	1900 for (i = 0; i < 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	1901 {
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	1902 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	1903 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	1904 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	1905 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	1906 }
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	1907 }
1102 e06abfde6c39 Cosmetics pass: Remove excess whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	1908
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	1909 (*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	1910 (*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	1911 }
0e27860ddcfe Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working. Matti Hamalainen <ccr@tnsp.org> parents: 445 diff changeset	1912
443 f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1913 return res;
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1914 }
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1915
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1916
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1917 int dmReadILBMImage(const char filename, DMImage *pimg)
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1918 {
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1919 FILE *fp;
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1920 int res;
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1921
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1922 if ((fp = fopen(filename, "rb")) == NULL)
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1923 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1924 return dmError(DMERR_FOPEN,
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1925 "ILBM: Could not open file '%s' for reading.\n",
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 930 diff changeset	1926 filename);
443 f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1927 }
1102 e06abfde6c39 Cosmetics pass: Remove excess whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	1928
443 f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1929 res = dmReadILBMImageFILE(fp, pimg);
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 fclose(fp);
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1932 return res;
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1933 }
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1934
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1935
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1936
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1937
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1938 static int fmtProbePNG(const Uint8 *buf, const size_t len)
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1939 {
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1940 if (len > 64 && buf[0] == 0x89 &&
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1941 buf[1] == 'P' && buf[2] == 'N' && buf[3] == 'G' &&
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1942 buf[4] == 0x0d && buf[5] == 0x0a)
443 f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1943 {
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1944 if (buf[12] == 'I' && buf[13] == 'H' &&
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1945 buf[14] == 'D' && buf[15] == 'R')
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1946 return DM_PROBE_SCORE_MAX;
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1947 else
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1948 return DM_PROBE_SCORE_GOOD;
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1949 }
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1950
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1951 return DM_PROBE_SCORE_FALSE;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1952 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1953
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1954
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1955 static int fmtProbePCX(const Uint8 *buf, const size_t len)
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1956 {
443 f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1957 if (len > 128 + 32 &&
1288 6c8b19d1d196 More work on libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1287 diff changeset	1958
443 f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1959 (buf[1] == 5 \|\| buf[1] == 2 \|\| buf[1] == 3) &&
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1960 buf[2] == 1 &&
443 f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1961 (buf[3] == 8 \|\| buf[3] == 4 \|\| buf[3] == 3 \|\| buf[3] == 1) &&
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1962 buf[65] >= 1 && buf[65] <= 4)
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1963 return DM_PROBE_SCORE_GOOD;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1964
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1965 return DM_PROBE_SCORE_FALSE;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1966 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1967
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1968
443 f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1969 static int fmtProbeILBM(const Uint8 *buf, const size_t len)
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1970 {
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1971 if (len > 32 &&
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1972 buf[ 0] == 'F' && buf[ 1] == 'O' &&
464 358776103ceb Add support for IFF PBMs. Matti Hamalainen <ccr@tnsp.org> parents: 462 diff changeset	1973 buf[ 2] == 'R' && buf[ 3] == 'M' && (
358776103ceb Add support for IFF PBMs. Matti Hamalainen <ccr@tnsp.org> parents: 462 diff changeset	1974 (buf[ 8] == 'I' && buf[ 9] == 'L' && buf[10] == 'B' && buf[11] == 'M') \|\|
358776103ceb Add support for IFF PBMs. Matti Hamalainen <ccr@tnsp.org> parents: 462 diff changeset	1975 (buf[ 8] == 'P' && buf[ 9] == 'B' && buf[10] == 'M' && buf[11] == 0x20)
358776103ceb Add support for IFF PBMs. Matti Hamalainen <ccr@tnsp.org> parents: 462 diff changeset	1976 ))
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 if (buf[12] == 'B' && buf[13] == 'M' &&
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1979 buf[14] == 'H' && buf[15] == 'D')
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1980 return DM_PROBE_SCORE_MAX;
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1981 else
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1982 return DM_PROBE_SCORE_GOOD;
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1983 }
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1984
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1985 return DM_PROBE_SCORE_FALSE;
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1986 }
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1987
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	1988
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1989 DMImageFormat dmImageFormatList[IMGFMT_LAST] =
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1990 {
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1991 {
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1992 "PNG", "Portable Network Graphics",
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1993 fmtProbePNG,
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1994 #ifdef DM_USE_LIBPNG
453 349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	1995 dmReadPNGImage, dmReadPNGImageFILE,
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1996 dmWritePNGImage, dmWritePNGImageFILE,
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1997 #else
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1998 NULL, NULL,
453 349a2ff11531 Implement PNG (1-8bpp indexed) reading support via libPNG. Matti Hamalainen <ccr@tnsp.org> parents: 452 diff changeset	1999 NULL, NULL,
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2000 #endif
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2001 },
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2002 {
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2003 "PPM", "Portable PixMap",
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2004 NULL,
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2005 NULL, NULL,
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2006 dmWritePPMImage, dmWritePPMImageFILE,
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2007 },
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2008 {
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2009 "PCX", "Z-Soft Paintbrush",
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2010 fmtProbePCX,
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2011 dmReadPCXImage, dmReadPCXImageFILE,
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2012 dmWritePCXImage, dmWritePCXImageFILE,
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2013 },
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2014 {
443 f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	2015 "ILBM", "IFF ILBM",
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	2016 fmtProbeILBM,
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	2017 dmReadILBMImage, dmReadILBMImageFILE,
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	2018 NULL, NULL,
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	2019 },
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 442 diff changeset	2020 {
1291 2c4acbc3e7bf More work on libgfx etc. Matti Hamalainen <ccr@tnsp.org> parents: 1290 diff changeset	2021 "RAW", "Plain bitplaned (planar or non-planar) RAW",
566 d400e32b62d9 Add a slightly different raw output format. Matti Hamalainen <ccr@tnsp.org> parents: 487 diff changeset	2022 NULL,
d400e32b62d9 Add a slightly different raw output format. Matti Hamalainen <ccr@tnsp.org> parents: 487 diff changeset	2023 NULL, NULL,
d400e32b62d9 Add a slightly different raw output format. Matti Hamalainen <ccr@tnsp.org> parents: 487 diff changeset	2024 dmWriteRAWImage, dmWriteRAWImageFILE,
d400e32b62d9 Add a slightly different raw output format. Matti Hamalainen <ccr@tnsp.org> parents: 487 diff changeset	2025 },
d400e32b62d9 Add a slightly different raw output format. Matti Hamalainen <ccr@tnsp.org> parents: 487 diff changeset	2026 {
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2027 "ARAW", "IFFMaster Amiga RAW",
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2028 NULL,
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2029 NULL, NULL,
566 d400e32b62d9 Add a slightly different raw output format. Matti Hamalainen <ccr@tnsp.org> parents: 487 diff changeset	2030 dmWriteRAWImage, dmWriteRAWImageFILE,
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2031 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2032 };
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2033
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2034
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2035 int dmImageProbeGeneric(const Uint8 buf, const size_t len, DMImageFormat pfmt, int index)
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2036 {
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2037 int i, scoreMax = DM_PROBE_SCORE_FALSE, scoreIndex = -1;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2038
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2039 for (i = 0; i < IMGFMT_LAST; i++)
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2040 {
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2041 DMImageFormat *fmt = &dmImageFormatList[i];
442 a67600e186d0 Fix probing to handle NULL probe functions. Matti Hamalainen <ccr@tnsp.org> parents: 440 diff changeset	2042 if (fmt->probe != NULL)
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2043 {
442 a67600e186d0 Fix probing to handle NULL probe functions. Matti Hamalainen <ccr@tnsp.org> parents: 440 diff changeset	2044 int score = fmt->probe(buf, len);
a67600e186d0 Fix probing to handle NULL probe functions. Matti Hamalainen <ccr@tnsp.org> parents: 440 diff changeset	2045 if (score > scoreMax)
a67600e186d0 Fix probing to handle NULL probe functions. Matti Hamalainen <ccr@tnsp.org> parents: 440 diff changeset	2046 {
a67600e186d0 Fix probing to handle NULL probe functions. Matti Hamalainen <ccr@tnsp.org> parents: 440 diff changeset	2047 scoreMax = score;
a67600e186d0 Fix probing to handle NULL probe functions. Matti Hamalainen <ccr@tnsp.org> parents: 440 diff changeset	2048 scoreIndex = i;
a67600e186d0 Fix probing to handle NULL probe functions. Matti Hamalainen <ccr@tnsp.org> parents: 440 diff changeset	2049 }
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2050 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2051 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2052
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2053 if (scoreIndex >= 0)
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2054 {
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2055 *pfmt = &dmImageFormatList[scoreIndex];
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2056 *index = scoreIndex;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2057 return scoreMax;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2058 }
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2059 else
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2060 return DM_PROBE_SCORE_FALSE;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2061 }

Mercurial > hg > dmlib

annotate tools/libgfx.c @ 1339:65f8fd1bf76e