* General Public License for more details.
*/
-#include "ao.h"
-#include "ao_draw.h"
-#include "ao_draw_int.h"
+#include <ao_draw.h>
+#include <ao_draw_int.h>
#define ao_mask(x,w) (ao_right(AO_ALLONES,(x) & AO_MASK) & \
ao_left(AO_ALLONES,(FB_UNIT - ((x)+(w))) & AO_MASK))
* adjust_x = e / e1;
*/
-
-
+#ifdef VALIDATE
+#include <stdio.h>
+#endif
static void
ao_bres(const struct ao_bitmap *dst_bitmap,
if (signdx < 0)
mask0 = ao_right(1, AO_UNIT - 1);
- if (signdy < 0)
- stride = -stride;
-
dst = dst + y1 * stride + (x1 >> AO_SHIFT);
mask = ao_right(1, x1 & AO_MASK);
+ if (signdy < 0)
+ stride = -stride;
+
while (len--) {
/* clip each point */
+#ifdef VALIDATE
+ if (x1 < 0 || dst_bitmap->width <= x1) {
+ printf("bad line x %d\n", x1);
+ return;
+ }
+ if (y1 < 0 || dst_bitmap->height <= y1) {
+ printf("bad line y %d\n", y1);
+ return;
+ }
+#endif
*dst = ao_do_mask_rrop(*dst, and, xor, mask);
if (axis == X_AXIS) {
+#ifdef VALIDATE
+ x1 += signdx;
+#endif
if (signdx < 0)
mask = ao_left(mask, 1);
else
}
e += e1;
if (e >= 0) {
+#ifdef VALIDATE
+ y1 += signdy;
+#endif
dst += stride;
e += e3;
}
} else {
+#ifdef VALIDATE
+ y1 += signdy;
+#endif
dst += stride;
e += e1;
if (e >= 0) {
+#ifdef VALIDATE
+ x1 += signdx;
+#endif
if (signdx < 0)
mask = ao_left(mask, 1);
else
/* -b <= a, so we need to make a bigger */
static int16_t
div_ceil(int32_t a, int16_t b) {
- return (a + b + b - 1) / b - 1;
+ return (int16_t) ((a + b + b - 1) / b - 1);
}
static int16_t
div_floor_plus_one(int32_t a, int16_t b) {
- return (a + b) / b;
+ return (int16_t) ((a + b) / b);
}
static int8_t
/* Clip major axis */
if (c->major < b->maj1) {
if (c->sign_major <= 0)
- return FALSE;
+ return false;
adjust_major = b->maj1 - c->major;
} else if (c->major >= b->maj2) {
if (c->sign_major >= 0)
- return FALSE;
+ return false;
adjust_major = c->major - (b->maj2-1);
}
/* Clip minor axis */
if (c->minor < b->min1) {
if (c->sign_minor <= 0)
- return FALSE;
+ return false;
adjust_minor = b->min1 - c->minor;
} else if (c->minor >= b->min2) {
if (c->sign_minor >= 0)
- return FALSE;
+ return false;
adjust_minor = c->minor - (b->min2-1);
}
/* If unclipped, we're done */
if (adjust_major == 0 && adjust_minor == 0)
- return TRUE;
+ return true;
/* See how much minor adjustment would happen during
* a major clip. This is a bit tricky because line drawing
*/
int32_t adj_min;
- if (!c->first)
- adj_min = div_ceil(c->e + adjust_major * c->e1, -c->e3);
- else
- adj_min = div_floor_plus_one(c->e + adjust_major * c->e1, -c->e3);
+ if (c->e3) {
+ if (!c->first)
+ adj_min = div_ceil(c->e + adjust_major * c->e1, -c->e3);
+ else
+ adj_min = div_floor_plus_one(c->e + adjust_major * c->e1, -c->e3);
+ }
if (adj_min < adjust_minor) {
- if (c->first)
- adjust_major = div_ceil(c->e - adjust_minor * c->e3, c->e1);
- else
- adjust_major = div_floor_plus_one(c->e - adjust_minor * c->e3, c->e1);
+ if (c->e1) {
+ if (c->first)
+ adjust_major = div_ceil(c->e - adjust_minor * c->e3, c->e1);
+ else
+ adjust_major = div_floor_plus_one(c->e - adjust_minor * c->e3, c->e1);
+ }
} else {
adjust_minor = adj_min;
}
- c->e += adjust_major * c->e1 + adjust_minor * c->e3;
+ c->e = (int16_t) (c->e + adjust_major * c->e1 + adjust_minor * c->e3);
- c->major += c->sign_major * adjust_major;
- c->minor += c->sign_minor * adjust_minor;
+ c->major = (int16_t) (c->major + c->sign_major * adjust_major);
+ c->minor = (int16_t) (c->minor + c->sign_minor * adjust_minor);
- return TRUE;
+ c->first = true; /* signal to extend len */
+ return true;
}
void
-ao_line(const struct ao_bitmap *dst,
+ao_line(struct ao_bitmap *dst,
int16_t x1,
int16_t y1,
int16_t x2,
if (adx > ady) {
axis = X_AXIS;
e1 = ady << 1;
- e2 = e1 - (adx << 1);
+ e2 = e1 - (int16_t) (adx << 1);
e = e1 - adx;
clip_1.major = x1;
} else {
axis = Y_AXIS;
e1 = adx << 1;
- e2 = e1 - (ady << 1);
+ e2 = e1 - (int16_t) (ady << 1);
e = e1 - ady;
clip_1.major = y1;
e3 = e2 - e1;
e = e - e1;
- clip_1.first = TRUE;
- clip_2.first = FALSE;
+ clip_1.first = true;
+ clip_2.first = false;
clip_2.e = clip_1.e = e;
clip_2.e1 = clip_1.e1 = e1;
clip_2.e3 = clip_1.e3 = e3;
if (!ao_clip_line(&clip_2, &cbox))
return;
- len = clip_1.sign_major * (clip_2.major - clip_1.major) + clip_2.first;
+ len = (int16_t) (clip_1.sign_major * (clip_2.major - clip_1.major) + clip_2.first);
if (len <= 0)
return;
if (adx > ady) {
x1 = clip_1.major;
y1 = clip_1.minor;
+ x2 = clip_2.major;
+ y2 = clip_2.minor;
} else {
x1 = clip_1.minor;
y1 = clip_1.major;
+ x2 = clip_2.minor;
+ y2 = clip_2.major;
}
+
+ ao_damage(dst, ao_min16(x1, x2), ao_max16(x1, x2), ao_min16(y1, y2), ao_max16(y1, y2));
+
ao_bres(dst,
signdx,
signdy,