dmlib: libgfx.c comparison

comparison libgfx.c @ 464:358776103ceb

Add support for IFF PBMs.

author	Matti Hamalainen <ccr@tnsp.org>
date	Sun, 04 Nov 2012 16:36:21 +0200
parents	ab401a5087f9
children	ffd5e730d313

comparison

equal deleted inserted replaced

-:4204e9ea8ae1
+:358776103ceb
 }
 #define IFF_ID_FORM        0x464F524D // "FORM"
 #define IFF_ID_ILBM        0x494C424D // "ILBM"
+#define IFF_ID_PBM         0x50424D20 // "PBM "
 #define IFF_ID_BMHD        0x424D4844 // "BMHD"
 #define IFF_ID_CMAP        0x434D4150 // "CMAP"
 #define IFF_ID_BODY        0x424F4459 // "BODY"
 #define IFF_ID_CAMG        0x43414D47 // "CAMG"
 DMIFFChunk chBMHD, chCMAP, chBODY;
 DMIFFBMHD bmhd;
 Uint32 camg;
 int ncolors;
 DMColor *pal;
-BOOL paletted;
+BOOL paletted, planar;
 } DMIFF;
 static BOOL dmReadIFFChunk(FILE *fp, DMIFFChunk *chunk)
 {
 for (plane = 0; plane < nplanes; plane++)
 {
 // Decompress or read data
 if (!dmIFFReadOneRow(fp, iff, buf, bufLen))
 {
-dmError("ILBM: Error in reading image plane #%d.\n", plane);
+dmError("ILBM: Error in reading image plane #%d @ %d.\n", plane, yc);
 res = DMERR_FREAD;
 goto error;
 }
 // Decode bitplane
 }
 }
 error:
 dmFree(buf);
+return res;
+}
+int dmDecodePBMBody(FILE *fp, DMIFF *iff, DMImage **pimg, Uint32 *read)
+{
+DMImage *img;
+int yc, res = DMERR_OK;
+*read = 0;
+// Allocate image
+if ((*pimg = img = dmImageAlloc(iff->bmhd.w, iff->bmhd.h)) == NULL)
+return DMERR_MALLOC;
+// Decode the chunk
+for (yc = 0; yc < img->height; yc++)
+{
+Uint8 *dp = img->data + (yc * img->pitch);
+if (!dmIFFReadOneRow(fp, iff, dp, img->width))
+{
+dmError("ILBM: Error in reading image row #%d.\n", yc);
+res = DMERR_FREAD;
+goto error;
+}
+*read += img->width;
+}
+error:
 return res;
 }
 int dmReadILBMImageFILE(FILE *fp, DMImage **pimg)
 return DMERR_FREAD;
 }
 // Check IFF ILBM signature
 if (!dm_fread_be32(fp, &idILBM) ||
-idILBM != IFF_ID_ILBM)
+(idILBM != IFF_ID_ILBM && idILBM != IFF_ID_PBM))
 {
 dmError("ILBM: Not a ILBM file.\n");
 return DMERR_INVALID_DATA;
 }
+iff.planar = (idILBM == IFF_ID_ILBM);
 while (!parsed && !feof(fp))
 {
 if (!dmReadIFFChunk(fp, &chunk))
 {
 }
 dmMsg(2, "ILBM: BODY chunk size %d bytes\n", chunk.size);
 // Decode the body
-if ((res = dmDecodeILBMBody(fp, &iff, pimg, &read)) != DMERR_OK)
+if (iff.planar)
-return res;
+{
+if ((res = dmDecodeILBMBody(fp, &iff, pimg, &read)) != DMERR_OK)
+return res;
+}
+else
+{
+if ((res = dmDecodePBMBody(fp, &iff, pimg, &read)) != DMERR_OK)
+return res;
+}
 if (!dmSkipIFFChunkRest(fp, &chunk, read))
 return DMERR_FREAD;
 if (iff.chCMAP.count)
 static int fmtProbeILBM(const Uint8 *buf, const size_t len)
 {
 if (len > 32 &&
 buf[ 0] == 'F' && buf[ 1] == 'O' &&
-buf[ 2] == 'R' && buf[ 3] == 'M' &&
+buf[ 2] == 'R' && buf[ 3] == 'M' && (
-buf[ 8] == 'I' && buf[ 9] == 'L' &&
+(buf[ 8] == 'I' && buf[ 9] == 'L' && buf[10] == 'B' && buf[11] == 'M') ||
-buf[10] == 'B' && buf[11] == 'M')
+(buf[ 8] == 'P' && buf[ 9] == 'B' && buf[10] == 'M' && buf[11] == 0x20)
+))
 {
 if (buf[12] == 'B' && buf[13] == 'M' &&
 buf[14] == 'H' && buf[15] == 'D')
 return DM_PROBE_SCORE_MAX;
 else

Mercurial > hg > dmlib

comparison libgfx.c @ 464:358776103ceb