typedef i_img_dim frac;
static frac float_to_frac(double x) { return (frac)(0.5+x*16.0); }
+typedef void
+(*flush_render_t)(i_img *im, i_img_dim l, i_img_dim r, i_img_dim y, const i_sample_t *cover, void *ctx);
+
+static void
+i_circle_aa_low(i_img *im, double x, double y, double rad, flush_render_t r, void *ctx);
+
+static void
+scanline_flush_color(i_img *im, i_img_dim l, i_img_dim y, i_img_dim width, const i_sample_t *cover, void *ctx);
+
+static void
+scanline_flush_fill(i_img *im, i_img_dim l, i_img_dim y, i_img_dim width, const i_sample_t *cover, void *ctx);
+
+typedef struct {
+ i_render r;
+ i_color c;
+} flush_color_t;
+
+typedef struct {
+ i_render r;
+ i_fill_t *fill;
+} flush_fill_t;
+
/*
=item i_circle_aa(im, x, y, rad, color)
=cut
*/
+
void
i_circle_aa(i_img *im, double x, double y, double rad, const i_color *val) {
+ flush_color_t fc;
+
+ fc.c = *val;
+ i_render_init(&fc.r, im, rad * 2 + 1);
+
+ i_circle_aa_low(im, x, y, rad, scanline_flush_color, &fc);
+
+ i_render_done(&fc.r);
+}
+
+/*
+=item i_circle_aa_fill(im, x, y, rad, fill)
+
+=category Drawing
+=synopsis i_circle_aa_fill(im, 50, 50, 45, fill);
+
+Anti-alias fills a circle centered at (x,y) for radius I<rad> with
+fill.
+
+=cut
+*/
+
+void
+i_circle_aa_fill(i_img *im, double x, double y, double rad, i_fill_t *fill) {
+ flush_fill_t ff;
+
+ ff.fill = fill;
+ i_render_init(&ff.r, im, rad * 2 + 1);
+
+ i_circle_aa_low(im, x, y, rad, scanline_flush_fill, &ff);
+
+ i_render_done(&ff.r);
+}
+
+static void
+i_circle_aa_low(i_img *im, double x, double y, double rad, flush_render_t r,
+ void *ctx) {
i_color temp;
i_img_dim ly;
dIMCTXim(im);
- i_img_dim first_row = floor(y) - ceil(rad);
- i_img_dim last_row = ceil(y) + ceil(rad);
+ double ceil_rad = ceil(rad);
+ i_img_dim first_row = floor(y) - ceil_rad;
+ i_img_dim last_row = ceil(y) + ceil_rad;
+ i_img_dim first_col = floor(x) - ceil_rad;
+ i_img_dim last_col = ceil(x) + ceil_rad;
double r_sqr = rad * rad;
- /*i_img_dim max_width = 2 * ceil(rad);
- i_sample_t *coverage = NULL;
- size_t coverage_size;*/
+ i_img_dim max_width = 2 * ceil(rad) + 1;
+ unsigned char *coverage = NULL;
+ size_t coverage_size;
int sub;
- im_log((aIMCTX, 1, "i_circle_aa(im %p, centre(" i_DFp "), rad %.2f, val %p)\n",
- im, i_DFcp(x, y), rad, val));
+ im_log((aIMCTX, 1, "i_circle_aa_low(im %p, centre(" i_DFp "), rad %.2f, r %p, ctx %p)\n",
+ im, i_DFcp(x, y), rad, r, ctx));
if (first_row < 0)
first_row = 0;
if (last_row > im->ysize-1)
last_row = im->ysize - 1;
+ if (first_col < 0)
+ first_col = 0;
+ if (last_col > im->xsize-1)
+ last_col = im->xsize - 1;
- if (rad <= 0 || last_row < first_row) {
+ if (rad <= 0 || last_row < first_row || last_col < first_col) {
/* outside the image */
return;
}
- /* coverage_size = sizeof(i_sample_t) * max_width;
- coverage = mymalloc(coverage_size);*/
-
+ coverage_size = max_width;
+ coverage = mymalloc(coverage_size);
for(ly = first_row; ly < last_row; ly++) {
frac min_frac_x[16];
frac max_frac_x[16];
- i_img_dim min_frac_left_x = im->xsize * 16;
+ i_img_dim min_frac_left_x = 16 *(ceil(x) + ceil(rad));
i_img_dim max_frac_left_x = -1;
- i_img_dim min_frac_right_x = im->xsize * 16;
+ i_img_dim min_frac_right_x = 16 * (floor(x) - ceil(rad));
i_img_dim max_frac_right_x = -1;
/* reset work_y each row so the error doesn't build up */
double work_y = ly;
i_img_dim right_solid = min_frac_right_x / 16;
i_img_dim work_x;
i_img_dim frac_work_x;
+ i_sample_t *cout = coverage;
for (work_x = min_x, frac_work_x = min_x * 16;
work_x <= max_x;
++work_x, frac_work_x += 16) {
if (work_x <= left_solid || work_x >= right_solid) {
- int coverage = 0;
+ int pix_coverage = 0;
int ch;
double ratio;
i_img_dim frac_work_right = frac_work_x + 16;
pix_left = frac_work_x;
if (pix_right > frac_work_right)
pix_right = frac_work_right;
- coverage += pix_right - pix_left;
+ pix_coverage += pix_right - pix_left;
}
}
- assert(coverage <= 256);
- ratio = coverage / 256.0;
- i_gpix(im, work_x, ly, &temp);
- for(ch=0;ch<im->channels; ch++)
- temp.channel[ch] = (unsigned char)((float)val->channel[ch]*ratio + (float)temp.channel[ch]*(1.0-ratio));
- i_ppix(im, work_x, ly, &temp);
+ assert(pix_coverage <= 256);
+ *cout++ = pix_coverage * 255 / 256;
}
else {
/* full coverage */
- i_ppix(im, work_x, ly, val);
+ *cout++ = 255;
}
}
+ r(im, min_x, ly, max_x - min_x + 1, coverage, ctx);
}
}
+
+ myfree(coverage);
}
+static void
+scanline_flush_color(i_img *im, i_img_dim x, i_img_dim y, i_img_dim width, const unsigned char *cover, void *ctx) {
+ flush_color_t *fc = ctx;
+
+ i_render_color(&fc->r, x, y, width, cover, &fc->c);
+}
+
+static void
+scanline_flush_fill(i_img *im, i_img_dim x, i_img_dim y, i_img_dim width, const unsigned char *cover, void *ctx) {
+ flush_fill_t *ff = ctx;
+
+ i_render_fill(&ff->r, x, y, width, cover, ff->fill);
+}
+
+
/*
=item i_circle_out(im, x, y, r, col)
return seedx;
}
+#ifdef DEBUG_FLOOD_FILL
+
+#define ST_PUSH_NOTE(left, right, dadl, dadr, y, dir) \
+ fprintf(stderr, "push(left %" i_DF ", right %" i_DF ", dadleft %" i_DF ", dadright %" i_DF ", y %" i_DF ", dir %d, line %d)\n", \
+ i_DFc(left), i_DFc(right), i_DFc(dadl), i_DFc(dadr), i_DFc(y), (dir), __LINE__)
+
+#define ST_POP_NOTE(left, right, dadl, dadr, y, dir) \
+ fprintf(stderr, "popped(left %" i_DF ", right %" i_DF ", dadleft %" i_DF ", dadright %" i_DF ", y %" i_DF ", dir %d, line %d)\n", \
+ i_DFc(left), i_DFc(right), i_DFc(dadl), i_DFc(dadr), i_DFc(y), (dir), __LINE__)
+
+#define ST_STACK_NOTE(dadl, dadr, left, right, y, dir) \
+ fprintf(stderr, "stack(left %" i_DF ", right %" i_DF ", dadleft %" i_DF ", dadright %" i_DF ", y %" i_DF ", dir %d, line %d)\n", \
+ i_DFc(left), i_DFc(right), i_DFc(dadl), i_DFc(dadr), i_DFc(y), (dir), __LINE__)
+
+#else
+
+#define ST_PUSH_NOTE(left, right, dadl, dadr, y, dir)
+
+#define ST_POP_NOTE(left, right, dadl, dadr, y, dir)
+
+#define ST_STACK_NOTE(dadl, dadr, left, right, y, dir)
+
+#endif
+
+
/* Macro to create a link and push on to the list */
#define ST_PUSH(left,right,dadl,dadr,y,dir) do { \
struct stack_element *s = crdata(left,right,dadl,dadr,y,dir); \
+ ST_PUSH_NOTE(left, right, dadl, dadr, y, dir); \
llist_push(st,&s); \
} while (0)
dadRx = s->dadRx; \
y = s->myY; \
direction = s->myDirection; \
+ ST_POP_NOTE(lx, rx, dadLx, dadRx, y, direction); \
myfree(s); \
} while (0)
#define ST_STACK(dir,dadLx,dadRx,lx,rx,y) do { \
i_img_dim pushrx = rx+1; \
i_img_dim pushlx = lx-1; \
+ ST_STACK_NOTE(lx, rx, dadLx, dadRx, y, dir); \
ST_PUSH(lx,rx,pushlx,pushrx,y+dir,dir); \
if (rx > dadRx) \
ST_PUSH(dadRx+1,rx,pushlx,pushrx,y-dir,-dir); \
- if (lx < dadLx) ST_PUSH(lx,dadLx-1,pushlx,pushrx,y-dir,-dir); \
+ if (lx < dadLx) \
+ ST_PUSH(lx,dadLx-1,pushlx,pushrx,y-dir,-dir); \
} while (0)
#define SET(x,y) btm_set(btm,x,y)
/* INSIDE returns true if pixel is correct color and we haven't set it before. */
-#define INSIDE(x,y, seed) ((!btm_test(btm,x,y) && ( i_gpix(im,x,y,&cval),cmpfunc(seed,&cval,channels) ) ))
-
-
+#define INSIDE(x,y, seed) \
+ (assert((x) >= 0 && (x) < (im)->xsize && (y) >= 0 && (y) < (im)->ysize), \
+ (!btm_test(btm,x,y) && \
+ ( i_gpix(im,x,y,&cval),cmpfunc(seed,&cval,channels) ) ))
/* The function that does all the real work */
int channels;
i_img_dim xsize,ysize;
- i_color cval;
+ i_color cval; /* used by the INSIDE() macro */
channels = im->channels;
xsize = im->xsize;
SET(lx,y);
lx--;
}
+ /* lx should point at the left-most INSIDE() pixel */
+ ++lx;
}
if (bxmin > lx) bxmin = lx;
projects / imager.git / blobdiff