Mercurial > hg > dmlib
annotate src/libgfx.c @ 834:9623b9b548d4
Reallocation fixes.
| author | Matti Hamalainen <ccr@tnsp.org> |
|---|---|
| date | Fri, 11 Jul 2014 18:06:30 +0300 |
| parents | 1e5cf1144f36 |
| children | e7019bd83cca |
| rev | line source |
|---|---|
| 435 | 1 /* |
| 2 * Functions for reading and converting various restricted | |
| 3 * C64/etc and/or indexed/paletted graphics formats. | |
| 4 * Programmed and designed by Matti 'ccr' Hamalainen | |
| 5 * (C) Copyright 2012 Tecnic Software productions (TNSP) | |
| 6 * | |
| 7 * Please read file 'COPYING' for information on license and distribution. | |
| 8 */ | |
| 9 #include "libgfx.h" | |
| 10 #include "dmfile.h" | |
| 11 #include "dmbstr.h" | |
| 12 | |
| 13 #ifdef DM_USE_LIBPNG | |
| 14 #include <png.h> | |
| 15 #endif | |
| 16 | |
| 17 | |
|
487
b89598501cec
Move dmCompareColor() to libgfx.
Matti Hamalainen <ccr@tnsp.org>
parents:
472
diff
changeset
|
18 BOOL dmCompareColor(const DMColor *c1, const DMColor *c2, BOOL alpha) |
|
b89598501cec
Move dmCompareColor() to libgfx.
Matti Hamalainen <ccr@tnsp.org>
parents:
472
diff
changeset
|
19 { |
|
b89598501cec
Move dmCompareColor() to libgfx.
Matti Hamalainen <ccr@tnsp.org>
parents:
472
diff
changeset
|
20 if (c1->r == c2->r && |
|
b89598501cec
Move dmCompareColor() to libgfx.
Matti Hamalainen <ccr@tnsp.org>
parents:
472
diff
changeset
|
21 c1->g == c2->g && |
|
b89598501cec
Move dmCompareColor() to libgfx.
Matti Hamalainen <ccr@tnsp.org>
parents:
472
diff
changeset
|
22 c1->b == c2->b) |
|
b89598501cec
Move dmCompareColor() to libgfx.
Matti Hamalainen <ccr@tnsp.org>
parents:
472
diff
changeset
|
23 return alpha ? (c1->a == c2->a) : TRUE; |
|
b89598501cec
Move dmCompareColor() to libgfx.
Matti Hamalainen <ccr@tnsp.org>
parents:
472
diff
changeset
|
24 else |
|
b89598501cec
Move dmCompareColor() to libgfx.
Matti Hamalainen <ccr@tnsp.org>
parents:
472
diff
changeset
|
25 return FALSE; |
|
b89598501cec
Move dmCompareColor() to libgfx.
Matti Hamalainen <ccr@tnsp.org>
parents:
472
diff
changeset
|
26 } |
|
b89598501cec
Move dmCompareColor() to libgfx.
Matti Hamalainen <ccr@tnsp.org>
parents:
472
diff
changeset
|
27 |
|
b89598501cec
Move dmCompareColor() to libgfx.
Matti Hamalainen <ccr@tnsp.org>
parents:
472
diff
changeset
|
28 |
| 435 | 29 DMImage * dmImageAlloc(int width, int height) |
| 30 { | |
| 31 DMImage *img = dmCalloc(1, sizeof(DMImage)); | |
| 32 if (img == NULL) | |
| 33 return NULL; | |
| 34 | |
| 35 img->width = img->pitch = width; | |
| 36 img->height = height; | |
| 37 img->data = dmMalloc(width * height * sizeof(Uint8)); | |
| 38 if (img->data == NULL) | |
| 39 { | |
| 40 dmFree(img); | |
| 41 return NULL; | |
| 42 } | |
| 43 | |
| 44 return img; | |
| 45 } | |
| 46 | |
| 47 | |
| 48 void dmImageFree(DMImage *img) | |
| 49 { | |
| 50 if (img != NULL) | |
| 51 { | |
| 52 if (!img->constpal) | |
| 53 { | |
| 54 dmFree(img->pal); | |
| 55 } | |
| 56 dmFree(img->data); | |
| 57 dmFree(img); | |
| 58 } | |
| 59 } | |
| 60 | |
| 61 | |
|
460
0af039b6c0ae
Improve transparent color handling.
Matti Hamalainen <ccr@tnsp.org>
parents:
453
diff
changeset
|
62 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
|
63 { |
|
460
0af039b6c0ae
Improve transparent color handling.
Matti Hamalainen <ccr@tnsp.org>
parents:
453
diff
changeset
|
64 int i; |
|
0af039b6c0ae
Improve transparent color handling.
Matti Hamalainen <ccr@tnsp.org>
parents:
453
diff
changeset
|
65 |
|
451
fdc91f2a0d27
Modularize palette reading and handling code.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
66 if (ppal == NULL) |
|
fdc91f2a0d27
Modularize palette reading and handling code.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
67 return FALSE; |
|
fdc91f2a0d27
Modularize palette reading and handling code.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
68 |
|
460
0af039b6c0ae
Improve transparent color handling.
Matti Hamalainen <ccr@tnsp.org>
parents:
453
diff
changeset
|
69 // Allocate desired amount of palette |
|
0af039b6c0ae
Improve transparent color handling.
Matti Hamalainen <ccr@tnsp.org>
parents:
453
diff
changeset
|
70 if ((*ppal = dmCalloc(ncolors, sizeof(DMColor))) == NULL) |
|
0af039b6c0ae
Improve transparent color handling.
Matti Hamalainen <ccr@tnsp.org>
parents:
453
diff
changeset
|
71 return FALSE; |
|
0af039b6c0ae
Improve transparent color handling.
Matti Hamalainen <ccr@tnsp.org>
parents:
453
diff
changeset
|
72 |
|
0af039b6c0ae
Improve transparent color handling.
Matti Hamalainen <ccr@tnsp.org>
parents:
453
diff
changeset
|
73 // Set alpha values to max, except for transparent color |
|
0af039b6c0ae
Improve transparent color handling.
Matti Hamalainen <ccr@tnsp.org>
parents:
453
diff
changeset
|
74 for (i = 0; i < ncolors; i++) |
|
0af039b6c0ae
Improve transparent color handling.
Matti Hamalainen <ccr@tnsp.org>
parents:
453
diff
changeset
|
75 { |
|
0af039b6c0ae
Improve transparent color handling.
Matti Hamalainen <ccr@tnsp.org>
parents:
453
diff
changeset
|
76 (*ppal)[i].a = (i == ctransp) ? 0 : 255; |
|
0af039b6c0ae
Improve transparent color handling.
Matti Hamalainen <ccr@tnsp.org>
parents:
453
diff
changeset
|
77 } |
|
0af039b6c0ae
Improve transparent color handling.
Matti Hamalainen <ccr@tnsp.org>
parents:
453
diff
changeset
|
78 |
|
0af039b6c0ae
Improve transparent color handling.
Matti Hamalainen <ccr@tnsp.org>
parents:
453
diff
changeset
|
79 return TRUE; |
|
451
fdc91f2a0d27
Modularize palette reading and handling code.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
80 } |
|
fdc91f2a0d27
Modularize palette reading and handling code.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
81 |
|
fdc91f2a0d27
Modularize palette reading and handling code.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
82 |
|
460
0af039b6c0ae
Improve transparent color handling.
Matti Hamalainen <ccr@tnsp.org>
parents:
453
diff
changeset
|
83 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
|
84 { |
|
fdc91f2a0d27
Modularize palette reading and handling code.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
85 if (img == NULL) |
|
fdc91f2a0d27
Modularize palette reading and handling code.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
86 return FALSE; |
|
fdc91f2a0d27
Modularize palette reading and handling code.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
87 |
|
fdc91f2a0d27
Modularize palette reading and handling code.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
88 img->ncolors = ncolors; |
|
460
0af039b6c0ae
Improve transparent color handling.
Matti Hamalainen <ccr@tnsp.org>
parents:
453
diff
changeset
|
89 img->ctransp = ctransp; |
|
0af039b6c0ae
Improve transparent color handling.
Matti Hamalainen <ccr@tnsp.org>
parents:
453
diff
changeset
|
90 return dmPaletteAlloc(&(img->pal), ncolors, ctransp); |
|
451
fdc91f2a0d27
Modularize palette reading and handling code.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
91 } |
|
fdc91f2a0d27
Modularize palette reading and handling code.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
92 |
|
fdc91f2a0d27
Modularize palette reading and handling code.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
93 |
| 435 | 94 int dmImageGetBytesPerPixel(int format) |
| 95 { | |
| 96 switch (format) | |
| 97 { | |
| 98 case DM_IFMT_PALETTE : return 1; | |
| 99 | |
| 100 case DM_IFMT_RGB_PLANE : | |
| 101 case DM_IFMT_RGB : return 3; | |
| 102 | |
| 103 case DM_IFMT_RGBA : return 4; | |
| 104 | |
| 105 default: return 0; | |
| 106 } | |
| 107 } | |
| 108 | |
| 109 | |
|
451
fdc91f2a0d27
Modularize palette reading and handling code.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
110 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
|
111 { |
|
fdc91f2a0d27
Modularize palette reading and handling code.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
112 int i; |
|
fdc91f2a0d27
Modularize palette reading and handling code.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
113 |
|
fdc91f2a0d27
Modularize palette reading and handling code.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
114 for (i = 0; i < ncolors; i++) |
|
fdc91f2a0d27
Modularize palette reading and handling code.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
115 { |
|
fdc91f2a0d27
Modularize palette reading and handling code.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
116 Uint8 colR, colG, colB; |
|
fdc91f2a0d27
Modularize palette reading and handling code.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
117 if (!dm_fread_byte(fp, &colR) || |
|
fdc91f2a0d27
Modularize palette reading and handling code.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
118 !dm_fread_byte(fp, &colG) || |
|
fdc91f2a0d27
Modularize palette reading and handling code.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
119 !dm_fread_byte(fp, &colB)) |
|
fdc91f2a0d27
Modularize palette reading and handling code.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
120 return FALSE; |
|
fdc91f2a0d27
Modularize palette reading and handling code.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
121 |
|
fdc91f2a0d27
Modularize palette reading and handling code.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
122 pal[i].r = colR; |
|
fdc91f2a0d27
Modularize palette reading and handling code.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
123 pal[i].g = colG; |
|
fdc91f2a0d27
Modularize palette reading and handling code.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
124 pal[i].b = colB; |
|
fdc91f2a0d27
Modularize palette reading and handling code.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
125 } |
|
fdc91f2a0d27
Modularize palette reading and handling code.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
126 |
|
fdc91f2a0d27
Modularize palette reading and handling code.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
127 return TRUE; |
|
fdc91f2a0d27
Modularize palette reading and handling code.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
128 } |
|
fdc91f2a0d27
Modularize palette reading and handling code.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
129 |
|
fdc91f2a0d27
Modularize palette reading and handling code.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
130 |
|
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
|
131 int dmWriteImageData(DMImage *img, void *cbdata, int (*writeRowCB)(void *, Uint8 *, size_t), const DMImageSpec *spec) |
| 435 | 132 { |
| 133 int x, y, yscale, xscale, res = 0, rowSize, rowWidth; | |
| 134 Uint8 *row = NULL; | |
| 135 | |
| 136 // Allocate memory for row buffer | |
| 137 rowWidth = img->width * spec->scale; | |
| 138 rowSize = rowWidth * dmImageGetBytesPerPixel(spec->format); | |
| 139 | |
| 140 if ((row = dmMalloc(rowSize + 16)) == NULL) | |
| 141 { | |
| 142 res = DMERR_MALLOC; | |
| 143 goto done; | |
| 144 } | |
| 145 | |
| 146 // Generate the image | |
| 147 for (y = 0; y < img->height; y++) | |
| 148 { | |
|
436
86f956e4580f
Cosmetics, rename a variable.
Matti Hamalainen <ccr@tnsp.org>
parents:
435
diff
changeset
|
149 Uint8 *ptr1 = row, |
| 435 | 150 *ptr2 = ptr1 + rowWidth, |
| 151 *ptr3 = ptr2 + rowWidth; | |
| 152 | |
| 153 for (x = 0; x < img->width; x++) | |
| 154 { | |
| 155 Uint8 c = img->data[(y * img->pitch) + x], qr, qg, qb, qa; | |
| 156 switch (spec->format) | |
| 157 { | |
| 158 case DM_IFMT_PALETTE: | |
| 159 for (xscale = 0; xscale < spec->scale; xscale++) | |
|
436
86f956e4580f
Cosmetics, rename a variable.
Matti Hamalainen <ccr@tnsp.org>
parents:
435
diff
changeset
|
160 *ptr1++ = c; |
| 435 | 161 break; |
| 162 | |
| 163 case DM_IFMT_RGBA: | |
| 164 qr = img->pal[c].r; | |
| 165 qg = img->pal[c].g; | |
| 166 qb = img->pal[c].b; | |
|
460
0af039b6c0ae
Improve transparent color handling.
Matti Hamalainen <ccr@tnsp.org>
parents:
453
diff
changeset
|
167 qa = img->pal[c].a; |
| 435 | 168 |
| 169 for (xscale = 0; xscale < spec->scale; xscale++) | |
| 170 { | |
|
436
86f956e4580f
Cosmetics, rename a variable.
Matti Hamalainen <ccr@tnsp.org>
parents:
435
diff
changeset
|
171 *ptr1++ = qr; |
|
86f956e4580f
Cosmetics, rename a variable.
Matti Hamalainen <ccr@tnsp.org>
parents:
435
diff
changeset
|
172 *ptr1++ = qg; |
|
86f956e4580f
Cosmetics, rename a variable.
Matti Hamalainen <ccr@tnsp.org>
parents:
435
diff
changeset
|
173 *ptr1++ = qb; |
|
86f956e4580f
Cosmetics, rename a variable.
Matti Hamalainen <ccr@tnsp.org>
parents:
435
diff
changeset
|
174 *ptr1++ = qa; |
| 435 | 175 } |
| 176 break; | |
| 177 | |
| 178 case DM_IFMT_RGB: | |
| 179 qr = img->pal[c].r; | |
| 180 qg = img->pal[c].g; | |
| 181 qb = img->pal[c].b; | |
| 182 | |
| 183 for (xscale = 0; xscale < spec->scale; xscale++) | |
| 184 { | |
|
436
86f956e4580f
Cosmetics, rename a variable.
Matti Hamalainen <ccr@tnsp.org>
parents:
435
diff
changeset
|
185 *ptr1++ = qr; |
|
86f956e4580f
Cosmetics, rename a variable.
Matti Hamalainen <ccr@tnsp.org>
parents:
435
diff
changeset
|
186 *ptr1++ = qg; |
|
86f956e4580f
Cosmetics, rename a variable.
Matti Hamalainen <ccr@tnsp.org>
parents:
435
diff
changeset
|
187 *ptr1++ = qb; |
| 435 | 188 } |
| 189 break; | |
| 190 | |
| 191 case DM_IFMT_RGB_PLANE: | |
| 192 qr = img->pal[c].r; | |
| 193 qg = img->pal[c].g; | |
| 194 qb = img->pal[c].b; | |
| 195 | |
| 196 for (xscale = 0; xscale < spec->scale; xscale++) | |
| 197 { | |
| 198 *ptr1++ = qr; | |
| 199 *ptr2++ = qg; | |
| 200 *ptr3++ = qb; | |
| 201 } | |
| 202 break; | |
| 203 } | |
| 204 } | |
| 205 | |
| 206 for (yscale = 0; yscale < spec->scale; yscale++) | |
| 207 { | |
|
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
|
208 if ((res = writeRowCB(cbdata, row, rowSize)) != DMERR_OK) |
| 435 | 209 goto done; |
| 210 } | |
| 211 } | |
| 212 | |
| 213 done: | |
| 214 dmFree(row); | |
| 215 return res; | |
| 216 } | |
| 217 | |
| 218 | |
| 219 #define DMCOL(x) (((x) >> 4) & 0xf) | |
| 220 | |
| 462 | 221 int dmWriteIFFMasterRAWPalette(FILE *fp, DMImage *img, int ncolors, |
| 222 const char *indent, const char *type) | |
| 435 | 223 { |
| 224 int i; | |
| 225 | |
| 226 for (i = 0; i < ncolors; i++) | |
| 227 { | |
| 228 int color; | |
| 229 if (i < img->ncolors) | |
| 230 { | |
| 231 color = (DMCOL(img->pal[i].r) << 8) | | |
| 232 (DMCOL(img->pal[i].g) << 4) | | |
| 233 (DMCOL(img->pal[i].b)); | |
| 234 } | |
| 235 else | |
| 236 color = 0; | |
| 237 | |
| 462 | 238 fprintf(fp, "%s%s $%04X\n", |
| 239 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
|
240 type != NULL ? type : "dc.w", |
| 462 | 241 color); |
| 435 | 242 } |
| 243 | |
| 462 | 244 return DMERR_OK; |
| 435 | 245 } |
| 246 | |
| 247 | |
|
566
d400e32b62d9
Add a slightly different raw output format.
Matti Hamalainen <ccr@tnsp.org>
parents:
487
diff
changeset
|
248 int dmWriteRAWImageFILE(FILE *fp, DMImage *img, DMImageSpec *spec) |
| 435 | 249 { |
| 250 int xc, yc, plane, res; | |
|
800
c63e24f9aa9a
Modularize bitstream reader.
Matti Hamalainen <ccr@tnsp.org>
parents:
566
diff
changeset
|
251 DMBitStreamContext bs; |
| 435 | 252 |
|
800
c63e24f9aa9a
Modularize bitstream reader.
Matti Hamalainen <ccr@tnsp.org>
parents:
566
diff
changeset
|
253 if ((res = dmInitBitStreamFILE(&bs, fp)) != DMERR_OK) |
| 435 | 254 return res; |
| 255 | |
| 256 if (spec->interleave) | |
| 257 { | |
| 258 // Output bitplanes in interleaved format (each plane of line sequentially) | |
| 259 for (yc = 0; yc < img->height; yc++) | |
| 260 { | |
| 261 for (plane = 0; plane < spec->nplanes; plane++) | |
| 262 { | |
| 263 Uint8 *sp = img->data + yc * img->pitch; | |
| 264 for (xc = 0; xc < img->width; xc++) | |
| 265 { | |
| 266 if (!dmPutBits(&bs, (sp[xc] & (1 << plane)) ? 1 : 0, 1)) | |
| 267 return DMERR_FWRITE; | |
| 268 } | |
| 269 } | |
| 270 } | |
| 271 } | |
| 272 else | |
| 273 { | |
| 274 // Output each bitplane in sequence | |
| 275 for (plane = 0; plane < spec->nplanes; plane++) | |
| 276 { | |
| 277 for (yc = 0; yc < img->height; yc++) | |
| 278 { | |
| 279 Uint8 *sp = img->data + yc * img->pitch; | |
| 280 for (xc = 0; xc < img->width; xc++) | |
| 281 { | |
| 282 if (!dmPutBits(&bs, (sp[xc] & (1 << plane)) ? 1 : 0, 1)) | |
| 283 return DMERR_FWRITE; | |
| 284 } | |
| 285 } | |
| 286 } | |
| 287 } | |
| 288 | |
| 289 return dmFlushBitStream(&bs); | |
| 290 } | |
| 291 | |
|
566
d400e32b62d9
Add a slightly different raw output format.
Matti Hamalainen <ccr@tnsp.org>
parents:
487
diff
changeset
|
292 |
|
d400e32b62d9
Add a slightly different raw output format.
Matti Hamalainen <ccr@tnsp.org>
parents:
487
diff
changeset
|
293 int dmWriteRAWImage(const char *filename, DMImage *img, DMImageSpec *spec) |
| 435 | 294 { |
| 295 FILE *fp; | |
| 296 int res; | |
| 297 | |
| 298 if ((fp = fopen(filename, "wb")) == NULL) | |
| 299 { | |
|
566
d400e32b62d9
Add a slightly different raw output format.
Matti Hamalainen <ccr@tnsp.org>
parents:
487
diff
changeset
|
300 dmError("RAW: Could not open file '%s' for writing.\n", filename); |
| 435 | 301 return DMERR_FOPEN; |
| 302 } | |
| 303 | |
|
566
d400e32b62d9
Add a slightly different raw output format.
Matti Hamalainen <ccr@tnsp.org>
parents:
487
diff
changeset
|
304 res = dmWriteRAWImageFILE(fp, img, spec); |
| 435 | 305 |
| 306 fclose(fp); | |
| 307 return res; | |
| 308 } | |
| 309 | |
| 310 | |
|
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
|
311 static int dmWritePPMRow(void *cbdata, Uint8 *row, size_t len) |
| 435 | 312 { |
|
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
|
313 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
|
314 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
|
315 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
|
316 return DMERR_FWRITE; |
| 435 | 317 } |
| 318 | |
| 319 | |
| 320 int dmWritePPMImageFILE(FILE *fp, DMImage *img, DMImageSpec *spec) | |
| 321 { | |
| 322 // Write PPM header | |
| 323 fprintf(fp, | |
| 324 "P6\n%d %d\n255\n", | |
| 325 img->width * spec->scale, | |
| 326 img->height * spec->scale); | |
| 327 | |
| 328 // Write image data | |
| 329 spec->format = DM_IFMT_RGB; | |
| 330 return dmWriteImageData(img, (void *) fp, dmWritePPMRow, spec); | |
| 331 } | |
| 332 | |
| 333 | |
| 334 int dmWritePPMImage(const char *filename, DMImage *img, DMImageSpec *spec) | |
| 335 { | |
| 336 FILE *fp; | |
| 337 int res; | |
| 338 | |
| 339 // Create output file | |
| 340 if ((fp = fopen(filename, "wb")) == NULL) | |
| 341 { | |
| 342 dmError("PPM: could not open file '%s' for writing.\n", filename); | |
| 343 return DMERR_FOPEN; | |
| 344 } | |
| 345 | |
| 346 res = dmWritePPMImageFILE(fp, img, spec); | |
| 347 | |
| 348 fclose(fp); | |
| 349 return res; | |
| 350 } | |
| 351 | |
| 352 | |
| 353 #ifdef DM_USE_LIBPNG | |
|
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
|
354 static int dmWritePNGRow(void *cbdata, Uint8 *row, size_t len) |
| 435 | 355 { |
| 356 png_structp png_ptr = cbdata; | |
| 357 (void) len; | |
| 358 | |
| 359 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
|
360 return DMERR_INTERNAL; |
| 435 | 361 |
| 362 png_write_row(png_ptr, row); | |
| 363 | |
|
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
|
364 return DMERR_OK; |
| 435 | 365 } |
| 366 | |
| 367 | |
| 368 int dmWritePNGImageFILE(FILE *fp, DMImage *img, DMImageSpec *spec) | |
| 369 { | |
| 370 png_structp png_ptr = NULL; | |
| 371 png_infop info_ptr = NULL; | |
| 372 png_colorp palette = NULL; | |
| 373 int fmt, res = DMERR_OK; | |
| 374 | |
| 375 // Create PNG structures | |
| 376 png_ptr = png_create_write_struct( | |
| 377 PNG_LIBPNG_VER_STRING, | |
| 378 NULL, NULL, NULL); | |
| 379 | |
| 380 if (png_ptr == NULL) | |
| 381 { | |
| 382 dmError("PNG: png_create_write_struct() failed.\n"); | |
| 383 res = DMERR_MALLOC; | |
| 384 goto error; | |
| 385 } | |
| 386 | |
| 387 info_ptr = png_create_info_struct(png_ptr); | |
| 388 if (info_ptr == NULL) | |
| 389 { | |
| 390 dmError("PNG: png_create_info_struct(%p) failed.\n", png_ptr); | |
| 391 res = DMERR_INIT_FAIL; | |
| 392 goto error; | |
| 393 } | |
| 394 | |
| 395 if (setjmp(png_jmpbuf(png_ptr))) | |
| 396 { | |
| 397 dmError("PNG: Error during image writing..\n"); | |
| 398 res = DMERR_INIT_FAIL; | |
| 399 goto error; | |
| 400 } | |
| 401 | |
| 402 png_init_io(png_ptr, fp); | |
| 403 | |
| 404 // Write PNG header info | |
| 405 switch (spec->format) | |
| 406 { | |
| 407 case DM_IFMT_PALETTE: fmt = PNG_COLOR_TYPE_PALETTE; break; | |
| 408 case DM_IFMT_RGB : fmt = PNG_COLOR_TYPE_RGB; break; | |
| 409 case DM_IFMT_RGBA : fmt = PNG_COLOR_TYPE_RGB_ALPHA; break; | |
| 410 default: | |
|
452
d1f7ddc84c7c
Return more sensible error values where appropriate instead of just
Matti Hamalainen <ccr@tnsp.org>
parents:
451
diff
changeset
|
411 dmError("PNG: Unsupported image format %d.\n", spec->format); |
|
d1f7ddc84c7c
Return more sensible error values where appropriate instead of just
Matti Hamalainen <ccr@tnsp.org>
parents:
451
diff
changeset
|
412 res = DMERR_NOT_SUPPORTED; |
| 435 | 413 goto error; |
| 414 } | |
| 415 | |
| 416 png_set_IHDR(png_ptr, info_ptr, | |
| 417 img->width * spec->scale, | |
| 418 img->height * spec->scale, | |
| 419 8, /* bits per component */ | |
| 420 fmt, | |
| 421 PNG_INTERLACE_NONE, | |
| 422 PNG_COMPRESSION_TYPE_DEFAULT, | |
| 423 PNG_FILTER_TYPE_DEFAULT); | |
| 424 | |
| 465 | 425 dmMsg(3, "PNG: %d x %d, depth=%d, type=%d\n", |
|
460
0af039b6c0ae
Improve transparent color handling.
Matti Hamalainen <ccr@tnsp.org>
parents:
453
diff
changeset
|
426 img->width * spec->scale, |
|
0af039b6c0ae
Improve transparent color handling.
Matti Hamalainen <ccr@tnsp.org>
parents:
453
diff
changeset
|
427 img->height * spec->scale, |
|
0af039b6c0ae
Improve transparent color handling.
Matti Hamalainen <ccr@tnsp.org>
parents:
453
diff
changeset
|
428 8, fmt); |
|
0af039b6c0ae
Improve transparent color handling.
Matti Hamalainen <ccr@tnsp.org>
parents:
453
diff
changeset
|
429 |
| 435 | 430 // Palette |
| 431 if (spec->format == DM_IFMT_PALETTE) | |
| 432 { | |
| 433 int i; | |
| 434 | |
| 435 palette = png_malloc(png_ptr, PNG_MAX_PALETTE_LENGTH * sizeof(png_color)); | |
| 436 if (palette == NULL) | |
| 437 { | |
| 438 dmError("PNG: Could not allocate palette structure."); | |
|
452
d1f7ddc84c7c
Return more sensible error values where appropriate instead of just
Matti Hamalainen <ccr@tnsp.org>
parents:
451
diff
changeset
|
439 res = DMERR_MALLOC; |
| 435 | 440 goto error; |
| 441 } | |
| 442 | |
| 443 memset(palette, 0, PNG_MAX_PALETTE_LENGTH * sizeof(png_color)); | |
| 444 | |
| 445 for (i = 0; i < img->ncolors; i++) | |
| 446 { | |
| 447 palette[i].red = img->pal[i].r; | |
| 448 palette[i].green = img->pal[i].g; | |
| 449 palette[i].blue = img->pal[i].b; | |
| 450 } | |
| 451 | |
|
460
0af039b6c0ae
Improve transparent color handling.
Matti Hamalainen <ccr@tnsp.org>
parents:
453
diff
changeset
|
452 png_set_PLTE(png_ptr, info_ptr, palette, img->ncolors); |
| 435 | 453 } |
| 454 | |
| 455 // png_set_gAMA(png_ptr, info_ptr, 2.2); | |
| 456 | |
| 457 png_write_info(png_ptr, info_ptr); | |
| 458 | |
| 459 | |
| 460 // Write compressed image data | |
| 461 dmWriteImageData(img, (void *) png_ptr, dmWritePNGRow, spec); | |
| 462 | |
| 463 // Write footer | |
| 464 png_write_end(png_ptr, NULL); | |
| 465 | |
| 466 error: | |
| 467 png_free(png_ptr, palette); | |
| 468 palette = NULL; | |
| 469 | |
| 470 if (png_ptr && info_ptr) | |
| 471 png_destroy_write_struct(&png_ptr, &info_ptr); | |
| 472 | |
| 473 return res; | |
| 474 } | |
| 475 | |
| 476 | |
| 477 int dmWritePNGImage(const char *filename, DMImage *img, DMImageSpec *spec) | |
| 478 { | |
| 479 int res; | |
| 480 FILE *fp; | |
| 481 | |
| 482 if ((fp = fopen(filename, "wb")) == NULL) | |
| 483 { | |
| 484 dmError("PNG: could not open file '%s' for writing.\n", filename); | |
| 485 return DMERR_FOPEN; | |
| 486 } | |
| 487 | |
| 488 res = dmWritePNGImageFILE(fp, img, spec); | |
| 489 | |
| 490 fclose(fp); | |
| 491 return res; | |
| 492 } | |
|
453
349a2ff11531
Implement PNG (1-8bpp indexed) reading support via libPNG.
Matti Hamalainen <ccr@tnsp.org>
parents:
452
diff
changeset
|
493 |
|
349a2ff11531
Implement PNG (1-8bpp indexed) reading support via libPNG.
Matti Hamalainen <ccr@tnsp.org>
parents:
452
diff
changeset
|
494 |
|
349a2ff11531
Implement PNG (1-8bpp indexed) reading support via libPNG.
Matti Hamalainen <ccr@tnsp.org>
parents:
452
diff
changeset
|
495 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
|
496 { |
|
349a2ff11531
Implement PNG (1-8bpp indexed) reading support via libPNG.
Matti Hamalainen <ccr@tnsp.org>
parents:
452
diff
changeset
|
497 png_structp png_ptr = NULL; |
|
349a2ff11531
Implement PNG (1-8bpp indexed) reading support via libPNG.
Matti Hamalainen <ccr@tnsp.org>
parents:
452
diff
changeset
|
498 png_infop info_ptr = NULL; |
|
349a2ff11531
Implement PNG (1-8bpp indexed) reading support via libPNG.
Matti Hamalainen <ccr@tnsp.org>
parents:
452
diff
changeset
|
499 png_colorp palette = NULL; |
|
349a2ff11531
Implement PNG (1-8bpp indexed) reading support via libPNG.
Matti Hamalainen <ccr@tnsp.org>
parents:
452
diff
changeset
|
500 png_bytep *row_pointers = NULL; |
|
460
0af039b6c0ae
Improve transparent color handling.
Matti Hamalainen <ccr@tnsp.org>
parents:
453
diff
changeset
|
501 png_bytep trans = NULL; |
|
453
349a2ff11531
Implement PNG (1-8bpp indexed) reading support via libPNG.
Matti Hamalainen <ccr@tnsp.org>
parents:
452
diff
changeset
|
502 png_uint_32 width, height; |
|
460
0af039b6c0ae
Improve transparent color handling.
Matti Hamalainen <ccr@tnsp.org>
parents:
453
diff
changeset
|
503 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
|
504 int res = DMERR_OK; |
|
349a2ff11531
Implement PNG (1-8bpp indexed) reading support via libPNG.
Matti Hamalainen <ccr@tnsp.org>
parents:
452
diff
changeset
|
505 DMImage *img; |
|
349a2ff11531
Implement PNG (1-8bpp indexed) reading support via libPNG.
Matti Hamalainen <ccr@tnsp.org>
parents:
452
diff
changeset
|
506 |
|
349a2ff11531
Implement PNG (1-8bpp indexed) reading support via libPNG.
Matti Hamalainen <ccr@tnsp.org>
parents:
452
diff
changeset
|
507 // Create PNG structures |
|
349a2ff11531
Implement PNG (1-8bpp indexed) reading support via libPNG.
Matti Hamalainen <ccr@tnsp.org>
parents:
452
diff
changeset
|
508 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
|
509 PNG_LIBPNG_VER_STRING, |
|
349a2ff11531
Implement PNG (1-8bpp indexed) reading support via libPNG.
Matti Hamalainen <ccr@tnsp.org>
parents:
452
diff
changeset
|
510 NULL, NULL, NULL); |
|
349a2ff11531
Implement PNG (1-8bpp indexed) reading support via libPNG.
Matti Hamalainen <ccr@tnsp.org>
parents:
452
diff
changeset
|
511 |
|
349a2ff11531
Implement PNG (1-8bpp indexed) reading support via libPNG.
Matti Hamalainen <ccr@tnsp.org>
parents:
452
diff
changeset
|
512 if (png_ptr == NULL) |
|
349a2ff11531
Implement PNG (1-8bpp indexed) reading support via libPNG.
Matti Hamalainen <ccr@tnsp.org>
parents:
452
diff
changeset
|
513 { |
|
349a2ff11531
Implement PNG (1-8bpp indexed) reading support via libPNG.
Matti Hamalainen <ccr@tnsp.org>
parents:
452
diff
changeset
|
514 dmError("PNG: png_create_write_struct() failed.\n"); |
|
349a2ff11531
Implement PNG (1-8bpp indexed) reading support via libPNG.
Matti Hamalainen <ccr@tnsp.org>
parents:
452
diff
changeset
|
515 res = DMERR_MALLOC; |
|
349a2ff11531
Implement PNG (1-8bpp indexed) reading support via libPNG.
Matti Hamalainen <ccr@tnsp.org>
parents:
452
diff
changeset
|
516 goto error; |
|
349a2ff11531
Implement PNG (1-8bpp indexed) reading support via libPNG.
Matti Hamalainen <ccr@tnsp.org>
parents:
452
diff
changeset
|
517 } |
|
349a2ff11531
Implement PNG (1-8bpp indexed) reading support via libPNG.
Matti Hamalainen <ccr@tnsp.org>
parents:
452
diff
changeset
|
518 |
|
349a2ff11531
Implement PNG (1-8bpp indexed) reading support via libPNG.
Matti Hamalainen <ccr@tnsp.org>
parents:
452
diff
changeset
|
519 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
|
520 if (info_ptr == NULL) |
|
349a2ff11531
Implement PNG (1-8bpp indexed) reading support via libPNG.
Matti Hamalainen <ccr@tnsp.org>
parents:
452
diff
changeset
|
521 { |
|
349a2ff11531
Implement PNG (1-8bpp indexed) reading support via libPNG.
Matti Hamalainen <ccr@tnsp.org>
parents:
452
diff
changeset
|
522 dmError("PNG: png_create_info_struct(%p) failed.\n", png_ptr); |
|
349a2ff11531
Implement PNG (1-8bpp indexed) reading support via libPNG.
Matti Hamalainen <ccr@tnsp.org>
parents:
452
diff
changeset
|
523 res = DMERR_INIT_FAIL; |
|
349a2ff11531
Implement PNG (1-8bpp indexed) reading support via libPNG.
Matti Hamalainen <ccr@tnsp.org>
parents:
452
diff
changeset
|
524 goto error; |
|
349a2ff11531
Implement PNG (1-8bpp indexed) reading support via libPNG.
Matti Hamalainen <ccr@tnsp.org>
parents:
452
diff
changeset
|
525 } |
|
349a2ff11531
Implement PNG (1-8bpp indexed) reading support via libPNG.
Matti Hamalainen <ccr@tnsp.org>
parents:
452
diff
changeset
|
526 |
|
349a2ff11531
Implement PNG (1-8bpp indexed) reading support via libPNG.
Matti Hamalainen <ccr@tnsp.org>
parents:
452
diff
changeset
|
527 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
|
528 { |
|
349a2ff11531
Implement PNG (1-8bpp indexed) reading support via libPNG.
Matti Hamalainen <ccr@tnsp.org>
parents:
452
diff
changeset
|
529 dmError("PNG: Error during image reading..\n"); |
|
349a2ff11531
Implement PNG (1-8bpp indexed) reading support via libPNG.
Matti Hamalainen <ccr@tnsp.org>
parents:
452
diff
changeset
|
530 res = DMERR_INIT_FAIL; |
|
349a2ff11531
Implement PNG (1-8bpp indexed) reading support via libPNG.
Matti Hamalainen <ccr@tnsp.org>
parents:
452
diff
changeset
|
531 goto error; |
|
349a2ff11531
Implement PNG (1-8bpp indexed) reading support via libPNG.
Matti Hamalainen <ccr@tnsp.org>
parents:
452
diff
changeset
|
532 } |
|
349a2ff11531
Implement PNG (1-8bpp indexed) reading support via libPNG.
Matti Hamalainen <ccr@tnsp.org>
parents:
452
diff
changeset
|
533 |
|
349a2ff11531
Implement PNG (1-8bpp indexed) reading support via libPNG.
Matti Hamalainen <ccr@tnsp.org>
parents:
452
diff
changeset
|
534 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
|
535 |
|
349a2ff11531
Implement PNG (1-8bpp indexed) reading support via libPNG.
Matti Hamalainen <ccr@tnsp.org>
parents:
452
diff
changeset
|
536 // Read image information |
|
349a2ff11531
Implement PNG (1-8bpp indexed) reading support via libPNG.
Matti Hamalainen <ccr@tnsp.org>
parents:
452
diff
changeset
|
537 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
|
538 |
|
349a2ff11531
Implement PNG (1-8bpp indexed) reading support via libPNG.
Matti Hamalainen <ccr@tnsp.org>
parents:
452
diff
changeset
|
539 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
|
540 &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
|
541 |
|
349a2ff11531
Implement PNG (1-8bpp indexed) reading support via libPNG.
Matti Hamalainen <ccr@tnsp.org>
parents:
452
diff
changeset
|
542 if (width < 1 || height < 1) |
|
349a2ff11531
Implement PNG (1-8bpp indexed) reading support via libPNG.
Matti Hamalainen <ccr@tnsp.org>
parents:
452
diff
changeset
|
543 { |
|
349a2ff11531
Implement PNG (1-8bpp indexed) reading support via libPNG.
Matti Hamalainen <ccr@tnsp.org>
parents:
452
diff
changeset
|
544 dmError("PNG: Invalid width or height (%d x %d)\n", |
|
349a2ff11531
Implement PNG (1-8bpp indexed) reading support via libPNG.
Matti Hamalainen <ccr@tnsp.org>
parents:
452
diff
changeset
|
545 width, height); |
|
349a2ff11531
Implement PNG (1-8bpp indexed) reading support via libPNG.
Matti Hamalainen <ccr@tnsp.org>
parents:
452
diff
changeset
|
546 res = DMERR_INVALID_DATA; |
|
349a2ff11531
Implement PNG (1-8bpp indexed) reading support via libPNG.
Matti Hamalainen <ccr@tnsp.org>
parents:
452
diff
changeset
|
547 goto error; |
|
349a2ff11531
Implement PNG (1-8bpp indexed) reading support via libPNG.
Matti Hamalainen <ccr@tnsp.org>
parents:
452
diff
changeset
|
548 } |
|
349a2ff11531
Implement PNG (1-8bpp indexed) reading support via libPNG.
Matti Hamalainen <ccr@tnsp.org>
parents:
452
diff
changeset
|
549 |
|
349a2ff11531
Implement PNG (1-8bpp indexed) reading support via libPNG.
Matti Hamalainen <ccr@tnsp.org>
parents:
452
diff
changeset
|
550 switch (color_type) |
|
349a2ff11531
Implement PNG (1-8bpp indexed) reading support via libPNG.
Matti Hamalainen <ccr@tnsp.org>
parents:
452
diff
changeset
|
551 { |
|
349a2ff11531
Implement PNG (1-8bpp indexed) reading support via libPNG.
Matti Hamalainen <ccr@tnsp.org>
parents:
452
diff
changeset
|
552 case PNG_COLOR_TYPE_GRAY: |
|
349a2ff11531
Implement PNG (1-8bpp indexed) reading support via libPNG.
Matti Hamalainen <ccr@tnsp.org>
parents:
452
diff
changeset
|
553 if (bit_depth < 8) |
|
349a2ff11531
Implement PNG (1-8bpp indexed) reading support via libPNG.
Matti Hamalainen <ccr@tnsp.org>
parents:
452
diff
changeset
|
554 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
|
555 |
|
349a2ff11531
Implement PNG (1-8bpp indexed) reading support via libPNG.
Matti Hamalainen <ccr@tnsp.org>
parents:
452
diff
changeset
|
556 if (bit_depth > 8) |
|
349a2ff11531
Implement PNG (1-8bpp indexed) reading support via libPNG.
Matti Hamalainen <ccr@tnsp.org>
parents:
452
diff
changeset
|
557 { |
|
349a2ff11531
Implement PNG (1-8bpp indexed) reading support via libPNG.
Matti Hamalainen <ccr@tnsp.org>
parents:
452
diff
changeset
|
558 dmError("PNG: Unsupported bit depth for grayscale image: %d\n", |
|
349a2ff11531
Implement PNG (1-8bpp indexed) reading support via libPNG.
Matti Hamalainen <ccr@tnsp.org>
parents:
452
diff
changeset
|
559 bit_depth); |
|
349a2ff11531
Implement PNG (1-8bpp indexed) reading support via libPNG.
Matti Hamalainen <ccr@tnsp.org>
parents:
452
diff
changeset
|
560 res = DMERR_NOT_SUPPORTED; |
|
349a2ff11531
Implement PNG (1-8bpp indexed) reading support via libPNG.
Matti Hamalainen <ccr@tnsp.org>
parents:
452
diff
changeset
|
561 goto error; |
|
349a2ff11531
Implement PNG (1-8bpp indexed) reading support via libPNG.
Matti Hamalainen <ccr@tnsp.org>
parents:
452
diff
changeset
|
562 } |
|
349a2ff11531
Implement PNG (1-8bpp indexed) reading support via libPNG.
Matti Hamalainen <ccr@tnsp.org>
parents:
452
diff
changeset
|
563 break; |
|
349a2ff11531
Implement PNG (1-8bpp indexed) reading support via libPNG.
Matti Hamalainen <ccr@tnsp.org>
parents:
452
diff
changeset
|
564 |
|
349a2ff11531
Implement PNG (1-8bpp indexed) reading support via libPNG.
Matti Hamalainen <ccr@tnsp.org>
parents:
452
diff
changeset
|
565 case PNG_COLOR_TYPE_PALETTE: |
|
349a2ff11531
Implement PNG (1-8bpp indexed) reading support via libPNG.
Matti Hamalainen <ccr@tnsp.org>
parents:
452
diff
changeset
|
566 png_set_packing(png_ptr); |
|
349a2ff11531
Implement PNG (1-8bpp indexed) reading support via libPNG.
Matti Hamalainen <ccr@tnsp.org>
parents:
452
diff
changeset
|
567 break; |
|
349a2ff11531
Implement PNG (1-8bpp indexed) reading support via libPNG.
Matti Hamalainen <ccr@tnsp.org>
parents:
452
diff
changeset
|
568 |
|
349a2ff11531
Implement PNG (1-8bpp indexed) reading support via libPNG.
Matti Hamalainen <ccr@tnsp.org>
parents:
452
diff
changeset
|
569 default: |
|
349a2ff11531
Implement PNG (1-8bpp indexed) reading support via libPNG.
Matti Hamalainen <ccr@tnsp.org>
parents:
452
diff
changeset
|
570 dmError("PNG: RGB/RGBA images not supported for loading.\n"); |
|
349a2ff11531
Implement PNG (1-8bpp indexed) reading support via libPNG.
Matti Hamalainen <ccr@tnsp.org>
parents:
452
diff
changeset
|
571 res = DMERR_NOT_SUPPORTED; |
|
349a2ff11531
Implement PNG (1-8bpp indexed) reading support via libPNG.
Matti Hamalainen <ccr@tnsp.org>
parents:
452
diff
changeset
|
572 goto error; |
|
349a2ff11531
Implement PNG (1-8bpp indexed) reading support via libPNG.
Matti Hamalainen <ccr@tnsp.org>
parents:
452
diff
changeset
|
573 } |
|
349a2ff11531
Implement PNG (1-8bpp indexed) reading support via libPNG.
Matti Hamalainen <ccr@tnsp.org>
parents:
452
diff
changeset
|
574 |
|
349a2ff11531
Implement PNG (1-8bpp indexed) reading support via libPNG.
Matti Hamalainen <ccr@tnsp.org>
parents:
452
diff
changeset
|
575 // Allocate image |
| 465 | 576 dmMsg(3, "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
|
577 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
|
578 |
|
349a2ff11531
Implement PNG (1-8bpp indexed) reading support via libPNG.
Matti Hamalainen <ccr@tnsp.org>
parents:
452
diff
changeset
|
579 if ((*pimg = img = dmImageAlloc(width, height)) == NULL) |
|
349a2ff11531
Implement PNG (1-8bpp indexed) reading support via libPNG.
Matti Hamalainen <ccr@tnsp.org>
parents:
452
diff
changeset
|
580 { |
|
349a2ff11531
Implement PNG (1-8bpp indexed) reading support via libPNG.
Matti Hamalainen <ccr@tnsp.org>
parents:
452
diff
changeset
|
581 dmError("PNG: Could not allocate image data.\n"); |
|
349a2ff11531
Implement PNG (1-8bpp indexed) reading support via libPNG.
Matti Hamalainen <ccr@tnsp.org>
parents:
452
diff
changeset
|
582 res = DMERR_MALLOC; |
|
349a2ff11531
Implement PNG (1-8bpp indexed) reading support via libPNG.
Matti Hamalainen <ccr@tnsp.org>
parents:
452
diff
changeset
|
583 goto error; |
|
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 |
|
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 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
|
588 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
|
589 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
|
590 |
|
349a2ff11531
Implement PNG (1-8bpp indexed) reading support via libPNG.
Matti Hamalainen <ccr@tnsp.org>
parents:
452
diff
changeset
|
591 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
|
592 |
|
349a2ff11531
Implement PNG (1-8bpp indexed) reading support via libPNG.
Matti Hamalainen <ccr@tnsp.org>
parents:
452
diff
changeset
|
593 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
|
594 |
|
349a2ff11531
Implement PNG (1-8bpp indexed) reading support via libPNG.
Matti Hamalainen <ccr@tnsp.org>
parents:
452
diff
changeset
|
595 // Create palette |
|
349a2ff11531
Implement PNG (1-8bpp indexed) reading support via libPNG.
Matti Hamalainen <ccr@tnsp.org>
parents:
452
diff
changeset
|
596 switch (color_type) |
|
349a2ff11531
Implement PNG (1-8bpp indexed) reading support via libPNG.
Matti Hamalainen <ccr@tnsp.org>
parents:
452
diff
changeset
|
597 { |
|
349a2ff11531
Implement PNG (1-8bpp indexed) reading support via libPNG.
Matti Hamalainen <ccr@tnsp.org>
parents:
452
diff
changeset
|
598 case PNG_COLOR_TYPE_GRAY: |
|
349a2ff11531
Implement PNG (1-8bpp indexed) reading support via libPNG.
Matti Hamalainen <ccr@tnsp.org>
parents:
452
diff
changeset
|
599 ncolors = 256; |
| 465 | 600 dmMsg(3, "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
|
601 |
|
460
0af039b6c0ae
Improve transparent color handling.
Matti Hamalainen <ccr@tnsp.org>
parents:
453
diff
changeset
|
602 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
|
603 { |
|
349a2ff11531
Implement PNG (1-8bpp indexed) reading support via libPNG.
Matti Hamalainen <ccr@tnsp.org>
parents:
452
diff
changeset
|
604 res = DMERR_MALLOC; |
|
349a2ff11531
Implement PNG (1-8bpp indexed) reading support via libPNG.
Matti Hamalainen <ccr@tnsp.org>
parents:
452
diff
changeset
|
605 goto error; |
|
349a2ff11531
Implement PNG (1-8bpp indexed) reading support via libPNG.
Matti Hamalainen <ccr@tnsp.org>
parents:
452
diff
changeset
|
606 } |
|
349a2ff11531
Implement PNG (1-8bpp indexed) reading support via libPNG.
Matti Hamalainen <ccr@tnsp.org>
parents:
452
diff
changeset
|
607 |
|
349a2ff11531
Implement PNG (1-8bpp indexed) reading support via libPNG.
Matti Hamalainen <ccr@tnsp.org>
parents:
452
diff
changeset
|
608 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
|
609 { |
|
349a2ff11531
Implement PNG (1-8bpp indexed) reading support via libPNG.
Matti Hamalainen <ccr@tnsp.org>
parents:
452
diff
changeset
|
610 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
|
611 } |
|
349a2ff11531
Implement PNG (1-8bpp indexed) reading support via libPNG.
Matti Hamalainen <ccr@tnsp.org>
parents:
452
diff
changeset
|
612 break; |
|
349a2ff11531
Implement PNG (1-8bpp indexed) reading support via libPNG.
Matti Hamalainen <ccr@tnsp.org>
parents:
452
diff
changeset
|
613 |
|
349a2ff11531
Implement PNG (1-8bpp indexed) reading support via libPNG.
Matti Hamalainen <ccr@tnsp.org>
parents:
452
diff
changeset
|
614 case PNG_COLOR_TYPE_PALETTE: |
|
349a2ff11531
Implement PNG (1-8bpp indexed) reading support via libPNG.
Matti Hamalainen <ccr@tnsp.org>
parents:
452
diff
changeset
|
615 png_get_PLTE(png_ptr, info_ptr, &palette, &ncolors); |
| 465 | 616 dmMsg(3, "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
|
617 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
|
618 { |
|
467
80d09ea85e75
Check for NULL pointers from png_get_tRNS and png_get_PLTE.
Matti Hamalainen <ccr@tnsp.org>
parents:
465
diff
changeset
|
619 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
|
620 { |
|
80d09ea85e75
Check for NULL pointers from png_get_tRNS and png_get_PLTE.
Matti Hamalainen <ccr@tnsp.org>
parents:
465
diff
changeset
|
621 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
|
622 goto error; |
|
80d09ea85e75
Check for NULL pointers from png_get_tRNS and png_get_PLTE.
Matti Hamalainen <ccr@tnsp.org>
parents:
465
diff
changeset
|
623 } |
|
453
349a2ff11531
Implement PNG (1-8bpp indexed) reading support via libPNG.
Matti Hamalainen <ccr@tnsp.org>
parents:
452
diff
changeset
|
624 |
|
467
80d09ea85e75
Check for NULL pointers from png_get_tRNS and png_get_PLTE.
Matti Hamalainen <ccr@tnsp.org>
parents:
465
diff
changeset
|
625 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
|
626 { |
|
80d09ea85e75
Check for NULL pointers from png_get_tRNS and png_get_PLTE.
Matti Hamalainen <ccr@tnsp.org>
parents:
465
diff
changeset
|
627 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
|
628 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
|
629 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
|
630 } |
|
453
349a2ff11531
Implement PNG (1-8bpp indexed) reading support via libPNG.
Matti Hamalainen <ccr@tnsp.org>
parents:
452
diff
changeset
|
631 } |
|
349a2ff11531
Implement PNG (1-8bpp indexed) reading support via libPNG.
Matti Hamalainen <ccr@tnsp.org>
parents:
452
diff
changeset
|
632 break; |
|
349a2ff11531
Implement PNG (1-8bpp indexed) reading support via libPNG.
Matti Hamalainen <ccr@tnsp.org>
parents:
452
diff
changeset
|
633 } |
|
349a2ff11531
Implement PNG (1-8bpp indexed) reading support via libPNG.
Matti Hamalainen <ccr@tnsp.org>
parents:
452
diff
changeset
|
634 |
|
460
0af039b6c0ae
Improve transparent color handling.
Matti Hamalainen <ccr@tnsp.org>
parents:
453
diff
changeset
|
635 if (color_type == PNG_COLOR_TYPE_PALETTE || |
|
0af039b6c0ae
Improve transparent color handling.
Matti Hamalainen <ccr@tnsp.org>
parents:
453
diff
changeset
|
636 color_type == PNG_COLOR_TYPE_GRAY) |
|
0af039b6c0ae
Improve transparent color handling.
Matti Hamalainen <ccr@tnsp.org>
parents:
453
diff
changeset
|
637 { |
|
0af039b6c0ae
Improve transparent color handling.
Matti Hamalainen <ccr@tnsp.org>
parents:
453
diff
changeset
|
638 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
|
639 if (trans != NULL && ntrans > 0) |
|
460
0af039b6c0ae
Improve transparent color handling.
Matti Hamalainen <ccr@tnsp.org>
parents:
453
diff
changeset
|
640 { |
|
467
80d09ea85e75
Check for NULL pointers from png_get_tRNS and png_get_PLTE.
Matti Hamalainen <ccr@tnsp.org>
parents:
465
diff
changeset
|
641 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
|
642 { |
|
80d09ea85e75
Check for NULL pointers from png_get_tRNS and png_get_PLTE.
Matti Hamalainen <ccr@tnsp.org>
parents:
465
diff
changeset
|
643 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
|
644 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
|
645 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
|
646 } |
|
460
0af039b6c0ae
Improve transparent color handling.
Matti Hamalainen <ccr@tnsp.org>
parents:
453
diff
changeset
|
647 } |
|
0af039b6c0ae
Improve transparent color handling.
Matti Hamalainen <ccr@tnsp.org>
parents:
453
diff
changeset
|
648 } |
|
0af039b6c0ae
Improve transparent color handling.
Matti Hamalainen <ccr@tnsp.org>
parents:
453
diff
changeset
|
649 |
|
453
349a2ff11531
Implement PNG (1-8bpp indexed) reading support via libPNG.
Matti Hamalainen <ccr@tnsp.org>
parents:
452
diff
changeset
|
650 error: |
|
460
0af039b6c0ae
Improve transparent color handling.
Matti Hamalainen <ccr@tnsp.org>
parents:
453
diff
changeset
|
651 // 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
|
652 |
|
349a2ff11531
Implement PNG (1-8bpp indexed) reading support via libPNG.
Matti Hamalainen <ccr@tnsp.org>
parents:
452
diff
changeset
|
653 if (png_ptr && info_ptr) |
|
349a2ff11531
Implement PNG (1-8bpp indexed) reading support via libPNG.
Matti Hamalainen <ccr@tnsp.org>
parents:
452
diff
changeset
|
654 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
|
655 |
|
349a2ff11531
Implement PNG (1-8bpp indexed) reading support via libPNG.
Matti Hamalainen <ccr@tnsp.org>
parents:
452
diff
changeset
|
656 return res; |
|
349a2ff11531
Implement PNG (1-8bpp indexed) reading support via libPNG.
Matti Hamalainen <ccr@tnsp.org>
parents:
452
diff
changeset
|
657 } |
|
349a2ff11531
Implement PNG (1-8bpp indexed) reading support via libPNG.
Matti Hamalainen <ccr@tnsp.org>
parents:
452
diff
changeset
|
658 |
|
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 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
|
661 { |
|
349a2ff11531
Implement PNG (1-8bpp indexed) reading support via libPNG.
Matti Hamalainen <ccr@tnsp.org>
parents:
452
diff
changeset
|
662 int res; |
|
349a2ff11531
Implement PNG (1-8bpp indexed) reading support via libPNG.
Matti Hamalainen <ccr@tnsp.org>
parents:
452
diff
changeset
|
663 FILE *fp; |
|
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 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
|
666 { |
|
349a2ff11531
Implement PNG (1-8bpp indexed) reading support via libPNG.
Matti Hamalainen <ccr@tnsp.org>
parents:
452
diff
changeset
|
667 dmError("PNG: Could not open file '%s' for reading.\n", filename); |
|
349a2ff11531
Implement PNG (1-8bpp indexed) reading support via libPNG.
Matti Hamalainen <ccr@tnsp.org>
parents:
452
diff
changeset
|
668 return DMERR_FOPEN; |
|
349a2ff11531
Implement PNG (1-8bpp indexed) reading support via libPNG.
Matti Hamalainen <ccr@tnsp.org>
parents:
452
diff
changeset
|
669 } |
|
349a2ff11531
Implement PNG (1-8bpp indexed) reading support via libPNG.
Matti Hamalainen <ccr@tnsp.org>
parents:
452
diff
changeset
|
670 |
|
349a2ff11531
Implement PNG (1-8bpp indexed) reading support via libPNG.
Matti Hamalainen <ccr@tnsp.org>
parents:
452
diff
changeset
|
671 res = dmReadPNGImageFILE(fp, img); |
|
349a2ff11531
Implement PNG (1-8bpp indexed) reading support via libPNG.
Matti Hamalainen <ccr@tnsp.org>
parents:
452
diff
changeset
|
672 |
|
349a2ff11531
Implement PNG (1-8bpp indexed) reading support via libPNG.
Matti Hamalainen <ccr@tnsp.org>
parents:
452
diff
changeset
|
673 fclose(fp); |
|
349a2ff11531
Implement PNG (1-8bpp indexed) reading support via libPNG.
Matti Hamalainen <ccr@tnsp.org>
parents:
452
diff
changeset
|
674 return res; |
|
349a2ff11531
Implement PNG (1-8bpp indexed) reading support via libPNG.
Matti Hamalainen <ccr@tnsp.org>
parents:
452
diff
changeset
|
675 } |
| 435 | 676 #endif |
| 677 | |
| 678 | |
| 679 typedef struct | |
| 680 { | |
| 681 Uint8 r,g,b; | |
| 682 } DMPCXColor; | |
| 683 | |
| 684 | |
| 685 typedef struct | |
| 686 { | |
| 687 Uint8 manufacturer, | |
| 688 version, | |
| 689 encoding, | |
| 690 bpp; | |
| 691 Uint16 xmin, ymin, xmax, ymax; | |
| 692 Uint16 hres, vres; | |
| 693 DMPCXColor colormap[16]; | |
| 694 Uint8 reserved; | |
| 695 Uint8 nplanes; | |
| 696 Uint16 bpl; | |
| 697 Uint16 palinfo; | |
| 698 Uint8 filler[58]; | |
| 699 } DMPCXHeader; | |
| 700 | |
| 701 | |
| 702 typedef struct | |
| 703 { | |
| 704 DMPCXHeader *header; | |
| 705 Uint8 *buf; | |
| 706 size_t bufLen, bufOffs; | |
| 707 int format; | |
| 708 FILE *fp; | |
| 709 } DMPCXData; | |
| 710 | |
| 711 | |
| 712 static inline Uint8 dmPCXGetByte(Uint8 *row, const size_t len, const size_t soffs) | |
| 713 { | |
| 714 return (soffs < len) ? row[soffs] : 0; | |
| 715 } | |
| 716 | |
| 717 static BOOL dmPCXFlush(DMPCXData *pcx) | |
| 718 { | |
| 719 BOOL ret = TRUE; | |
| 720 if (pcx->bufOffs > 0) | |
| 721 ret = fwrite(pcx->buf, sizeof(Uint8), pcx->bufOffs, pcx->fp) == pcx->bufOffs; | |
| 722 pcx->bufOffs = 0; | |
| 723 return ret; | |
| 724 } | |
| 725 | |
| 726 static inline BOOL dmPCXPutByte(DMPCXData *pcx, const Uint8 val) | |
| 727 { | |
| 728 if (pcx->bufOffs < pcx->bufLen) | |
| 729 { | |
| 730 pcx->buf[pcx->bufOffs++] = val; | |
| 731 return TRUE; | |
| 732 } | |
| 733 else | |
| 734 return dmPCXFlush(pcx); | |
| 735 } | |
| 736 | |
|
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
|
737 static int dmWritePCXRow(void *cbdata, Uint8 *row, size_t len) |
| 435 | 738 { |
| 739 DMPCXData *pcx = (DMPCXData *) cbdata; | |
| 740 int plane; | |
| 741 size_t soffs = 0; | |
| 742 | |
| 743 // fprintf(stderr, "%d, %d * %d = %d\n", len, pcx->header->bpl, pcx->header->nplanes, pcx->header->nplanes * pcx->header->bpl); | |
| 744 | |
| 745 pcx->bufOffs = 0; | |
| 746 | |
| 747 for (plane = 0; plane < pcx->header->nplanes; plane++) | |
| 748 { | |
| 749 Uint8 data = dmPCXGetByte(row, len, soffs++), | |
| 750 count = 1; | |
| 751 | |
| 752 // size_t blen = pcx->header->bpl * pcx->header->nplanes; | |
| 753 size_t blen = pcx->header->bpl; | |
| 754 while (soffs < blen) | |
| 755 { | |
| 756 if (data == dmPCXGetByte(row, len, soffs) && count < 63) | |
| 757 { | |
| 758 count++; | |
| 759 soffs++; | |
| 760 } | |
| 761 else | |
| 762 { | |
| 763 if (count == 1 && (data & 0xC0) != 0xC0) | |
| 764 { | |
| 765 if (!dmPCXPutByte(pcx, data)) | |
|
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
|
766 return DMERR_FWRITE; |
| 435 | 767 } |
| 768 else | |
| 769 { | |
| 770 if (!dmPCXPutByte(pcx, 0xC0 | count) || | |
| 771 !dmPCXPutByte(pcx, data)) | |
|
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
|
772 return DMERR_FWRITE; |
| 435 | 773 } |
| 774 | |
| 775 data = dmPCXGetByte(row, len, soffs++); | |
| 776 count = 1; | |
| 777 } | |
| 778 } | |
| 779 | |
| 780 if (count > 1) | |
| 781 { | |
| 782 if (!dmPCXPutByte(pcx, 0xC0 | count) || | |
| 783 !dmPCXPutByte(pcx, data)) | |
|
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
|
784 return DMERR_FWRITE; |
| 435 | 785 } |
| 786 | |
| 787 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
|
788 return DMERR_FWRITE; |
| 435 | 789 } |
| 790 | |
| 791 | |
|
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
|
792 return DMERR_OK; |
| 435 | 793 } |
| 794 | |
| 795 | |
| 796 int dmWritePCXImageFILE(FILE *fp, DMImage *img, DMImageSpec *spec) | |
| 797 { | |
| 798 DMPCXData pcx; | |
| 799 DMPCXHeader hdr; | |
| 800 int res; | |
| 801 | |
| 802 // Create output file | |
| 803 pcx.buf = NULL; | |
| 804 pcx.format = spec->paletted ? DM_IFMT_PALETTE : DM_IFMT_RGB_PLANE; | |
| 805 pcx.header = &hdr; | |
| 806 pcx.fp = fp; | |
| 807 | |
| 808 // Create PCX header | |
| 809 memset(&hdr, 0, sizeof(hdr)); | |
| 810 if (spec->paletted) | |
| 811 { | |
| 812 int i; | |
| 813 for (i = 0; i < (img->ncolors > 16 ? 16 : img->ncolors); i++) | |
| 814 { | |
| 815 hdr.colormap[i].r = img->pal[i].r; | |
| 816 hdr.colormap[i].g = img->pal[i].g; | |
| 817 hdr.colormap[i].b = img->pal[i].b; | |
| 818 } | |
| 819 } | |
| 820 hdr.manufacturer = 10; | |
| 821 hdr.version = 5; | |
| 822 hdr.encoding = 1; | |
| 823 hdr.bpp = 8; | |
| 824 hdr.hres = img->width * spec->scale; | |
| 825 hdr.vres = img->height * spec->scale; | |
| 826 hdr.xmin = hdr.ymin = 0; | |
| 827 hdr.xmax = hdr.hres - 1; | |
| 828 hdr.ymax = hdr.vres - 1; | |
| 829 hdr.nplanes = dmImageGetBytesPerPixel(pcx.format); | |
| 830 hdr.palinfo = 1; | |
| 831 | |
| 832 res = (img->width * spec->scale); | |
| 833 hdr.bpl = res / 2; | |
| 834 if (res % 2) hdr.bpl++; | |
| 835 hdr.bpl *= 2; | |
| 836 | |
| 465 | 837 dmMsg(3, "PCX: paletted=%d, nplanes=%d, bpp=%d, bpl=%d\n", |
| 435 | 838 spec->paletted, hdr.nplanes, hdr.bpp, hdr.bpl); |
| 839 | |
| 840 pcx.bufLen = hdr.bpl * 4; | |
| 841 if ((pcx.buf = dmMalloc(pcx.bufLen)) == NULL) | |
| 842 { | |
| 843 dmError("PCX: Could not allocate %d bytes for RLE compression buffer.\n", | |
| 844 pcx.bufLen); | |
| 845 res = DMERR_MALLOC; | |
| 846 goto error; | |
| 847 } | |
| 848 | |
| 849 // Write PCX header | |
| 850 if (!dm_fwrite_byte(pcx.fp, hdr.manufacturer) || | |
| 851 !dm_fwrite_byte(pcx.fp, hdr.version) || | |
| 852 !dm_fwrite_byte(pcx.fp, hdr.encoding) || | |
| 853 !dm_fwrite_byte(pcx.fp, hdr.bpp)) | |
| 854 { | |
| 855 dmError("PCX: Could not write basic header data.\n"); | |
| 856 res = DMERR_FWRITE; | |
| 857 goto error; | |
| 858 } | |
| 859 | |
| 860 if (!dm_fwrite_le16(pcx.fp, hdr.xmin) || | |
| 861 !dm_fwrite_le16(pcx.fp, hdr.ymin) || | |
| 862 !dm_fwrite_le16(pcx.fp, hdr.xmax) || | |
| 863 !dm_fwrite_le16(pcx.fp, hdr.ymax) || | |
| 864 !dm_fwrite_le16(pcx.fp, hdr.hres) || | |
| 865 !dm_fwrite_le16(pcx.fp, hdr.vres)) | |
| 866 { | |
| 867 dmError("PCX: Could not write image dimensions.\n"); | |
| 868 res = DMERR_FWRITE; | |
| 869 goto error; | |
| 870 } | |
| 871 | |
| 872 if (!dm_fwrite_str(pcx.fp, (Uint8 *) &hdr.colormap, sizeof(hdr.colormap))) | |
| 873 { | |
| 874 dmError("PCX: Could not write colormap.\n"); | |
| 875 res = DMERR_FWRITE; | |
| 876 goto error; | |
| 877 } | |
| 878 | |
| 879 if (!dm_fwrite_byte(pcx.fp, hdr.reserved) || | |
| 880 !dm_fwrite_byte(pcx.fp, hdr.nplanes) || | |
| 881 !dm_fwrite_le16(pcx.fp, hdr.bpl) || | |
| 882 !dm_fwrite_le16(pcx.fp, hdr.palinfo) || | |
| 883 !dm_fwrite_str(pcx.fp, (Uint8 *) &hdr.filler, sizeof(hdr.filler))) | |
| 884 { | |
| 885 dmError("PCX: Could not write header remainder.\n"); | |
| 886 res = DMERR_FWRITE; | |
| 887 goto error; | |
| 888 } | |
| 889 | |
| 890 // Write image data | |
| 891 res = dmWriteImageData(img, (void *) &pcx, dmWritePCXRow, spec); | |
| 892 | |
| 893 // Write VGA palette | |
| 894 if (spec->paletted) | |
| 895 { | |
| 896 int i; | |
| 897 dm_fwrite_byte(pcx.fp, 0x0C); | |
| 465 | 898 dmMsg(3, "PCX: Writing palette of %d active entries.\n", img->ncolors); |
| 435 | 899 |
| 900 for (i = 0; i < img->ncolors; i++) | |
| 901 { | |
| 902 dm_fwrite_byte(pcx.fp, img->pal[i].r); | |
| 903 dm_fwrite_byte(pcx.fp, img->pal[i].g); | |
| 904 dm_fwrite_byte(pcx.fp, img->pal[i].b); | |
| 905 } | |
| 906 | |
| 907 // Pad the palette, if necessary | |
| 908 for (; i < 256; i++) | |
| 909 { | |
| 910 dm_fwrite_byte(pcx.fp, 0); | |
| 911 dm_fwrite_byte(pcx.fp, 0); | |
| 912 dm_fwrite_byte(pcx.fp, 0); | |
| 913 } | |
| 914 } | |
| 915 | |
| 916 error: | |
| 917 dmFree(pcx.buf); | |
| 918 return res; | |
| 919 } | |
| 920 | |
| 921 | |
| 922 int dmWritePCXImage(const char *filename, DMImage *img, DMImageSpec *spec) | |
| 923 { | |
| 924 FILE *fp; | |
| 925 int res; | |
| 926 | |
| 927 if ((fp = fopen(filename, "wb")) == NULL) | |
| 928 { | |
| 929 dmError("PCX: Could not open file '%s' for writing.\n", filename); | |
| 930 return DMERR_FOPEN; | |
| 931 } | |
| 932 | |
| 933 res = dmWritePCXImageFILE(fp, img, spec); | |
| 934 | |
| 935 fclose(fp); | |
| 936 return res; | |
| 937 } | |
| 938 | |
| 939 | |
| 940 static BOOL dmPCXDecodeRLERow(FILE *fp, Uint8 *buf, const size_t bufLen) | |
| 941 { | |
| 942 size_t offs = 0; | |
| 943 do | |
| 944 { | |
| 945 int count; | |
| 946 Uint8 data; | |
| 947 | |
| 948 if (!dm_fread_byte(fp, &data)) | |
| 949 return FALSE; | |
| 950 | |
| 951 if ((data & 0xC0) == 0xC0) | |
| 952 { | |
| 953 count = data & 0x3F; | |
| 954 if (!dm_fread_byte(fp, &data)) | |
| 955 return FALSE; | |
| 956 } | |
| 957 else | |
| 958 count = 1; | |
| 959 | |
| 960 while (count-- && offs < bufLen) | |
| 961 buf[offs++] = data; | |
| 962 | |
| 963 } while (offs < bufLen); | |
| 964 | |
| 965 return TRUE; | |
| 966 } | |
| 967 | |
| 968 | |
| 969 int dmReadPCXImageFILE(FILE *fp, DMImage **pimg) | |
| 970 { | |
| 971 DMImage *img; | |
| 972 DMPCXData pcx; | |
| 973 DMPCXHeader hdr; | |
| 974 BOOL paletted; | |
| 975 int res = 0, yc, xc; | |
| 976 Uint8 *dp; | |
| 977 | |
| 978 pcx.buf = NULL; | |
| 979 | |
| 980 // Read PCX header | |
| 981 if (!dm_fread_byte(fp, &hdr.manufacturer) || | |
| 982 !dm_fread_byte(fp, &hdr.version) || | |
| 983 !dm_fread_byte(fp, &hdr.encoding) || | |
| 984 !dm_fread_byte(fp, &hdr.bpp)) | |
| 985 { | |
| 986 dmError("PCX: Could not read basic header data.\n"); | |
| 987 res = DMERR_FREAD; | |
| 988 goto error; | |
| 989 } | |
| 990 | |
| 991 if (hdr.manufacturer != 10 || | |
| 992 hdr.version != 5 || | |
| 993 hdr.encoding != 1 || | |
| 994 hdr.bpp != 8) | |
| 995 { | |
| 996 dmError("PCX: Not a PCX file, or unsupported variant.\n"); | |
| 997 res = DMERR_FREAD; | |
| 998 goto error; | |
| 999 } | |
| 1000 | |
| 1001 if (!dm_fread_le16(fp, &hdr.xmin) || | |
| 1002 !dm_fread_le16(fp, &hdr.ymin) || | |
| 1003 !dm_fread_le16(fp, &hdr.xmax) || | |
| 1004 !dm_fread_le16(fp, &hdr.ymax) || | |
| 1005 !dm_fread_le16(fp, &hdr.hres) || | |
| 1006 !dm_fread_le16(fp, &hdr.vres)) | |
| 1007 { | |
| 1008 dmError("PCX: Could not read image dimensions.\n"); | |
| 1009 res = DMERR_FREAD; | |
| 1010 goto error; | |
| 1011 } | |
| 1012 | |
| 1013 if (!dm_fread_str(fp, (Uint8 *) &hdr.colormap, sizeof(hdr.colormap))) | |
| 1014 { | |
| 1015 dmError("PCX: Could not read colormap.\n"); | |
| 1016 res = DMERR_FREAD; | |
| 1017 goto error; | |
| 1018 } | |
| 1019 | |
| 1020 if (!dm_fread_byte(fp, &hdr.reserved) || | |
| 1021 !dm_fread_byte(fp, &hdr.nplanes) || | |
| 1022 !dm_fread_le16(fp, &hdr.bpl) || | |
| 1023 !dm_fread_le16(fp, &hdr.palinfo) || | |
| 1024 !dm_fread_str(fp, (Uint8 *) &hdr.filler, sizeof(hdr.filler))) | |
| 1025 { | |
| 1026 dmError("PCX: Could not read header remainder.\n"); | |
| 1027 res = DMERR_FREAD; | |
| 1028 goto error; | |
| 1029 } | |
| 1030 | |
| 1031 if (hdr.nplanes != 3 && hdr.nplanes != 1) | |
| 1032 { | |
| 1033 dmError("PCX: Unsupported number of bitplanes %d.\n", hdr.nplanes); | |
| 1034 res = DMERR_FREAD; | |
| 1035 goto error; | |
| 1036 } | |
| 1037 | |
| 1038 // Allocate image | |
| 1039 if ((*pimg = img = dmImageAlloc(hdr.xmax - hdr.xmin + 1, hdr.ymax - hdr.ymin + 1)) == NULL) | |
| 1040 { | |
| 1041 dmError("PCX: Could not allocate image structure.\n"); | |
| 1042 res = DMERR_MALLOC; | |
| 1043 goto error; | |
| 1044 } | |
| 1045 | |
| 1046 paletted = hdr.nplanes == 1; | |
| 1047 pcx.bufLen = hdr.nplanes * hdr.bpl; | |
| 1048 if ((pcx.buf = dmMalloc(pcx.bufLen)) == NULL) | |
| 1049 { | |
| 1050 dmError("PCX: Could not allocate RLE buffer.\n"); | |
| 1051 res = DMERR_MALLOC; | |
| 1052 goto error; | |
| 1053 } | |
| 1054 | |
| 1055 // Read image data | |
| 1056 dp = img->data; | |
| 1057 for (yc = 0; yc < img->height; yc++) | |
| 1058 { | |
| 1059 // Decode row of RLE'd data | |
| 1060 if (!dmPCXDecodeRLERow(fp, pcx.buf, pcx.bufLen)) | |
| 1061 { | |
| 1062 dmError("PCX: Error decoding RLE data.\n"); | |
| 1063 res = DMERR_INVALID_DATA; | |
| 1064 goto error; | |
| 1065 } | |
| 1066 | |
| 1067 // Decode bitplanes | |
| 1068 switch (hdr.nplanes) | |
| 1069 { | |
| 1070 case 1: | |
| 1071 memcpy(dp, pcx.buf, img->width); | |
| 1072 break; | |
| 1073 | |
| 1074 case 3: | |
| 1075 { | |
| 1076 Uint8 *dptr = dp, | |
| 1077 *sptr1 = pcx.buf, | |
| 1078 *sptr2 = sptr1 + hdr.bpl, | |
| 1079 *sptr3 = sptr2 + hdr.bpl; | |
| 1080 | |
| 1081 for (xc = 0; xc < img->width; xc++) | |
| 1082 { | |
| 1083 *dptr++ = *sptr1++; | |
| 1084 *dptr++ = *sptr2++; | |
| 1085 *dptr++ = *sptr3++; | |
| 1086 } | |
| 1087 } | |
| 1088 break; | |
| 1089 } | |
| 1090 | |
| 1091 dp += img->pitch; | |
| 1092 } | |
| 1093 | |
| 1094 // Read VGA palette | |
| 1095 if (paletted) | |
| 1096 { | |
|
451
fdc91f2a0d27
Modularize palette reading and handling code.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
1097 int i, ncolors; |
| 435 | 1098 Uint8 tmpb; |
| 1099 BOOL read; | |
| 1100 | |
| 1101 if (!dm_fread_byte(fp, &tmpb) || tmpb != 0x0C) | |
| 1102 { | |
| 1103 read = FALSE; | |
|
451
fdc91f2a0d27
Modularize palette reading and handling code.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
1104 ncolors = 16; |
| 435 | 1105 } |
| 1106 else | |
| 1107 { | |
| 1108 read = TRUE; | |
|
451
fdc91f2a0d27
Modularize palette reading and handling code.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
1109 ncolors = 256; |
| 435 | 1110 } |
| 1111 | |
|
460
0af039b6c0ae
Improve transparent color handling.
Matti Hamalainen <ccr@tnsp.org>
parents:
453
diff
changeset
|
1112 if (!dmImageAllocPalette(img, ncolors, -1)) |
| 435 | 1113 { |
| 1114 dmError("PCX: Could not allocate palette data!\n"); | |
| 1115 res = DMERR_MALLOC; | |
| 1116 goto error; | |
| 1117 } | |
| 1118 | |
| 1119 if (read) | |
| 1120 { | |
|
451
fdc91f2a0d27
Modularize palette reading and handling code.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
1121 if (!dmReadPaletteData(fp, img->pal, ncolors)) |
| 435 | 1122 { |
|
451
fdc91f2a0d27
Modularize palette reading and handling code.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
1123 dmError("PCX: Error reading palette.\n"); |
|
fdc91f2a0d27
Modularize palette reading and handling code.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
1124 return DMERR_FREAD; |
| 435 | 1125 } |
| 1126 } | |
| 1127 else | |
| 1128 { | |
| 1129 for (i = 0; i < img->ncolors; i++) | |
| 1130 { | |
| 1131 if (i < 16) | |
| 1132 { | |
| 1133 img->pal[i].r = hdr.colormap[i].r; | |
| 1134 img->pal[i].g = hdr.colormap[i].g; | |
| 1135 img->pal[i].b = hdr.colormap[i].b; | |
| 1136 } | |
| 1137 } | |
| 1138 } | |
| 1139 } | |
| 1140 | |
| 1141 error: | |
| 1142 dmFree(pcx.buf); | |
| 1143 return res; | |
| 1144 } | |
| 1145 | |
| 1146 | |
| 1147 int dmReadPCXImage(const char *filename, DMImage **pimg) | |
| 1148 { | |
| 1149 FILE *fp; | |
| 1150 int res; | |
| 1151 | |
| 1152 if ((fp = fopen(filename, "rb")) == NULL) | |
| 1153 { | |
| 1154 dmError("PCX: Could not open file '%s' for reading.\n", filename); | |
| 1155 return -15; | |
| 1156 } | |
| 1157 | |
| 1158 res = dmReadPCXImageFILE(fp, pimg); | |
| 1159 | |
| 1160 fclose(fp); | |
| 1161 return res; | |
| 1162 } | |
| 1163 | |
| 1164 | |
|
443
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1165 #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
|
1166 #define IFF_ID_ILBM 0x494C424D // "ILBM" |
| 464 | 1167 #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
|
1168 #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
|
1169 #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
|
1170 #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
|
1171 #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
|
1172 |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1173 #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
|
1174 #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
|
1175 #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
|
1176 #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
|
1177 |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1178 #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
|
1179 #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
|
1180 |
|
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
|
1181 #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
|
1182 #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
|
1183 #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
|
1184 |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1185 typedef struct |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1186 { |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1187 Uint32 id; |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1188 Uint32 size; |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1189 int count; |
| 445 | 1190 char str[6]; |
|
443
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1191 } DMIFFChunk; |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1192 |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1193 |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1194 typedef struct |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1195 { |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1196 Uint16 w, h; |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1197 Sint16 x, y; |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1198 Uint8 nplanes; |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1199 Uint8 masking; |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1200 Uint8 compression; |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1201 Uint8 pad1; |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1202 Uint16 transp; |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1203 Uint8 xasp, yasp; |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1204 Sint16 pagew, pageh; |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1205 } DMIFFBMHD; |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1206 |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1207 |
|
444
7d588807f91d
Clean up the IFF parser a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
443
diff
changeset
|
1208 typedef struct |
|
7d588807f91d
Clean up the IFF parser a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
443
diff
changeset
|
1209 { |
|
7d588807f91d
Clean up the IFF parser a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
443
diff
changeset
|
1210 DMIFFChunk chBMHD, chCMAP, chBODY; |
|
7d588807f91d
Clean up the IFF parser a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
443
diff
changeset
|
1211 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
|
1212 Uint32 camg; |
|
444
7d588807f91d
Clean up the IFF parser a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
443
diff
changeset
|
1213 int ncolors; |
|
7d588807f91d
Clean up the IFF parser a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
443
diff
changeset
|
1214 DMColor *pal; |
| 464 | 1215 BOOL paletted, planar; |
|
444
7d588807f91d
Clean up the IFF parser a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
443
diff
changeset
|
1216 } DMIFF; |
|
7d588807f91d
Clean up the IFF parser a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
443
diff
changeset
|
1217 |
|
7d588807f91d
Clean up the IFF parser a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
443
diff
changeset
|
1218 |
|
443
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1219 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
|
1220 { |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1221 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
|
1222 !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
|
1223 { |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1224 dmError("ILBM: Could not read IFF chunk header.\n"); |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1225 return FALSE; |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1226 } |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1227 else |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1228 return TRUE; |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1229 } |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1230 |
| 445 | 1231 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
|
1232 { |
| 445 | 1233 chunk->str[0] = (chunk->id >> 24) & 0xff; |
| 1234 chunk->str[1] = (chunk->id >> 16) & 0xff; | |
| 1235 chunk->str[2] = (chunk->id >> 8) & 0xff; | |
| 1236 chunk->str[3] = (chunk->id) & 0xff; | |
| 1237 chunk->str[4] = 0; | |
| 1238 return chunk->str; | |
|
443
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1239 } |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1240 |
|
444
7d588807f91d
Clean up the IFF parser a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
443
diff
changeset
|
1241 static BOOL dmSkipIFFChunkRest(FILE *fp, const DMIFFChunk *chunk, const Uint32 used) |
|
7d588807f91d
Clean up the IFF parser a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
443
diff
changeset
|
1242 { |
|
7d588807f91d
Clean up the IFF parser a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
443
diff
changeset
|
1243 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
|
1244 { |
| 465 | 1245 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
|
1246 chunk->size - used, used, chunk->size); |
|
444
7d588807f91d
Clean up the IFF parser a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
443
diff
changeset
|
1247 return fseeko(fp, chunk->size - used, SEEK_CUR) == 0; |
|
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
|
1248 } |
|
444
7d588807f91d
Clean up the IFF parser a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
443
diff
changeset
|
1249 else |
|
7d588807f91d
Clean up the IFF parser a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
443
diff
changeset
|
1250 return TRUE; |
|
7d588807f91d
Clean up the IFF parser a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
443
diff
changeset
|
1251 } |
|
7d588807f91d
Clean up the IFF parser a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
443
diff
changeset
|
1252 |
| 445 | 1253 static BOOL dmCheckIFFChunk(DMIFFChunk *dest, DMIFFChunk *chunk, |
| 1254 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
|
1255 { |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1256 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
|
1257 { |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1258 dmError("ILBM: Multiple instances of chunk %s found.\n", |
| 445 | 1259 dmGetIFFChunkID(chunk)); |
|
443
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1260 return FALSE; |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1261 } |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1262 |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1263 dest->count++; |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1264 |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1265 if (chunk->size < minSize) |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1266 return FALSE; |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1267 |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1268 return TRUE; |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1269 } |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1270 |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1271 |
|
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
|
1272 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
|
1273 { |
|
0e27860ddcfe
Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working.
Matti Hamalainen <ccr@tnsp.org>
parents:
445
diff
changeset
|
1274 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
|
1275 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
|
1276 { |
|
0e27860ddcfe
Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working.
Matti Hamalainen <ccr@tnsp.org>
parents:
445
diff
changeset
|
1277 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
|
1278 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
|
1279 |
|
0e27860ddcfe
Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working.
Matti Hamalainen <ccr@tnsp.org>
parents:
445
diff
changeset
|
1280 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
|
1281 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
|
1282 |
|
0e27860ddcfe
Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working.
Matti Hamalainen <ccr@tnsp.org>
parents:
445
diff
changeset
|
1283 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
|
1284 { |
|
0e27860ddcfe
Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working.
Matti Hamalainen <ccr@tnsp.org>
parents:
445
diff
changeset
|
1285 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
|
1286 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
|
1287 } |
|
0e27860ddcfe
Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working.
Matti Hamalainen <ccr@tnsp.org>
parents:
445
diff
changeset
|
1288 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
|
1289 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
|
1290 { |
|
0e27860ddcfe
Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working.
Matti Hamalainen <ccr@tnsp.org>
parents:
445
diff
changeset
|
1291 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
|
1292 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
|
1293 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
|
1294 |
|
0e27860ddcfe
Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working.
Matti Hamalainen <ccr@tnsp.org>
parents:
445
diff
changeset
|
1295 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
|
1296 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
|
1297 } |
|
0e27860ddcfe
Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working.
Matti Hamalainen <ccr@tnsp.org>
parents:
445
diff
changeset
|
1298 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
|
1299 { |
|
0e27860ddcfe
Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working.
Matti Hamalainen <ccr@tnsp.org>
parents:
445
diff
changeset
|
1300 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
|
1301 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
|
1302 { |
|
0e27860ddcfe
Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working.
Matti Hamalainen <ccr@tnsp.org>
parents:
445
diff
changeset
|
1303 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
|
1304 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
|
1305 |
|
0e27860ddcfe
Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working.
Matti Hamalainen <ccr@tnsp.org>
parents:
445
diff
changeset
|
1306 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
|
1307 } |
|
0e27860ddcfe
Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working.
Matti Hamalainen <ccr@tnsp.org>
parents:
445
diff
changeset
|
1308 } |
|
0e27860ddcfe
Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working.
Matti Hamalainen <ccr@tnsp.org>
parents:
445
diff
changeset
|
1309 } 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
|
1310 |
|
0e27860ddcfe
Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working.
Matti Hamalainen <ccr@tnsp.org>
parents:
445
diff
changeset
|
1311 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
|
1312 } |
|
0e27860ddcfe
Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working.
Matti Hamalainen <ccr@tnsp.org>
parents:
445
diff
changeset
|
1313 |
|
0e27860ddcfe
Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working.
Matti Hamalainen <ccr@tnsp.org>
parents:
445
diff
changeset
|
1314 |
|
0e27860ddcfe
Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working.
Matti Hamalainen <ccr@tnsp.org>
parents:
445
diff
changeset
|
1315 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
|
1316 { |
|
0e27860ddcfe
Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working.
Matti Hamalainen <ccr@tnsp.org>
parents:
445
diff
changeset
|
1317 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
|
1318 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
|
1319 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
|
1320 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
|
1321 } |
|
0e27860ddcfe
Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working.
Matti Hamalainen <ccr@tnsp.org>
parents:
445
diff
changeset
|
1322 |
|
0e27860ddcfe
Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working.
Matti Hamalainen <ccr@tnsp.org>
parents:
445
diff
changeset
|
1323 |
|
0e27860ddcfe
Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working.
Matti Hamalainen <ccr@tnsp.org>
parents:
445
diff
changeset
|
1324 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
|
1325 { |
|
0e27860ddcfe
Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working.
Matti Hamalainen <ccr@tnsp.org>
parents:
445
diff
changeset
|
1326 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
|
1327 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
|
1328 { |
|
0e27860ddcfe
Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working.
Matti Hamalainen <ccr@tnsp.org>
parents:
445
diff
changeset
|
1329 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
|
1330 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
|
1331 } |
|
0e27860ddcfe
Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working.
Matti Hamalainen <ccr@tnsp.org>
parents:
445
diff
changeset
|
1332 } |
|
0e27860ddcfe
Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working.
Matti Hamalainen <ccr@tnsp.org>
parents:
445
diff
changeset
|
1333 |
|
0e27860ddcfe
Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working.
Matti Hamalainen <ccr@tnsp.org>
parents:
445
diff
changeset
|
1334 |
|
0e27860ddcfe
Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working.
Matti Hamalainen <ccr@tnsp.org>
parents:
445
diff
changeset
|
1335 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
|
1336 { |
|
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
|
1337 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
|
1338 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
|
1339 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
|
1340 int yc, res = DMERR_OK; |
|
0e27860ddcfe
Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working.
Matti Hamalainen <ccr@tnsp.org>
parents:
445
diff
changeset
|
1341 |
|
0e27860ddcfe
Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working.
Matti Hamalainen <ccr@tnsp.org>
parents:
445
diff
changeset
|
1342 *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
|
1343 |
|
0e27860ddcfe
Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working.
Matti Hamalainen <ccr@tnsp.org>
parents:
445
diff
changeset
|
1344 // Allocate image |
|
0e27860ddcfe
Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working.
Matti Hamalainen <ccr@tnsp.org>
parents:
445
diff
changeset
|
1345 if ((*pimg = img = dmImageAlloc(iff->bmhd.w, iff->bmhd.h)) == 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
|
1346 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
|
1347 |
|
0e27860ddcfe
Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working.
Matti Hamalainen <ccr@tnsp.org>
parents:
445
diff
changeset
|
1348 // 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
|
1349 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
|
1350 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
|
1351 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
|
1352 |
| 465 | 1353 dmMsg(3, "ILBM: plane row size %d bytes.\n", bufLen); |
|
447
0e27860ddcfe
Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working.
Matti Hamalainen <ccr@tnsp.org>
parents:
445
diff
changeset
|
1354 |
|
0e27860ddcfe
Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working.
Matti Hamalainen <ccr@tnsp.org>
parents:
445
diff
changeset
|
1355 // 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
|
1356 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
|
1357 { |
|
0e27860ddcfe
Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working.
Matti Hamalainen <ccr@tnsp.org>
parents:
445
diff
changeset
|
1358 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
|
1359 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
|
1360 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
|
1361 |
|
0e27860ddcfe
Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working.
Matti Hamalainen <ccr@tnsp.org>
parents:
445
diff
changeset
|
1362 memset(dp, 0, 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
|
1363 |
|
0e27860ddcfe
Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working.
Matti Hamalainen <ccr@tnsp.org>
parents:
445
diff
changeset
|
1364 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
|
1365 { |
|
0e27860ddcfe
Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working.
Matti Hamalainen <ccr@tnsp.org>
parents:
445
diff
changeset
|
1366 // 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
|
1367 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
|
1368 { |
| 464 | 1369 dmError("ILBM: Error in reading image plane #%d @ %d.\n", 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
|
1370 res = DMERR_FREAD; |
|
0e27860ddcfe
Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working.
Matti Hamalainen <ccr@tnsp.org>
parents:
445
diff
changeset
|
1371 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
|
1372 } |
|
0e27860ddcfe
Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working.
Matti Hamalainen <ccr@tnsp.org>
parents:
445
diff
changeset
|
1373 |
|
0e27860ddcfe
Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working.
Matti Hamalainen <ccr@tnsp.org>
parents:
445
diff
changeset
|
1374 // 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
|
1375 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
|
1376 |
|
0e27860ddcfe
Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working.
Matti Hamalainen <ccr@tnsp.org>
parents:
445
diff
changeset
|
1377 *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
|
1378 } |
|
0e27860ddcfe
Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working.
Matti Hamalainen <ccr@tnsp.org>
parents:
445
diff
changeset
|
1379 |
|
0e27860ddcfe
Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working.
Matti Hamalainen <ccr@tnsp.org>
parents:
445
diff
changeset
|
1380 // 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
|
1381 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
|
1382 { |
|
0e27860ddcfe
Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working.
Matti Hamalainen <ccr@tnsp.org>
parents:
445
diff
changeset
|
1383 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
|
1384 |
|
0e27860ddcfe
Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working.
Matti Hamalainen <ccr@tnsp.org>
parents:
445
diff
changeset
|
1385 // 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
|
1386 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
|
1387 { |
|
0e27860ddcfe
Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working.
Matti Hamalainen <ccr@tnsp.org>
parents:
445
diff
changeset
|
1388 dmError("ILBM: Error in reading mask plane.\n"); |
|
0e27860ddcfe
Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working.
Matti Hamalainen <ccr@tnsp.org>
parents:
445
diff
changeset
|
1389 res = DMERR_FREAD; |
|
0e27860ddcfe
Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working.
Matti Hamalainen <ccr@tnsp.org>
parents:
445
diff
changeset
|
1390 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
|
1391 } |
|
0e27860ddcfe
Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working.
Matti Hamalainen <ccr@tnsp.org>
parents:
445
diff
changeset
|
1392 |
|
0e27860ddcfe
Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working.
Matti Hamalainen <ccr@tnsp.org>
parents:
445
diff
changeset
|
1393 // 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
|
1394 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
|
1395 { |
|
0e27860ddcfe
Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working.
Matti Hamalainen <ccr@tnsp.org>
parents:
445
diff
changeset
|
1396 const Uint8 data = (buf[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
|
1397 |
|
0e27860ddcfe
Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working.
Matti Hamalainen <ccr@tnsp.org>
parents:
445
diff
changeset
|
1398 // 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
|
1399 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
|
1400 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
|
1401 } |
|
0e27860ddcfe
Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working.
Matti Hamalainen <ccr@tnsp.org>
parents:
445
diff
changeset
|
1402 |
|
0e27860ddcfe
Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working.
Matti Hamalainen <ccr@tnsp.org>
parents:
445
diff
changeset
|
1403 *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
|
1404 } |
|
0e27860ddcfe
Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working.
Matti Hamalainen <ccr@tnsp.org>
parents:
445
diff
changeset
|
1405 } |
|
0e27860ddcfe
Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working.
Matti Hamalainen <ccr@tnsp.org>
parents:
445
diff
changeset
|
1406 |
|
0e27860ddcfe
Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working.
Matti Hamalainen <ccr@tnsp.org>
parents:
445
diff
changeset
|
1407 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
|
1408 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
|
1409 return res; |
|
444
7d588807f91d
Clean up the IFF parser a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
443
diff
changeset
|
1410 } |
|
7d588807f91d
Clean up the IFF parser a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
443
diff
changeset
|
1411 |
|
7d588807f91d
Clean up the IFF parser a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
443
diff
changeset
|
1412 |
| 464 | 1413 int dmDecodePBMBody(FILE *fp, DMIFF *iff, DMImage **pimg, Uint32 *read) |
| 1414 { | |
| 1415 DMImage *img; | |
| 1416 int yc, res = DMERR_OK; | |
| 1417 | |
| 1418 *read = 0; | |
| 1419 | |
| 1420 // Allocate image | |
| 1421 if ((*pimg = img = dmImageAlloc(iff->bmhd.w, iff->bmhd.h)) == NULL) | |
| 1422 return DMERR_MALLOC; | |
| 1423 | |
| 1424 // Decode the chunk | |
| 1425 for (yc = 0; yc < img->height; yc++) | |
| 1426 { | |
| 1427 Uint8 *dp = img->data + (yc * img->pitch); | |
| 1428 | |
| 1429 if (!dmIFFReadOneRow(fp, iff, dp, img->width)) | |
| 1430 { | |
| 1431 dmError("ILBM: Error in reading image row #%d.\n", yc); | |
| 1432 res = DMERR_FREAD; | |
| 1433 goto error; | |
| 1434 } | |
| 1435 | |
| 1436 *read += img->width; | |
| 1437 } | |
| 1438 | |
| 1439 error: | |
| 1440 return res; | |
| 1441 } | |
| 1442 | |
| 1443 | |
|
443
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1444 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
|
1445 { |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1446 Uint32 idILBM; |
|
444
7d588807f91d
Clean up the IFF parser a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
443
diff
changeset
|
1447 DMIFFChunk chunk; |
|
7d588807f91d
Clean up the IFF parser a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
443
diff
changeset
|
1448 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
|
1449 Uint32 read; |
|
444
7d588807f91d
Clean up the IFF parser a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
443
diff
changeset
|
1450 BOOL parsed = FALSE; |
|
7d588807f91d
Clean up the IFF parser a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
443
diff
changeset
|
1451 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
|
1452 |
|
444
7d588807f91d
Clean up the IFF parser a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
443
diff
changeset
|
1453 memset(&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
|
1454 |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1455 // Read IFF FORM header |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1456 if (!dmReadIFFChunk(fp, &chunk) || |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1457 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
|
1458 chunk.size < 32) |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1459 { |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1460 dmError("ILBM: Not a IFF file.\n"); |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1461 return DMERR_FREAD; |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1462 } |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1463 |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1464 // Check IFF ILBM signature |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1465 if (!dm_fread_be32(fp, &idILBM) || |
| 464 | 1466 (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
|
1467 { |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1468 dmError("ILBM: Not a ILBM file.\n"); |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1469 return DMERR_INVALID_DATA; |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1470 } |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1471 |
| 464 | 1472 iff.planar = (idILBM == IFF_ID_ILBM); |
| 1473 | |
|
443
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1474 while (!parsed && !feof(fp)) |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1475 { |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1476 if (!dmReadIFFChunk(fp, &chunk)) |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1477 { |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1478 dmError("ILBM: Error reading IFF ILBM data.\n"); |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1479 return DMERR_FREAD; |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1480 } |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1481 |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1482 switch (chunk.id) |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1483 { |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1484 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
|
1485 // Check for multiple occurences of BMHD |
|
444
7d588807f91d
Clean up the IFF parser a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
443
diff
changeset
|
1486 if (!dmCheckIFFChunk(&iff.chBMHD, &chunk, FALSE, sizeof(iff.bmhd))) |
|
443
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1487 return DMERR_FREAD; |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1488 |
|
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
|
1489 // Read BMHD data |
|
444
7d588807f91d
Clean up the IFF parser a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
443
diff
changeset
|
1490 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
|
1491 !dm_fread_be16(fp, &iff.bmhd.h) || |
|
7d588807f91d
Clean up the IFF parser a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
443
diff
changeset
|
1492 !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
|
1493 !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
|
1494 !dm_fread_byte(fp, &iff.bmhd.nplanes) || |
|
7d588807f91d
Clean up the IFF parser a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
443
diff
changeset
|
1495 !dm_fread_byte(fp, &iff.bmhd.masking) || |
|
7d588807f91d
Clean up the IFF parser a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
443
diff
changeset
|
1496 !dm_fread_byte(fp, &iff.bmhd.compression) || |
|
7d588807f91d
Clean up the IFF parser a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
443
diff
changeset
|
1497 !dm_fread_byte(fp, &iff.bmhd.pad1) || |
|
7d588807f91d
Clean up the IFF parser a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
443
diff
changeset
|
1498 !dm_fread_be16(fp, &iff.bmhd.transp) || |
|
7d588807f91d
Clean up the IFF parser a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
443
diff
changeset
|
1499 !dm_fread_byte(fp, &iff.bmhd.xasp) || |
|
7d588807f91d
Clean up the IFF parser a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
443
diff
changeset
|
1500 !dm_fread_byte(fp, &iff.bmhd.yasp) || |
|
7d588807f91d
Clean up the IFF parser a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
443
diff
changeset
|
1501 !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
|
1502 !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
|
1503 { |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1504 dmError("ILBM: Error reading BMHD chunk.\n"); |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1505 return DMERR_FREAD; |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1506 } |
| 465 | 1507 dmMsg(3, "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
|
1508 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
|
1509 iff.bmhd.nplanes, iff.bmhd.compression, iff.bmhd.masking); |
|
444
7d588807f91d
Clean up the IFF parser a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
443
diff
changeset
|
1510 |
|
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
|
1511 // 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
|
1512 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
|
1513 (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
|
1514 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
|
1515 (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
|
1516 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
|
1517 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
|
1518 { |
|
0e27860ddcfe
Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working.
Matti Hamalainen <ccr@tnsp.org>
parents:
445
diff
changeset
|
1519 dmError("ILBM: Unsupported features, refusing to load.\n"); |
|
452
d1f7ddc84c7c
Return more sensible error values where appropriate instead of just
Matti Hamalainen <ccr@tnsp.org>
parents:
451
diff
changeset
|
1520 return DMERR_NOT_SUPPORTED; |
|
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
|
1521 } |
|
0e27860ddcfe
Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working.
Matti Hamalainen <ccr@tnsp.org>
parents:
445
diff
changeset
|
1522 |
|
444
7d588807f91d
Clean up the IFF parser a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
443
diff
changeset
|
1523 if (!dmSkipIFFChunkRest(fp, &chunk, sizeof(iff.bmhd))) |
|
7d588807f91d
Clean up the IFF parser a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
443
diff
changeset
|
1524 return DMERR_FREAD; |
|
443
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1525 break; |
|
444
7d588807f91d
Clean up the IFF parser a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
443
diff
changeset
|
1526 |
|
443
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1527 |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1528 case IFF_ID_CMAP: |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1529 // Check for multiple occurences of CMAP |
|
444
7d588807f91d
Clean up the IFF parser a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
443
diff
changeset
|
1530 if (!dmCheckIFFChunk(&iff.chCMAP, &chunk, FALSE, 3)) |
|
443
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1531 return DMERR_FREAD; |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1532 |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1533 // Check for sanity |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1534 if (chunk.size % 3 != 0) |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1535 dmError("ILBM: CMAP chunk size not divisible by 3, possibly broken file.\n"); |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1536 |
|
444
7d588807f91d
Clean up the IFF parser a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
443
diff
changeset
|
1537 iff.ncolors = chunk.size / 3; |
| 465 | 1538 dmMsg(3, "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
|
1539 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
|
1540 |
|
444
7d588807f91d
Clean up the IFF parser a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
443
diff
changeset
|
1541 if (iff.bmhd.nplanes > 0 && iff.ncolors != 1 << iff.bmhd.nplanes) |
| 465 | 1542 dmMsg(3, "ILBM: Expected %d entries in CMAP.\n", 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
|
1543 |
|
451
fdc91f2a0d27
Modularize palette reading and handling code.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
1544 // Read palette |
|
fdc91f2a0d27
Modularize palette reading and handling code.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
1545 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
|
1546 { |
|
461
c7a3aacbd55e
Implement transparent color in IFF ILBM reader and ctransp setting in PNG reader.
Matti Hamalainen <ccr@tnsp.org>
parents:
460
diff
changeset
|
1547 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
|
1548 (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
|
1549 { |
|
451
fdc91f2a0d27
Modularize palette reading and handling code.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
1550 dmError("ILBM: Could not allocate palette data.\n"); |
|
fdc91f2a0d27
Modularize palette reading and handling code.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
1551 return DMERR_MALLOC; |
|
fdc91f2a0d27
Modularize palette reading and handling code.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
1552 } |
|
fdc91f2a0d27
Modularize palette reading and handling code.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
1553 if (!dmReadPaletteData(fp, iff.pal, iff.ncolors)) |
|
fdc91f2a0d27
Modularize palette reading and handling code.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
1554 { |
|
fdc91f2a0d27
Modularize palette reading and handling code.
Matti Hamalainen <ccr@tnsp.org>
parents:
449
diff
changeset
|
1555 dmError("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
|
1556 return DMERR_FREAD; |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1557 } |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1558 } |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1559 |
|
444
7d588807f91d
Clean up the IFF parser a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
443
diff
changeset
|
1560 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
|
1561 parsed = TRUE; |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1562 break; |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1563 |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1564 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
|
1565 // Check for multiple occurences of CMAP |
|
444
7d588807f91d
Clean up the IFF parser a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
443
diff
changeset
|
1566 if (!dmCheckIFFChunk(&iff.chBODY, &chunk, FALSE, 1)) |
|
443
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1567 return DMERR_FREAD; |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1568 |
|
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
|
1569 // Check for sanity |
|
444
7d588807f91d
Clean up the IFF parser a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
443
diff
changeset
|
1570 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
|
1571 { |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1572 dmError("ILBM: BODY chunk before BMHD?\n"); |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1573 return DMERR_INVALID_DATA; |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1574 } |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1575 |
| 465 | 1576 dmMsg(3, "ILBM: BODY chunk size %d bytes\n", chunk.size); |
|
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 |
|
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 // Decode the body |
| 464 | 1579 if (iff.planar) |
| 1580 { | |
| 1581 if ((res = dmDecodeILBMBody(fp, &iff, pimg, &read)) != DMERR_OK) | |
| 1582 return res; | |
| 1583 } | |
| 1584 else | |
| 1585 { | |
| 1586 if ((res = dmDecodePBMBody(fp, &iff, pimg, &read)) != DMERR_OK) | |
| 1587 return res; | |
| 1588 } | |
|
444
7d588807f91d
Clean up the IFF parser a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
443
diff
changeset
|
1589 |
|
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
|
1590 if (!dmSkipIFFChunkRest(fp, &chunk, read)) |
|
443
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1591 return DMERR_FREAD; |
|
447
0e27860ddcfe
Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working.
Matti Hamalainen <ccr@tnsp.org>
parents:
445
diff
changeset
|
1592 |
|
444
7d588807f91d
Clean up the IFF parser a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
443
diff
changeset
|
1593 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
|
1594 parsed = TRUE; |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1595 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
|
1596 |
|
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
|
1597 |
|
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
|
1598 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
|
1599 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
|
1600 { |
|
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
|
1601 dmError("ILBM: Error reading CAMG chunk.\n"); |
|
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
|
1602 return DMERR_FREAD; |
|
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
|
1603 } |
|
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
|
1604 |
| 465 | 1605 dmMsg(3, "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
|
1606 |
|
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
|
1607 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
|
1608 { |
|
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
|
1609 dmError("ILBM: HAM files are not supported.\n"); |
|
452
d1f7ddc84c7c
Return more sensible error values where appropriate instead of just
Matti Hamalainen <ccr@tnsp.org>
parents:
451
diff
changeset
|
1610 return DMERR_NOT_SUPPORTED; |
|
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
|
1611 } |
|
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
|
1612 |
|
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
|
1613 if (!dmSkipIFFChunkRest(fp, &chunk, 4)) |
|
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
|
1614 return DMERR_FREAD; |
|
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
|
1615 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
|
1616 |
|
443
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1617 |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1618 default: |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1619 { |
| 465 | 1620 dmMsg(4, "Unknown chunk ID '%s', size %d\n", |
| 445 | 1621 dmGetIFFChunkID(&chunk), chunk.size); |
|
443
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1622 |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1623 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
|
1624 { |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1625 dmError("ILBM: Error skipping in file."); |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1626 return DMERR_FREAD; |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1627 } |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1628 } |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1629 break; |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1630 } |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1631 |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1632 if (chunk.size & 1) |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1633 fgetc(fp); |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1634 } |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1635 |
|
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
|
1636 // 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
|
1637 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
|
1638 { |
|
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
|
1639 // 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
|
1640 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
|
1641 { |
| 834 | 1642 void *ptmp; |
| 1643 | |
|
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
|
1644 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
|
1645 { |
|
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
|
1646 dmError("ILBM: Halfbrite enabled, but ncolors > 128.\n"); |
|
452
d1f7ddc84c7c
Return more sensible error values where appropriate instead of just
Matti Hamalainen <ccr@tnsp.org>
parents:
451
diff
changeset
|
1647 return DMERR_NOT_SUPPORTED; |
|
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
|
1648 } |
|
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
|
1649 |
| 834 | 1650 if ((ptmp = dmRealloc(iff.pal, sizeof(DMColor) * iff.ncolors * 2)) == NULL) |
| 1651 { | |
| 1652 dmFree(iff.pal); | |
| 1653 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
|
1654 return DMERR_MALLOC; |
| 834 | 1655 } |
| 1656 else | |
| 1657 iff.pal = ptmp; | |
|
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
|
1658 |
|
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
|
1659 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
|
1660 { |
|
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
|
1661 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
|
1662 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
|
1663 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
|
1664 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
|
1665 } |
|
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
|
1666 } |
|
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
|
1667 |
|
447
0e27860ddcfe
Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working.
Matti Hamalainen <ccr@tnsp.org>
parents:
445
diff
changeset
|
1668 (*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
|
1669 (*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
|
1670 } |
|
0e27860ddcfe
Finish initial implementation of IFF ILBM loader. And whoa .. it seems to be working.
Matti Hamalainen <ccr@tnsp.org>
parents:
445
diff
changeset
|
1671 |
|
443
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1672 return res; |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1673 } |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1674 |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1675 |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1676 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
|
1677 { |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1678 FILE *fp; |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1679 int res; |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1680 |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1681 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
|
1682 { |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1683 dmError("ILBM: Could not open file '%s' for reading.\n", filename); |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1684 return DMERR_FOPEN; |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1685 } |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1686 |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1687 res = dmReadILBMImageFILE(fp, pimg); |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1688 |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1689 fclose(fp); |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1690 return res; |
|
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 |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1693 |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1694 |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1695 |
| 435 | 1696 static int fmtProbePNG(const Uint8 *buf, const size_t len) |
| 1697 { | |
| 1698 if (len > 64 && buf[0] == 0x89 && | |
| 1699 buf[1] == 'P' && buf[2] == 'N' && buf[3] == 'G' && | |
| 1700 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
|
1701 { |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1702 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
|
1703 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
|
1704 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
|
1705 else |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1706 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
|
1707 } |
| 435 | 1708 |
| 1709 return DM_PROBE_SCORE_FALSE; | |
| 1710 } | |
| 1711 | |
| 1712 | |
| 1713 static int fmtProbePCX(const Uint8 *buf, const size_t len) | |
| 1714 { | |
|
443
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1715 if (len > 128 + 32 && |
| 435 | 1716 buf[0] == 10 && |
|
443
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1717 (buf[1] == 5 || buf[1] == 2 || buf[1] == 3) && |
| 435 | 1718 buf[2] == 1 && |
|
443
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1719 (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
|
1720 buf[65] >= 1 && buf[65] <= 4) |
| 435 | 1721 return DM_PROBE_SCORE_GOOD; |
| 1722 | |
| 1723 return DM_PROBE_SCORE_FALSE; | |
| 1724 } | |
| 1725 | |
| 1726 | |
|
443
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1727 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
|
1728 { |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1729 if (len > 32 && |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1730 buf[ 0] == 'F' && buf[ 1] == 'O' && |
| 464 | 1731 buf[ 2] == 'R' && buf[ 3] == 'M' && ( |
| 1732 (buf[ 8] == 'I' && buf[ 9] == 'L' && buf[10] == 'B' && buf[11] == 'M') || | |
| 1733 (buf[ 8] == 'P' && buf[ 9] == 'B' && buf[10] == 'M' && buf[11] == 0x20) | |
| 1734 )) | |
|
443
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1735 { |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1736 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
|
1737 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
|
1738 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
|
1739 else |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1740 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
|
1741 } |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1742 |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1743 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
|
1744 } |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1745 |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1746 |
| 435 | 1747 DMImageFormat dmImageFormatList[IMGFMT_LAST] = |
| 1748 { | |
| 1749 { | |
| 1750 "PNG", "Portable Network Graphics", | |
| 1751 fmtProbePNG, | |
| 1752 #ifdef DM_USE_LIBPNG | |
|
453
349a2ff11531
Implement PNG (1-8bpp indexed) reading support via libPNG.
Matti Hamalainen <ccr@tnsp.org>
parents:
452
diff
changeset
|
1753 dmReadPNGImage, dmReadPNGImageFILE, |
| 435 | 1754 dmWritePNGImage, dmWritePNGImageFILE, |
| 1755 #else | |
| 1756 NULL, NULL, | |
|
453
349a2ff11531
Implement PNG (1-8bpp indexed) reading support via libPNG.
Matti Hamalainen <ccr@tnsp.org>
parents:
452
diff
changeset
|
1757 NULL, NULL, |
| 435 | 1758 #endif |
| 1759 }, | |
| 1760 { | |
| 1761 "PPM", "Portable PixMap", | |
| 1762 NULL, | |
| 1763 NULL, NULL, | |
| 1764 dmWritePPMImage, dmWritePPMImageFILE, | |
| 1765 }, | |
| 1766 { | |
| 1767 "PCX", "Z-Soft Paintbrush", | |
| 1768 fmtProbePCX, | |
| 1769 dmReadPCXImage, dmReadPCXImageFILE, | |
| 1770 dmWritePCXImage, dmWritePCXImageFILE, | |
| 1771 }, | |
| 1772 { | |
|
443
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1773 "ILBM", "IFF ILBM", |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1774 fmtProbeILBM, |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1775 dmReadILBMImage, dmReadILBMImageFILE, |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1776 NULL, NULL, |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1777 }, |
|
f7c9d1619c74
Beginnings of IFF ILBM reader. Not functional, only chunk parsing,
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
1778 { |
|
566
d400e32b62d9
Add a slightly different raw output format.
Matti Hamalainen <ccr@tnsp.org>
parents:
487
diff
changeset
|
1779 "RAW", "Plain bitplaned (interleaved or non-interleaved) RAW", |
|
d400e32b62d9
Add a slightly different raw output format.
Matti Hamalainen <ccr@tnsp.org>
parents:
487
diff
changeset
|
1780 NULL, |
|
d400e32b62d9
Add a slightly different raw output format.
Matti Hamalainen <ccr@tnsp.org>
parents:
487
diff
changeset
|
1781 NULL, NULL, |
|
d400e32b62d9
Add a slightly different raw output format.
Matti Hamalainen <ccr@tnsp.org>
parents:
487
diff
changeset
|
1782 dmWriteRAWImage, dmWriteRAWImageFILE, |
|
d400e32b62d9
Add a slightly different raw output format.
Matti Hamalainen <ccr@tnsp.org>
parents:
487
diff
changeset
|
1783 }, |
|
d400e32b62d9
Add a slightly different raw output format.
Matti Hamalainen <ccr@tnsp.org>
parents:
487
diff
changeset
|
1784 { |
| 435 | 1785 "ARAW", "IFFMaster Amiga RAW", |
| 1786 NULL, | |
| 1787 NULL, NULL, | |
|
566
d400e32b62d9
Add a slightly different raw output format.
Matti Hamalainen <ccr@tnsp.org>
parents:
487
diff
changeset
|
1788 dmWriteRAWImage, dmWriteRAWImageFILE, |
| 435 | 1789 } |
| 1790 }; | |
| 1791 | |
| 1792 | |
| 1793 int dmImageProbeGeneric(const Uint8 *buf, const size_t len, DMImageFormat **pfmt, int *index) | |
| 1794 { | |
| 1795 int i, scoreMax = DM_PROBE_SCORE_FALSE, scoreIndex = -1; | |
| 1796 | |
| 1797 for (i = 0; i < IMGFMT_LAST; i++) | |
| 1798 { | |
| 1799 DMImageFormat *fmt = &dmImageFormatList[i]; | |
|
442
a67600e186d0
Fix probing to handle NULL probe functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
440
diff
changeset
|
1800 if (fmt->probe != NULL) |
| 435 | 1801 { |
|
442
a67600e186d0
Fix probing to handle NULL probe functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
440
diff
changeset
|
1802 int score = fmt->probe(buf, len); |
|
a67600e186d0
Fix probing to handle NULL probe functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
440
diff
changeset
|
1803 if (score > scoreMax) |
|
a67600e186d0
Fix probing to handle NULL probe functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
440
diff
changeset
|
1804 { |
|
a67600e186d0
Fix probing to handle NULL probe functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
440
diff
changeset
|
1805 scoreMax = score; |
|
a67600e186d0
Fix probing to handle NULL probe functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
440
diff
changeset
|
1806 scoreIndex = i; |
|
a67600e186d0
Fix probing to handle NULL probe functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
440
diff
changeset
|
1807 } |
| 435 | 1808 } |
| 1809 } | |
| 1810 | |
| 1811 if (scoreIndex >= 0) | |
| 1812 { | |
| 1813 *pfmt = &dmImageFormatList[scoreIndex]; | |
| 1814 *index = scoreIndex; | |
| 1815 return scoreMax; | |
| 1816 } | |
| 1817 else | |
| 1818 return DM_PROBE_SCORE_FALSE; | |
| 1819 } |