+#define IMAGER_NO_CONTEXT
+
#include "imager.h"
#include "imageri.h"
-static int i_ppix_d(i_img *im, int x, int y, const i_color *val);
-static int i_gpix_d(i_img *im, int x, int y, i_color *val);
-static int i_glin_d(i_img *im, int l, int r, int y, i_color *vals);
-static int i_plin_d(i_img *im, int l, int r, int y, const i_color *vals);
-static int i_ppixf_d(i_img *im, int x, int y, const i_fcolor *val);
-static int i_gpixf_d(i_img *im, int x, int y, i_fcolor *val);
-static int i_glinf_d(i_img *im, int l, int r, int y, i_fcolor *vals);
-static int i_plinf_d(i_img *im, int l, int r, int y, const i_fcolor *vals);
-static int i_gsamp_d(i_img *im, int l, int r, int y, i_sample_t *samps, const int *chans, int chan_count);
-static int i_gsampf_d(i_img *im, int l, int r, int y, i_fsample_t *samps, const int *chans, int chan_count);
+static int i_ppix_d(i_img *im, i_img_dim x, i_img_dim y, const i_color *val);
+static int i_gpix_d(i_img *im, i_img_dim x, i_img_dim y, i_color *val);
+static i_img_dim i_glin_d(i_img *im, i_img_dim l, i_img_dim r, i_img_dim y, i_color *vals);
+static i_img_dim i_plin_d(i_img *im, i_img_dim l, i_img_dim r, i_img_dim y, const i_color *vals);
+static int i_ppixf_d(i_img *im, i_img_dim x, i_img_dim y, const i_fcolor *val);
+static int i_gpixf_d(i_img *im, i_img_dim x, i_img_dim y, i_fcolor *val);
+static i_img_dim i_glinf_d(i_img *im, i_img_dim l, i_img_dim r, i_img_dim y, i_fcolor *vals);
+static i_img_dim i_plinf_d(i_img *im, i_img_dim l, i_img_dim r, i_img_dim y, const i_fcolor *vals);
+static i_img_dim i_gsamp_d(i_img *im, i_img_dim l, i_img_dim r, i_img_dim y, i_sample_t *samps, const int *chans, int chan_count);
+static i_img_dim i_gsampf_d(i_img *im, i_img_dim l, i_img_dim r, i_img_dim y, i_fsample_t *samps, const int *chans, int chan_count);
+static i_img_dim i_psamp_d(i_img *im, i_img_dim l, i_img_dim r, i_img_dim y, const i_sample_t *samps, const int *chans, int chan_count);
+static i_img_dim i_psampf_d(i_img *im, i_img_dim l, i_img_dim r, i_img_dim y, const i_fsample_t *samps, const int *chans, int chan_count);
/*
=item IIM_base_8bit_direct (static)
i_gsamp_bits_fb,
NULL, /* i_f_psamp_bits */
+
+ i_psamp_d,
+ i_psampf_d
};
/*static void set_8bit_direct(i_img *im) {
}*/
/*
-=item IIM_new(x, y, ch)
-
-=item i_img_8_new(x, y, ch)
-
+=item im_img_8_new(ctx, x, y, ch)
+X<im_img_8_new API>X<i_img_8_new API>
=category Image creation/destruction
-
+=synopsis i_img *img = im_img_8_new(aIMCTX, width, height, channels);
=synopsis i_img *img = i_img_8_new(width, height, channels);
Creates a new image object I<x> pixels wide, and I<y> pixels high with
=cut
*/
-
i_img *
-IIM_new(int x,int y,int ch) {
+im_img_8_new(pIMCTX, i_img_dim x,i_img_dim y,int ch) {
i_img *im;
- mm_log((1,"IIM_new(x %d,y %d,ch %d)\n",x,y,ch));
- im=i_img_empty_ch(NULL,x,y,ch);
-
- mm_log((1,"(%p) <- IIM_new\n",im));
- return im;
-}
+ im_log((aIMCTX, 1,"im_img_8_new(x %" i_DF ", y %" i_DF ", ch %d)\n",
+ i_DFc(x), i_DFc(y), ch));
-
-void
-IIM_DESTROY(i_img *im) {
- mm_log((1,"IIM_DESTROY(im* %p)\n",im));
- i_img_destroy(im);
- /* myfree(cl); */
-}
-
-/*
-=item i_img_new()
-
-Create new image reference - notice that this isn't an object yet and
-this should be fixed asap.
-
-=cut
-*/
-
-
-i_img *
-i_img_new() {
- i_img *im;
+ im = im_img_empty_ch(aIMCTX, NULL,x,y,ch);
- mm_log((1,"i_img_struct()\n"));
-
- im = i_img_alloc();
-
- *im = IIM_base_8bit_direct;
- im->xsize=0;
- im->ysize=0;
- im->channels=3;
- im->ch_mask=MAXINT;
- im->bytes=0;
- im->idata=NULL;
-
- i_img_init(im);
-
- mm_log((1,"(%p) <- i_img_struct\n",im));
+ im_log((aIMCTX, 1,"(%p) <- IIM_new\n",im));
return im;
}
*/
i_img *
-i_img_empty(i_img *im,int x,int y) {
- mm_log((1,"i_img_empty(*im %p, x %d, y %d)\n",im, x, y));
- return i_img_empty_ch(im, x, y, 3);
+im_img_empty(pIMCTX, i_img *im,i_img_dim x,i_img_dim y) {
+ im_log((aIMCTX, 1,"i_img_empty(*im %p, x %" i_DF ", y %" i_DF ")\n",
+ im, i_DFc(x), i_DFc(y)));
+ return im_img_empty_ch(aIMCTX, im, x, y, 3);
}
/*
*/
i_img *
-i_img_empty_ch(i_img *im,int x,int y,int ch) {
- int bytes;
+im_img_empty_ch(pIMCTX, i_img *im,i_img_dim x,i_img_dim y,int ch) {
+ size_t bytes;
- mm_log((1,"i_img_empty_ch(*im %p, x %d, y %d, ch %d)\n", im, x, y, ch));
+ im_log((aIMCTX, 1,"i_img_empty_ch(*im %p, x %" i_DF ", y %" i_DF ", ch %d)\n",
+ im, i_DFc(x), i_DFc(y), ch));
if (x < 1 || y < 1) {
- i_push_error(0, "Image sizes must be positive");
+ im_push_error(aIMCTX, 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);
+ im_push_errorf(aIMCTX, 0, "channels must be between 1 and %d", MAXCHANNELS);
return NULL;
}
/* check this multiplication doesn't overflow */
bytes = x*y*ch;
if (bytes / y / ch != x) {
- i_push_errorf(0, "integer overflow calculating image allocation");
+ im_push_errorf(aIMCTX, 0, "integer overflow calculating image allocation");
return NULL;
}
if (im == NULL)
- im = i_img_alloc();
+ im = im_img_alloc(aIMCTX);
memcpy(im, &IIM_base_8bit_direct, sizeof(i_img));
i_tags_new(&im->tags);
im->xsize = x;
im->ysize = y;
im->channels = ch;
- im->ch_mask = MAXINT;
+ im->ch_mask = ~0U;
im->bytes=bytes;
if ( (im->idata=mymalloc(im->bytes)) == NULL)
- i_fatal(2,"malloc() error\n");
+ im_fatal(aIMCTX, 2,"malloc() error\n");
memset(im->idata,0,(size_t)im->bytes);
im->ext_data = NULL;
- i_img_init(im);
+ im_img_init(aIMCTX, im);
- mm_log((1,"(%p) <- i_img_empty_ch\n",im));
+ im_log((aIMCTX, 1,"(%p) <- i_img_empty_ch\n",im));
return im;
}
*/
static
int
-i_ppix_d(i_img *im, int x, int y, const i_color *val) {
+i_ppix_d(i_img *im, i_img_dim x, i_img_dim y, const i_color *val) {
int ch;
if ( x>-1 && x<im->xsize && y>-1 && y<im->ysize ) {
This is the function kept in the i_f_gpix member of an i_img object.
It does normal retrieval of a pixel from the image with range checking.
-Returns 0 if the pixel could be set, -1 otherwise.
+Returns 0 if the pixel could be retrieved, -1 otherwise.
=cut
*/
static
int
-i_gpix_d(i_img *im, int x, int y, i_color *val) {
+i_gpix_d(i_img *im, i_img_dim x, i_img_dim y, i_color *val) {
int ch;
if (x>-1 && x<im->xsize && y>-1 && y<im->ysize) {
for(ch=0;ch<im->channels;ch++)
=cut
*/
static
-int
-i_glin_d(i_img *im, int l, int r, int y, i_color *vals) {
- int ch, count, i;
+i_img_dim
+i_glin_d(i_img *im, i_img_dim l, i_img_dim r, i_img_dim y, i_color *vals) {
+ int ch;
+ i_img_dim count, i;
unsigned char *data;
if (y >=0 && y < im->ysize && l < im->xsize && l >= 0) {
if (r > im->xsize)
=cut
*/
static
-int
-i_plin_d(i_img *im, int l, int r, int y, const i_color *vals) {
- int ch, count, i;
+i_img_dim
+i_plin_d(i_img *im, i_img_dim l, i_img_dim r, i_img_dim y, const i_color *vals) {
+ int ch;
+ i_img_dim count, i;
unsigned char *data;
if (y >=0 && y < im->ysize && l < im->xsize && l >= 0) {
if (r > im->xsize)
*/
static
int
-i_ppixf_d(i_img *im, int x, int y, const i_fcolor *val) {
+i_ppixf_d(i_img *im, i_img_dim x, i_img_dim y, const i_fcolor *val) {
int ch;
if ( x>-1 && x<im->xsize && y>-1 && y<im->ysize ) {
*/
static
int
-i_gpixf_d(i_img *im, int x, int y, i_fcolor *val) {
+i_gpixf_d(i_img *im, i_img_dim x, i_img_dim y, i_fcolor *val) {
int ch;
if (x>-1 && x<im->xsize && y>-1 && y<im->ysize) {
for(ch=0;ch<im->channels;ch++) {
=cut
*/
static
-int
-i_glinf_d(i_img *im, int l, int r, int y, i_fcolor *vals) {
- int ch, count, i;
+i_img_dim
+i_glinf_d(i_img *im, i_img_dim l, i_img_dim r, i_img_dim y, i_fcolor *vals) {
+ int ch;
+ i_img_dim count, i;
unsigned char *data;
if (y >=0 && y < im->ysize && l < im->xsize && l >= 0) {
if (r > im->xsize)
=cut
*/
static
-int
-i_plinf_d(i_img *im, int l, int r, int y, const i_fcolor *vals) {
- int ch, count, i;
+i_img_dim
+i_plinf_d(i_img *im, i_img_dim l, i_img_dim r, i_img_dim y, const i_fcolor *vals) {
+ int ch;
+ i_img_dim count, i;
unsigned char *data;
if (y >=0 && y < im->ysize && l < im->xsize && l >= 0) {
if (r > im->xsize)
}
/*
-=item i_gsamp_d(i_img *im, int l, int r, int y, i_sample_t *samps, int *chans, int chan_count)
+=item i_gsamp_d(i_img *im, i_img_dim l, i_img_dim r, i_img_dim y, i_sample_t *samps, int *chans, int chan_count)
Reads sample values from im for the horizontal line (l, y) to (r-1,y)
for the channels specified by chans, an array of int with chan_count
=cut
*/
static
-int
-i_gsamp_d(i_img *im, int l, int r, int y, i_sample_t *samps,
+i_img_dim
+i_gsamp_d(i_img *im, i_img_dim l, i_img_dim r, i_img_dim y, i_sample_t *samps,
const int *chans, int chan_count) {
- int ch, count, i, w;
+ int ch;
+ i_img_dim count, i, w;
unsigned char *data;
if (y >=0 && y < im->ysize && l < im->xsize && l >= 0) {
/* make sure we have good channel numbers */
for (ch = 0; ch < chan_count; ++ch) {
if (chans[ch] < 0 || chans[ch] >= im->channels) {
- i_push_errorf(0, "No channel %d in this image", chans[ch]);
+ dIMCTXim(im);
+ im_push_errorf(aIMCTX, 0, "No channel %d in this image", chans[ch]);
return 0;
}
}
}
else {
if (chan_count <= 0 || chan_count > im->channels) {
- i_push_errorf(0, "chan_count %d out of range, must be >0, <= channels",
+ dIMCTXim(im);
+ im_push_errorf(aIMCTX, 0, "chan_count %d out of range, must be >0, <= channels",
chan_count);
return 0;
}
}
/*
-=item i_gsampf_d(i_img *im, int l, int r, int y, i_fsample_t *samps, int *chans, int chan_count)
+=item i_gsampf_d(i_img *im, i_img_dim l, i_img_dim r, i_img_dim y, i_fsample_t *samps, int *chans, int chan_count)
Reads sample values from im for the horizontal line (l, y) to (r-1,y)
for the channels specified by chan_mask, where bit 0 is the first
=cut
*/
static
-int
-i_gsampf_d(i_img *im, int l, int r, int y, i_fsample_t *samps,
+i_img_dim
+i_gsampf_d(i_img *im, i_img_dim l, i_img_dim r, i_img_dim y, i_fsample_t *samps,
const int *chans, int chan_count) {
- int ch, count, i, w;
+ int ch;
+ i_img_dim count, i, w;
unsigned char *data;
for (ch = 0; ch < chan_count; ++ch) {
if (chans[ch] < 0 || chans[ch] >= im->channels) {
- i_push_errorf(0, "No channel %d in this image", chans[ch]);
+ dIMCTXim(im);
+ im_push_errorf(aIMCTX, 0, "No channel %d in this image", chans[ch]);
}
}
if (y >=0 && y < im->ysize && l < im->xsize && l >= 0) {
/* make sure we have good channel numbers */
for (ch = 0; ch < chan_count; ++ch) {
if (chans[ch] < 0 || chans[ch] >= im->channels) {
- i_push_errorf(0, "No channel %d in this image", chans[ch]);
+ dIMCTXim(im);
+ im_push_errorf(aIMCTX, 0, "No channel %d in this image", chans[ch]);
return 0;
}
}
}
else {
if (chan_count <= 0 || chan_count > im->channels) {
- i_push_errorf(0, "chan_count %d out of range, must be >0, <= channels",
+ dIMCTXim(im);
+ im_push_errorf(aIMCTX, 0, "chan_count %d out of range, must be >0, <= channels",
chan_count);
return 0;
}
}
}
+/*
+=item i_psamp_d(i_img *im, i_img_dim l, i_img_dim r, i_img_dim y, i_sample_t *samps, int *chans, int chan_count)
+
+Writes sample values to im for the horizontal line (l, y) to (r-1,y)
+for the channels specified by chans, an array of int with chan_count
+elements.
+
+Returns the number of samples written (which should be (r-l) *
+bits_set(chan_mask)
+
+=cut
+*/
+
+static
+i_img_dim
+i_psamp_d(i_img *im, i_img_dim l, i_img_dim r, i_img_dim y,
+ const i_sample_t *samps, const int *chans, int chan_count) {
+ int ch;
+ i_img_dim count, i, w;
+ unsigned char *data;
+
+ if (y >=0 && y < im->ysize && l < im->xsize && l >= 0) {
+ if (r > im->xsize)
+ r = im->xsize;
+ data = im->idata + (l+y*im->xsize) * im->channels;
+ w = r - l;
+ count = 0;
+
+ if (chans) {
+ /* make sure we have good channel numbers */
+ /* and test if all channels specified are in the mask */
+ int all_in_mask = 1;
+ for (ch = 0; ch < chan_count; ++ch) {
+ if (chans[ch] < 0 || chans[ch] >= im->channels) {
+ dIMCTXim(im);
+ im_push_errorf(aIMCTX, 0, "No channel %d in this image", chans[ch]);
+ return -1;
+ }
+ if (!((1 << chans[ch]) & im->ch_mask))
+ all_in_mask = 0;
+ }
+ if (all_in_mask) {
+ for (i = 0; i < w; ++i) {
+ for (ch = 0; ch < chan_count; ++ch) {
+ data[chans[ch]] = *samps++;
+ ++count;
+ }
+ data += im->channels;
+ }
+ }
+ else {
+ for (i = 0; i < w; ++i) {
+ for (ch = 0; ch < chan_count; ++ch) {
+ if (im->ch_mask & (1 << (chans[ch])))
+ data[chans[ch]] = *samps;
+ ++samps;
+ ++count;
+ }
+ data += im->channels;
+ }
+ }
+ }
+ else {
+ if (chan_count <= 0 || chan_count > im->channels) {
+ dIMCTXim(im);
+ im_push_errorf(aIMCTX, 0, "chan_count %d out of range, must be >0, <= channels",
+ chan_count);
+ return -1;
+ }
+ for (i = 0; i < w; ++i) {
+ unsigned mask = 1;
+ for (ch = 0; ch < chan_count; ++ch) {
+ if (im->ch_mask & mask)
+ data[ch] = *samps;
+ ++samps;
+ ++count;
+ mask <<= 1;
+ }
+ data += im->channels;
+ }
+ }
+
+ return count;
+ }
+ else {
+ dIMCTXim(im);
+ i_push_error(0, "Image position outside of image");
+ return -1;
+ }
+}
+
+/*
+=item i_psampf_d(i_img *im, i_img_dim l, i_img_dim r, i_img_dim y, const i_fsample_t *samps, int *chans, int chan_count)
+
+Writes sample values to im for the horizontal line (l, y) to (r-1,y)
+for the channels specified by chans, an array of int with chan_count
+elements.
+
+Returns the number of samples written (which should be (r-l) *
+bits_set(chan_mask)
+
+=cut
+*/
+
+static
+i_img_dim
+i_psampf_d(i_img *im, i_img_dim l, i_img_dim r, i_img_dim y,
+ const i_fsample_t *samps, const int *chans, int chan_count) {
+ int ch;
+ i_img_dim count, i, w;
+ unsigned char *data;
+
+ if (y >=0 && y < im->ysize && l < im->xsize && l >= 0) {
+ if (r > im->xsize)
+ r = im->xsize;
+ data = im->idata + (l+y*im->xsize) * im->channels;
+ w = r - l;
+ count = 0;
+
+ if (chans) {
+ /* make sure we have good channel numbers */
+ /* and test if all channels specified are in the mask */
+ int all_in_mask = 1;
+ for (ch = 0; ch < chan_count; ++ch) {
+ if (chans[ch] < 0 || chans[ch] >= im->channels) {
+ dIMCTXim(im);
+ im_push_errorf(aIMCTX, 0, "No channel %d in this image", chans[ch]);
+ return -1;
+ }
+ if (!((1 << chans[ch]) & im->ch_mask))
+ all_in_mask = 0;
+ }
+ if (all_in_mask) {
+ for (i = 0; i < w; ++i) {
+ for (ch = 0; ch < chan_count; ++ch) {
+ data[chans[ch]] = SampleFTo8(*samps);
+ ++samps;
+ ++count;
+ }
+ data += im->channels;
+ }
+ }
+ else {
+ for (i = 0; i < w; ++i) {
+ for (ch = 0; ch < chan_count; ++ch) {
+ if (im->ch_mask & (1 << (chans[ch])))
+ data[chans[ch]] = SampleFTo8(*samps);
+ ++samps;
+ ++count;
+ }
+ data += im->channels;
+ }
+ }
+ }
+ else {
+ if (chan_count <= 0 || chan_count > im->channels) {
+ dIMCTXim(im);
+ im_push_errorf(aIMCTX, 0, "chan_count %d out of range, must be >0, <= channels",
+ chan_count);
+ return -1;
+ }
+ for (i = 0; i < w; ++i) {
+ unsigned mask = 1;
+ for (ch = 0; ch < chan_count; ++ch) {
+ if (im->ch_mask & mask)
+ data[ch] = SampleFTo8(*samps);
+ ++samps;
+ ++count;
+ mask <<= 1;
+ }
+ data += im->channels;
+ }
+ }
+
+ return count;
+ }
+ else {
+ dIMCTXim(im);
+ i_push_error(0, "Image position outside of image");
+ return -1;
+ }
+}
+
/*
=back
projects / imager.git / blobdiff