#define BMPRLE_ENDOFBMP 1
#define BMPRLE_DELTA 2
+#define SIGNBIT32 ((i_upacked_t)1U << 31)
+#define SIGNBIT16 ((i_upacked_t)1U << 15)
+
+#define SIGNMAX32 ((1UL << 31) - 1)
+
static int read_packed(io_glue *ig, char *format, ...);
static int write_packed(io_glue *ig, char *format, ...);
static int write_bmphead(io_glue *ig, i_img *im, int bit_count,
int bit_count, int clr_used, int compression,
long offbits, int allow_incomplete);
+/* used for the read_packed() and write_packed() functions, an integer
+ * type */
+typedef long i_packed_t;
+typedef unsigned long i_upacked_t;
+
/*
=item i_writebmp_wiol(im, io_glue)
*/
int
i_writebmp_wiol(i_img *im, io_glue *ig) {
- io_glue_commit_types(ig);
i_clear_error();
/* pick a format */
i_img *
i_readbmp_wiol(io_glue *ig, int allow_incomplete) {
- int b_magic, m_magic, filesize, res1, res2, infohead_size;
- int xsize, ysize, planes, bit_count, compression, size_image, xres, yres;
- int clr_used, clr_important, offbits;
+ i_packed_t b_magic, m_magic, filesize, res1, res2, infohead_size;
+ i_packed_t xsize, ysize, planes, bit_count, compression, size_image, xres, yres;
+ i_packed_t clr_used, clr_important, offbits;
i_img *im;
mm_log((1, "i_readbmp_wiol(ig %p)\n", ig));
- io_glue_commit_types(ig);
i_clear_error();
- if (!read_packed(ig, "CCVvvVVVVvvVVVVVV", &b_magic, &m_magic, &filesize,
+ if (!read_packed(ig, "CCVvvVVV!V!vvVVVVVV", &b_magic, &m_magic, &filesize,
&res1, &res2, &offbits, &infohead_size,
&xsize, &ysize, &planes,
&bit_count, &compression, &size_image, &xres, &yres,
mm_log((1, " bmp header: filesize %d offbits %d xsize %d ysize %d planes %d "
"bit_count %d compression %d size %d xres %d yres %d clr_used %d "
- "clr_important %d\n", filesize, offbits, xsize, ysize, planes,
- bit_count, compression, size_image, xres, yres, clr_used,
- clr_important));
+ "clr_important %d\n", (int)filesize, (int)offbits, (int)xsize,
+ (int)ysize, (int)planes, (int)bit_count, (int)compression,
+ (int)size_image, (int)xres, (int)yres, (int)clr_used,
+ (int)clr_important));
if (!i_int_check_image_file_limits(xsize, abs(ysize), 3, sizeof(i_sample_t))) {
mm_log((1, "i_readbmp_wiol: image size exceeds limits\n"));
break;
default:
- i_push_errorf(0, "unknown bit count for BMP file (%d)", bit_count);
+ i_push_errorf(0, "unknown bit count for BMP file (%d)", (int)bit_count);
return NULL;
}
=cut
*/
-static
-int read_packed(io_glue *ig, char *format, ...) {
+static int
+read_packed(io_glue *ig, char *format, ...) {
unsigned char buf[4];
va_list ap;
- int *p;
+ i_packed_t *p;
+ i_packed_t work;
+ int code;
+ int shrieking; /* format code has a ! flag */
va_start(ap, format);
while (*format) {
- p = va_arg(ap, int *);
+ p = va_arg(ap, i_packed_t *);
- switch (*format) {
+ code = *format++;
+ shrieking = *format == '!';
+ if (shrieking) ++format;
+
+ switch (code) {
case 'v':
- if (ig->readcb(ig, buf, 2) != 2)
+ if (i_io_read(ig, buf, 2) != 2)
return 0;
- *p = buf[0] + (buf[1] << 8);
+ work = buf[0] + ((i_packed_t)buf[1] << 8);
+ if (shrieking)
+ *p = (work ^ SIGNBIT16) - SIGNBIT16;
+ else
+ *p = work;
break;
case 'V':
- if (ig->readcb(ig, buf, 4) != 4)
+ if (i_io_read(ig, buf, 4) != 4)
return 0;
- *p = buf[0] + (buf[1] << 8) + (buf[2] << 16) + (buf[3] << 24);
+ work = buf[0] + (buf[1] << 8) + ((i_packed_t)buf[2] << 16) + ((i_packed_t)buf[3] << 24);
+ if (shrieking)
+ *p = (work ^ SIGNBIT32) - SIGNBIT32;
+ else
+ *p = work;
break;
case 'C':
- if (ig->readcb(ig, buf, 1) != 1)
+ if (i_io_read(ig, buf, 1) != 1)
return 0;
*p = buf[0];
break;
case 'c':
- if (ig->readcb(ig, buf, 1) != 1)
+ if (i_io_read(ig, buf, 1) != 1)
return 0;
*p = (char)buf[0];
break;
case '3': /* extension - 24-bit number */
- if (ig->readcb(ig, buf, 3) != 3)
+ if (i_io_read(ig, buf, 3) != 3)
return 0;
- *p = buf[0] + (buf[1] << 8) + (buf[2] << 16);
+ *p = buf[0] + (buf[1] << 8) + ((i_packed_t)buf[2] << 16);
break;
default:
- i_fatal(1, "Unknown read_packed format code 0x%02x", *format);
+ i_fatal(1, "Unknown read_packed format code 0x%02x", code);
}
- ++format;
}
return 1;
}
va_start(ap, format);
while (*format) {
- i = va_arg(ap, unsigned int);
+ i = va_arg(ap, i_upacked_t);
switch (*format) {
case 'v':
buf[0] = i & 255;
buf[1] = i / 256;
- if (ig->writecb(ig, buf, 2) == -1)
+ if (i_io_write(ig, buf, 2) == -1)
return 0;
break;
buf[1] = (i >> 8) & 0xFF;
buf[2] = (i >> 16) & 0xFF;
buf[3] = (i >> 24) & 0xFF;
- if (ig->writecb(ig, buf, 4) == -1)
+ if (i_io_write(ig, buf, 4) == -1)
return 0;
break;
case 'C':
case 'c':
buf[0] = i & 0xFF;
- if (ig->writecb(ig, buf, 1) == -1)
+ if (i_io_write(ig, buf, 1) == -1)
return 0;
break;
int colors_used = 0;
int offset = FILEHEAD_SIZE + INFOHEAD_SIZE;
+ if (im->xsize > SIGNMAX32 || im->ysize > SIGNMAX32) {
+ i_push_error(0, "image too large to write to BMP");
+ return 0;
+ }
+
got_xres = i_tags_get_float(&im->tags, "i_xres", 0, &xres);
got_yres = i_tags_get_float(&im->tags, "i_yres", 0, &yres);
if (!i_tags_get_int(&im->tags, "i_aspect_only", 0,&aspect_only))
offset += 4 * colors_used;
}
- if (!write_packed(ig, "CCVvvVVVVvvVVVVVV", 'B', 'M', data_size+offset,
- 0, 0, offset, INFOHEAD_SIZE, im->xsize, im->ysize, 1,
- bit_count, BI_RGB, 0, (int)(xres+0.5), (int)(yres+0.5),
- colors_used, colors_used)){
+ if (!write_packed(ig, "CCVvvVVVVvvVVVVVV", 'B', 'M',
+ (i_upacked_t)(data_size+offset),
+ (i_upacked_t)0, (i_upacked_t)0, (i_upacked_t)offset,
+ (i_upacked_t)INFOHEAD_SIZE, (i_upacked_t)im->xsize,
+ (i_upacked_t)im->ysize, (i_upacked_t)1,
+ (i_upacked_t)bit_count, (i_upacked_t)BI_RGB,
+ (i_upacked_t)data_size,
+ (i_upacked_t)(xres+0.5), (i_upacked_t)(yres+0.5),
+ (i_upacked_t)colors_used, (i_upacked_t)colors_used)){
i_push_error(0, "cannot write bmp header");
return 0;
}
for (i = 0; i < colors_used; ++i) {
i_getcolors(im, i, &c, 1);
if (im->channels >= 3) {
- if (!write_packed(ig, "CCCC", c.channel[2], c.channel[1],
- c.channel[0], 0)) {
+ if (!write_packed(ig, "CCCC", (i_upacked_t)(c.channel[2]),
+ (i_upacked_t)(c.channel[1]),
+ (i_upacked_t)(c.channel[0]), (i_upacked_t)0)) {
i_push_error(0, "cannot write palette entry");
return 0;
}
}
else {
- if (!write_packed(ig, "CCCC", c.channel[0], c.channel[0],
- c.channel[0], 0)) {
+ i_upacked_t v = c.channel[0];
+ if (!write_packed(ig, "CCCC", v, v, v, 0)) {
i_push_error(0, "cannot write palette entry");
return 0;
}
if (mask != 0x80) {
*out++ = byte;
}
- if (ig->writecb(ig, packed, line_size) < 0) {
+ if (i_io_write(ig, packed, line_size) < 0) {
myfree(packed);
myfree(line);
i_push_error(0, "writing 1 bit/pixel packed data");
myfree(packed);
myfree(line);
- ig->closecb(ig);
+ if (i_io_close(ig))
+ return 0;
return 1;
}
for (x = 0; x < im->xsize; x += 2) {
*out++ = (line[x] << 4) + line[x+1];
}
- if (ig->writecb(ig, packed, line_size) < 0) {
+ if (i_io_write(ig, packed, line_size) < 0) {
myfree(packed);
myfree(line);
i_push_error(0, "writing 4 bit/pixel packed data");
myfree(packed);
myfree(line);
- ig->closecb(ig);
+ if (i_io_close(ig))
+ return 0;
return 1;
}
for (y = im->ysize-1; y >= 0; --y) {
i_gpal(im, 0, im->xsize, y, line);
- if (ig->writecb(ig, line, line_size) < 0) {
+ if (i_io_write(ig, line, line_size) < 0) {
myfree(line);
i_push_error(0, "writing 8 bit/pixel packed data");
return 0;
}
myfree(line);
- ig->closecb(ig);
+ if (i_io_close(ig))
+ return 0;
return 1;
}
-static int bgr_chans[] = { 2, 1, 0, };
-static int grey_chans[] = { 0, 0, 0, };
-
/*
=item write_24bit_data(ig, im)
*/
static int
write_24bit_data(io_glue *ig, i_img *im) {
- int *chans;
unsigned char *samples;
int y;
int line_size = 3 * im->xsize;
+ i_color bg;
+
+ i_get_file_background(im, &bg);
/* just in case we implement a direct format with 2bytes/pixel
(unlikely though) */
if (!write_bmphead(ig, im, 24, line_size * im->ysize))
return 0;
- chans = im->channels >= 3 ? bgr_chans : grey_chans;
- samples = mymalloc(line_size); /* checked 29jun05 tonyc */
+ samples = mymalloc(4 * im->xsize);
memset(samples, 0, line_size);
for (y = im->ysize-1; y >= 0; --y) {
- i_gsamp(im, 0, im->xsize, y, samples, chans, 3);
- if (ig->writecb(ig, samples, line_size) < 0) {
+ unsigned char *samplep = samples;
+ int x;
+ i_gsamp_bg(im, 0, im->xsize, y, samples, 3, &bg);
+ for (x = 0; x < im->xsize; ++x) {
+ unsigned char tmp = samplep[2];
+ samplep[2] = samplep[0];
+ samplep[0] = tmp;
+ samplep += 3;
+ }
+ if (i_io_write(ig, samples, line_size) < 0) {
i_push_error(0, "writing image data");
myfree(samples);
return 0;
}
myfree(samples);
- ig->closecb(ig);
+ if (i_io_close(ig))
+ return 0;
return 1;
}
static int
read_bmp_pal(io_glue *ig, i_img *im, int count) {
int i;
- int r, g, b, x;
+ i_packed_t r, g, b, x;
i_color c;
for (i = 0; i < count; ++i) {
rare */
char buffer;
while (base_offset < offbits) {
- if (ig->readcb(ig, &buffer, 1) != 1) {
+ if (i_io_read(ig, &buffer, 1) != 1) {
i_img_destroy(im);
i_push_error(0, "failed skipping to image data offset");
return NULL;
packed = mymalloc(line_size); /* checked 29jun05 tonyc */
line = mymalloc(xsize+8); /* checked 29jun05 tonyc */
while (y != lasty) {
- if (ig->readcb(ig, packed, line_size) != line_size) {
+ if (i_io_read(ig, packed, line_size) != line_size) {
myfree(packed);
myfree(line);
if (allow_incomplete) {
rare */
char buffer;
while (base_offset < offbits) {
- if (ig->readcb(ig, &buffer, 1) != 1) {
+ if (i_io_read(ig, &buffer, 1) != 1) {
i_img_destroy(im);
i_push_error(0, "failed skipping to image data offset");
return NULL;
if (compression == BI_RGB) {
i_tags_add(&im->tags, "bmp_compression_name", 0, "BI_RGB", -1, 0);
while (y != lasty) {
- if (ig->readcb(ig, packed, line_size) != line_size) {
+ if (i_io_read(ig, packed, line_size) != line_size) {
myfree(packed);
myfree(line);
if (allow_incomplete) {
x = 0;
while (1) {
/* there's always at least 2 bytes in a sequence */
- if (ig->readcb(ig, packed, 2) != 2) {
+ if (i_io_read(ig, packed, 2) != 2) {
myfree(packed);
myfree(line);
if (allow_incomplete) {
}
}
else if (packed[0]) {
+ if (x + packed[0] > xsize) {
+ /* this file is corrupt */
+ myfree(packed);
+ myfree(line);
+ i_push_error(0, "invalid data during decompression");
+ i_img_destroy(im);
+ return NULL;
+ }
line[0] = packed[1] >> 4;
line[1] = packed[1] & 0x0F;
for (i = 0; i < packed[0]; i += 2) {
return im;
case BMPRLE_DELTA:
- if (ig->readcb(ig, packed, 2) != 2) {
+ if (i_io_read(ig, packed, 2) != 2) {
myfree(packed);
myfree(line);
if (allow_incomplete) {
default:
count = packed[1];
+ if (x + count > xsize) {
+ /* this file is corrupt */
+ myfree(packed);
+ myfree(line);
+ i_push_error(0, "invalid data during decompression");
+ i_img_destroy(im);
+ return NULL;
+ }
size = (count + 1) / 2;
read_size = (size+1) / 2 * 2;
- if (ig->readcb(ig, packed, read_size) != read_size) {
+ if (i_io_read(ig, packed, read_size) != read_size) {
myfree(packed);
myfree(line);
if (allow_incomplete) {
rare */
char buffer;
while (base_offset < offbits) {
- if (ig->readcb(ig, &buffer, 1) != 1) {
+ if (i_io_read(ig, &buffer, 1) != 1) {
i_img_destroy(im);
i_push_error(0, "failed skipping to image data offset");
return NULL;
if (compression == BI_RGB) {
i_tags_add(&im->tags, "bmp_compression_name", 0, "BI_RGB", -1, 0);
while (y != lasty) {
- if (ig->readcb(ig, line, line_size) != line_size) {
+ if (i_io_read(ig, line, line_size) != line_size) {
myfree(line);
if (allow_incomplete) {
i_tags_setn(&im->tags, "i_incomplete", 1);
x = 0;
while (1) {
/* there's always at least 2 bytes in a sequence */
- if (ig->readcb(ig, packed, 2) != 2) {
+ if (i_io_read(ig, packed, 2) != 2) {
myfree(line);
if (allow_incomplete) {
i_tags_setn(&im->tags, "i_incomplete", 1);
}
}
if (packed[0]) {
+ if (x + packed[0] > xsize) {
+ /* this file isn't incomplete, it's corrupt */
+ myfree(line);
+ i_push_error(0, "invalid data during decompression");
+ i_img_destroy(im);
+ return NULL;
+ }
memset(line, packed[1], packed[0]);
i_ppal(im, x, x+packed[0], y, line);
x += packed[0];
return im;
case BMPRLE_DELTA:
- if (ig->readcb(ig, packed, 2) != 2) {
+ if (i_io_read(ig, packed, 2) != 2) {
myfree(line);
if (allow_incomplete) {
i_tags_setn(&im->tags, "i_incomplete", 1);
default:
count = packed[1];
+ if (x + count > xsize) {
+ /* runs shouldn't cross a line boundary */
+ /* this file isn't incomplete, it's corrupt */
+ myfree(line);
+ i_push_error(0, "invalid data during decompression");
+ i_img_destroy(im);
+ return NULL;
+ }
read_size = (count+1) / 2 * 2;
- if (ig->readcb(ig, line, read_size) != read_size) {
+ if (i_io_read(ig, line, read_size) != read_size) {
myfree(line);
if (allow_incomplete) {
i_tags_setn(&im->tags, "i_incomplete", 1);
/* there's a potential "palette" after the header */
for (i = 0; i < clr_used; ++clr_used) {
char buf[4];
- if (ig->readcb(ig, buf, 4) != 4) {
+ if (i_io_read(ig, buf, 4) != 4) {
i_push_error(0, "skipping colors");
return 0;
}
compression_name = "BI_BITFIELDS";
for (i = 0; i < 3; ++i) {
- if (!read_packed(ig, "V", masks.masks+i)) {
+ i_packed_t rmask;
+ if (!read_packed(ig, "V", &rmask)) {
i_push_error(0, "reading pixel masks");
return 0;
}
+ masks.masks[i] = rmask;
/* work out a shift for the mask */
pos = 0;
bit = masks.masks[i] & -masks.masks[i];
rare */
char buffer;
while (base_offset < offbits) {
- if (ig->readcb(ig, &buffer, 1) != 1) {
+ if (i_io_read(ig, &buffer, 1) != 1) {
i_push_error(0, "failed skipping to image data offset");
return NULL;
}
while (y != lasty) {
p = line;
for (x = 0; x < xsize; ++x) {
- unsigned pixel;
+ i_packed_t pixel;
if (!read_packed(ig, unpack_code, &pixel)) {
myfree(line);
if (allow_incomplete) {
}
i_plin(im, 0, xsize, y, line);
if (extras)
- ig->readcb(ig, junk, extras);
+ i_io_read(ig, junk, extras);
y += yinc;
}
myfree(line);
projects / imager.git / blobdiff