/*
* 2ooM: The Master of Orion II Reverse Engineering Project
* Library for working with LBX image files.
- * Copyright (C) 2006-2008 Nick Bowler
+ * Copyright (C) 2006-2010 Nick Bowler
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
#include "pack.h"
#include "misc.h"
#include "lbx.h"
+#include "error.h"
#include "image.h"
#define FLAG_RAW 0x0100 /* Image is stored as a flat array of bytes. */
img = malloc(sizeof *img + sizeof img->offsets[0] * (nframes+1));
if (!img) {
- lbx_errno = -errno;
+ lbx_error_raise(LBX_ENOMEM);
return NULL;
}
struct lbx_image *img;
if (fops->read(hdr_buf, sizeof hdr_buf, f) != sizeof hdr_buf) {
- lbx_errno = -errno;
if (fops->eof(f))
- lbx_errno = LBX_EEOF;
+ lbx_error_raise(LBX_EEOF);
return NULL;
}
unsigned char buf[4];
if (fops->read(buf, sizeof buf, f) != sizeof buf) {
- lbx_errno = -errno;
if (fops->eof(f))
- lbx_errno = LBX_EEOF;
+ lbx_error_raise(LBX_EEOF);
free(img);
return NULL;
}
unsigned char buf[4];
if (fops->read(buf, sizeof buf, f) != sizeof buf) {
- lbx_errno = -errno;
if (fops->eof(f))
- lbx_errno = LBX_EEOF;
+ lbx_error_raise(LBX_EEOF);
free(img);
return NULL;
}
img->paloff = fops->tell(f);
if (img->palstart + img->palcount > 256) {
- lbx_errno = LBX_EFORMAT;
+ lbx_error_raise(LBX_EFORMAT);
free(img);
return NULL;
}
/* Ensure that the row fits in the image. */
if (img->height - img->currenty <= yval || xval >= img->width) {
- lbx_errno = LBX_EFORMAT;
+ lbx_error_raise(LBX_EFORMAT);
return -1;
}
xval = unpack_16_le(buf+2);
if (img->width - img->currentx <= xval) {
- lbx_errno = LBX_EFORMAT;
+ lbx_error_raise(LBX_EFORMAT);
return -1;
}
img->currentx += xval;
}
if (count > img->width - img->currentx) {
- lbx_errno = LBX_EFORMAT;
+ lbx_error_raise(LBX_EFORMAT);
return -1;
}
return 0;
readerr:
- lbx_errno = -errno;
if (img->fops->eof(img->f))
- lbx_errno = LBX_EEOF;
+ lbx_error_raise(LBX_EEOF);
return -1;
}
tmp = calloc(height, width);
if (!tmp) {
- lbx_errno = -errno;
+ lbx_error_raise(LBX_ENOMEM);
return NULL;
}
new = malloc(height * sizeof *new);
if (!new) {
- lbx_errno = -errno;
+ lbx_error_raise(LBX_ENOMEM);
free(tmp);
return NULL;
}
assert(img->flags & FLAG_RAW);
if (img->fops->seek(img->f, img->offsets[frame], SEEK_SET)) {
- lbx_errno = -errno;
return NULL;
}
if (img->fops->read(img->framedata[0], size, img->f) != size) {
- lbx_errno = -errno;
if (img->fops->eof(img->f))
- lbx_errno = LBX_EEOF;
+ lbx_error_raise(LBX_EEOF);
return NULL;
}
memset(img->mask[0], 1, size);
if (img->fops->tell(img->f) > img->offsets[frame+1]) {
- lbx_errno = LBX_EFORMAT;
+ lbx_error_raise(LBX_EFORMAT);
return NULL;
}
unsigned char **lbximg_getframe(struct lbx_image *img, int frame)
{
if (frame >= img->frames || frame < 0) {
- lbx_errno = LBX_ERANGE;
+ lbx_error_raise(LBX_ENOENT);
return NULL;
}
int rc, first = 1;
if (img->fops->seek(img->f, img->offsets[frame], SEEK_SET)) {
- lbx_errno = -errno;
return NULL;
}
first = 0;
if (img->fops->tell(img->f) > img->offsets[frame+1]) {
- lbx_errno = LBX_EFORMAT;
+ lbx_error_raise(LBX_EFORMAT);
return NULL;
}
} while (!rc);
for (i = 0; i < 256; i++) {
if (fops->read(entry, sizeof entry, f) != sizeof entry) {
- lbx_errno = (feof(f)) ? LBX_EEOF : -errno;
+ if (fops->eof(f))
+ lbx_error_raise(LBX_EEOF);
return -1;
}
if (entry[0] != 1) {
- lbx_errno = LBX_EFORMAT;
+ lbx_error_raise(LBX_EFORMAT);
return -1;
}
return 0;
if (img->fops->seek(img->f, img->paloff, SEEK_SET)) {
- lbx_errno = -errno;
return -1;
}
}
if (entry[0] != 0) {
- lbx_errno = LBX_EFORMAT;
+ lbx_error_raise(LBX_EFORMAT);
return -1;
}
return 0;
readerr:
- lbx_errno = img->fops->eof(img->f) ? LBX_EEOF : -errno;
+ if (img->fops->eof(img->f))
+ lbx_error_raise(LBX_EEOF);
return -1;
}