dmlib: tools/libgfx.c annotate

annotate tools/libgfx.c @ 1309:5ad7d780a09b

Move bitstream reading functions to libgfx, as they were only used there.

author	Matti Hamalainen <ccr@tnsp.org>
date	Sat, 19 Aug 2017 15:27:43 +0300
parents	8f71ca1900ea
children	65f8fd1bf76e

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

Mercurial > hg > dmlib

annotate tools/libgfx.c @ 1309:5ad7d780a09b