hmmm now why did this break? hmmmm.... err.,.. hmmm

SVN revision: 5313
This commit is contained in:
Carsten Haitzler 2001-08-30 03:05:31 +00:00
parent 02944af5cb
commit ebb3f680a3
3 changed files with 5 additions and 5 deletions

View File

@ -3242,7 +3242,7 @@ imlib_image_draw_pixel(int x, int y, char make_updates)
__imlib_DirtyPixmapsForImage(im); __imlib_DirtyPixmapsForImage(im);
if (ctx->cliprect.w) if (ctx->cliprect.w)
{ {
__imlib_set_point(im, x, y, __imlib_draw_set_point(im, x, y,
(DATA8) ctx->color.red, (DATA8) ctx->color.red,
(DATA8) ctx->color.green, (DATA8) ctx->color.green,
(DATA8) ctx->color.blue, (DATA8) ctx->color.blue,
@ -3251,7 +3251,7 @@ imlib_image_draw_pixel(int x, int y, char make_updates)
} }
else else
{ {
__imlib_set_point_clipped(im, x, y, __imlib_draw_set_point_clipped(im, x, y,
ctx->cliprect.x, ctx->cliprect.x,
ctx->cliprect.x + ctx->cliprect.x +
ctx->cliprect.w - 1, ctx->cliprect.w - 1,

View File

@ -7,9 +7,6 @@
#include "updates.h" #include "updates.h"
#include "rgbadraw.h" #include "rgbadraw.h"
#define XY_IN_RECT(x, y, rx, ry, rw, rh) \
(((x) >= (rx)) && ((y) >= (ry)) && ((x) <= ((rx) + (rw))) && ((y) <= ((ry) + (rh))))
#define round(a) floor(a+0.5) #define round(a) floor(a+0.5)
static void span(ImlibImage * im, int y, int x1, int y1, static void span(ImlibImage * im, int y, int x1, int y1,

View File

@ -32,6 +32,9 @@
#define __imlib_point_on_segment(p_x, p_y, s1_x, s1_y, s2_x, s2_y) \ #define __imlib_point_on_segment(p_x, p_y, s1_x, s1_y, s2_x, s2_y) \
__imlib_segments_intersect(p_x, p_y, p_x, p_y, s1_x, s1_y, s2_x, s2_y) __imlib_segments_intersect(p_x, p_y, p_x, p_y, s1_x, s1_y, s2_x, s2_y)
#define XY_IN_RECT(x, y, rx, ry, rw, rh) \
(((x) >= (rx)) && ((y) >= (ry)) && ((x) <= ((rx) + (rw))) && ((y) <= ((ry) + (rh))))
#define __imlib_draw_set_point(im, x, y, r, g, b, a, op) \ #define __imlib_draw_set_point(im, x, y, r, g, b, a, op) \
{ \ { \
DATA32 *p; int tmp; \ DATA32 *p; int tmp; \