=cut
*/
-#include "image.h"
-#include "imagei.h"
+#include "imager.h"
+#include "imageri.h"
-static int i_ppix_d16(i_img *im, int x, int y, i_color *val);
+static int i_ppix_d16(i_img *im, int x, int y, const i_color *val);
static int i_gpix_d16(i_img *im, int x, int y, i_color *val);
static int i_glin_d16(i_img *im, int l, int r, int y, i_color *vals);
-static int i_plin_d16(i_img *im, int l, int r, int y, i_color *vals);
-static int i_ppixf_d16(i_img *im, int x, int y, i_fcolor *val);
+static int i_plin_d16(i_img *im, int l, int r, int y, const i_color *vals);
+static int i_ppixf_d16(i_img *im, int x, int y, const i_fcolor *val);
static int i_gpixf_d16(i_img *im, int x, int y, i_fcolor *val);
static int i_glinf_d16(i_img *im, int l, int r, int y, i_fcolor *vals);
-static int i_plinf_d16(i_img *im, int l, int r, int y, i_fcolor *vals);
+static int i_plinf_d16(i_img *im, int l, int r, int y, const i_fcolor *vals);
static int i_gsamp_d16(i_img *im, int l, int r, int y, i_sample_t *samps,
int const *chans, int chan_count);
static int i_gsampf_d16(i_img *im, int l, int r, int y, i_fsample_t *samps,
#endif
/*
-=item i_img_16_new(int x, int y, int ch)
+=item i_img_16_new_low(int x, int y, int ch)
Creates a new 16-bit per sample image.
=cut
*/
i_img *i_img_16_new_low(i_img *im, int x, int y, int ch) {
+ int bytes, line_bytes;
mm_log((1,"i_img_16_new(x %d, y %d, ch %d)\n", x, y, ch));
+
+ if (x < 1 || y < 1) {
+ i_push_error(0, "Image sizes must be positive");
+ return NULL;
+ }
+ if (ch < 1 || ch > MAXCHANNELS) {
+ i_push_errorf(0, "channels must be between 1 and %d", MAXCHANNELS);
+ return NULL;
+ }
+ bytes = x * y * ch * 2;
+ if (bytes / y / ch / 2 != x) {
+ i_push_errorf(0, "integer overflow calculating image allocation");
+ return NULL;
+ }
+ /* basic assumption: we can always allocate a buffer representing a
+ line from the image, otherwise we're going to have trouble
+ working with the image */
+ line_bytes = sizeof(i_fcolor) * x;
+ if (line_bytes / x != sizeof(i_fcolor)) {
+ i_push_error(0, "integer overflow calculating scanline allocation");
+ return NULL;
+ }
+
*im = IIM_base_16bit_direct;
i_tags_new(&im->tags);
im->xsize = x;
im->ysize = y;
im->channels = ch;
- im->bytes = x * y * ch * 2;
+ im->bytes = bytes;
im->ext_data = NULL;
im->idata = mymalloc(im->bytes);
if (im->idata) {
return im;
}
+/*
+=item i_img_16_new(x, y, ch)
+
+=category Image creation/destruction
+=synopsis i_img *img = i_img_16_new(width, height, channels);
+
+Create a new 16-bit/sample image.
+
+Returns the image on success, or NULL on failure.
+
+=cut
+*/
+
i_img *i_img_16_new(int x, int y, int ch) {
i_img *im;
+
+ i_clear_error();
im = mymalloc(sizeof(i_img));
if (im) {
return im;
}
-static int i_ppix_d16(i_img *im, int x, int y, i_color *val) {
+/*
+=item i_img_to_rgb16(im)
+
+=category Image creation
+
+Returns a 16-bit/sample version of the supplied image.
+
+Returns the image on success, or NULL on failure.
+
+=cut
+*/
+
+i_img *
+i_img_to_rgb16(i_img *im) {
+ i_img *targ;
+ i_fcolor *line;
+ int y;
+
+ targ = i_img_16_new(im->xsize, im->ysize, im->channels);
+ if (!targ)
+ return NULL;
+ line = mymalloc(sizeof(i_fcolor) * im->xsize);
+ for (y = 0; y < im->ysize; ++y) {
+ i_glinf(im, 0, im->xsize, y, line);
+ i_plinf(targ, 0, im->xsize, y, line);
+ }
+
+ myfree(line);
+
+ return targ;
+}
+
+static int i_ppix_d16(i_img *im, int x, int y, const i_color *val) {
int off, ch;
- if (x < 0 || x >= im->xsize || y < 0 || y > im->ysize)
+ if (x < 0 || x >= im->xsize || y < 0 || y >= im->ysize)
return -1;
off = (x + y * im->xsize) * im->channels;
- for (ch = 0; ch < im->channels; ++ch)
- STORE8as16(im->idata, off+ch, val->channel[ch]);
+ if (I_ALL_CHANNELS_WRITABLE(im)) {
+ for (ch = 0; ch < im->channels; ++ch)
+ STORE8as16(im->idata, off+ch, val->channel[ch]);
+ }
+ else {
+ for (ch = 0; ch < im->channels; ++ch)
+ if (im->ch_mask & (1 << ch))
+ STORE8as16(im->idata, off+ch, val->channel[ch]);
+ }
return 0;
}
static int i_gpix_d16(i_img *im, int x, int y, i_color *val) {
int off, ch;
- if (x < 0 || x >= im->xsize || y < 0 || y > im->ysize)
+ if (x < 0 || x >= im->xsize || y < 0 || y >= im->ysize)
return -1;
off = (x + y * im->xsize) * im->channels;
return 0;
}
-static int i_ppixf_d16(i_img *im, int x, int y, i_fcolor *val) {
+static int i_ppixf_d16(i_img *im, int x, int y, const i_fcolor *val) {
int off, ch;
- if (x < 0 || x >= im->xsize || y < 0 || y > im->ysize)
+ if (x < 0 || x >= im->xsize || y < 0 || y >= im->ysize)
return -1;
off = (x + y * im->xsize) * im->channels;
- for (ch = 0; ch < im->channels; ++ch)
- STORE16(im->idata, off+ch, SampleFTo16(val->channel[ch]));
+ if (I_ALL_CHANNELS_WRITABLE(im)) {
+ for (ch = 0; ch < im->channels; ++ch)
+ STORE16(im->idata, off+ch, SampleFTo16(val->channel[ch]));
+ }
+ else {
+ for (ch = 0; ch < im->channels; ++ch)
+ if (im->ch_mask & (1 << ch))
+ STORE16(im->idata, off+ch, SampleFTo16(val->channel[ch]));
+ }
return 0;
}
static int i_gpixf_d16(i_img *im, int x, int y, i_fcolor *val) {
int off, ch;
- if (x < 0 || x >= im->xsize || y < 0 || y > im->ysize)
+ if (x < 0 || x >= im->xsize || y < 0 || y >= im->ysize)
return -1;
off = (x + y * im->xsize) * im->channels;
}
}
-static int i_plin_d16(i_img *im, int l, int r, int y, i_color *vals) {
+static int i_plin_d16(i_img *im, int l, int r, int y, const i_color *vals) {
int ch, count, i;
int off;
if (y >=0 && y < im->ysize && l < im->xsize && l >= 0) {
r = im->xsize;
off = (l+y*im->xsize) * im->channels;
count = r - l;
- for (i = 0; i < count; ++i) {
- for (ch = 0; ch < im->channels; ++ch) {
- STORE8as16(im->idata, off, vals[i].channel[ch]);
- ++off;
+ if (I_ALL_CHANNELS_WRITABLE(im)) {
+ for (i = 0; i < count; ++i) {
+ for (ch = 0; ch < im->channels; ++ch) {
+ STORE8as16(im->idata, off, vals[i].channel[ch]);
+ ++off;
+ }
+ }
+ }
+ else {
+ for (i = 0; i < count; ++i) {
+ for (ch = 0; ch < im->channels; ++ch) {
+ if (im->ch_mask & (1 << ch))
+ STORE8as16(im->idata, off, vals[i].channel[ch]);
+ ++off;
+ }
}
}
return count;
}
}
-static int i_plinf_d16(i_img *im, int l, int r, int y, i_fcolor *vals) {
+static int i_plinf_d16(i_img *im, int l, int r, int y, const i_fcolor *vals) {
int ch, count, i;
int off;
if (y >=0 && y < im->ysize && l < im->xsize && l >= 0) {
r = im->xsize;
off = (l+y*im->xsize) * im->channels;
count = r - l;
- for (i = 0; i < count; ++i) {
- for (ch = 0; ch < im->channels; ++ch) {
- STORE16(im->idata, off, SampleFTo16(vals[i].channel[ch]));
- ++off;
+ if (I_ALL_CHANNELS_WRITABLE(im)) {
+ for (i = 0; i < count; ++i) {
+ for (ch = 0; ch < im->channels; ++ch) {
+ STORE16(im->idata, off, SampleFTo16(vals[i].channel[ch]));
+ ++off;
+ }
+ }
+ }
+ else {
+ for (i = 0; i < count; ++i) {
+ for (ch = 0; ch < im->channels; ++ch) {
+ if (im->ch_mask & (1 << ch))
+ STORE16(im->idata, off, SampleFTo16(vals[i].channel[ch]));
+ ++off;
+ }
}
}
return count;
}
}
else {
+ if (chan_count <= 0 || chan_count > im->channels) {
+ i_push_errorf(0, "chan_count %d out of range, must be >0, <= channels",
+ chan_count);
+ return 0;
+ }
for (i = 0; i < w; ++i) {
for (ch = 0; ch < chan_count; ++ch) {
*samps++ = GET16as8(im->idata, off+ch);
}
}
else {
+ if (chan_count <= 0 || chan_count > im->channels) {
+ i_push_errorf(0, "chan_count %d out of range, must be >0, <= channels",
+ chan_count);
+ return 0;
+ }
for (i = 0; i < w; ++i) {
for (ch = 0; ch < chan_count; ++ch) {
*samps++ = Sample16ToF(GET16(im->idata, off+ch));
projects / imager.git / blobdiff