diff options
| author | David Reveman <davidr@novell.com> | 2004-09-11 00:16:23 +0000 |
|---|---|---|
| committer | David Reveman <davidr@novell.com> | 2004-09-11 00:16:23 +0000 |
| commit | d3ab77ad365c0b0100565facdbaa7a8e34f4b119 (patch) | |
| tree | ff309f02be177f4106f49f4f56b68621842276af /src | |
| parent | 630708c28ae80cae10282023c87aadbc4a5ef50f (diff) | |
A few bug fixes
Diffstat (limited to 'src')
| -rw-r--r-- | src/glitz.c | 4 | ||||
| -rw-r--r-- | src/glitz_rect.c | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/glitz.c b/src/glitz.c index 85de9e3..ce7efaf 100644 --- a/src/glitz.c +++ b/src/glitz.c @@ -223,8 +223,8 @@ glitz_composite (glitz_operator_t op, glitz_texture_set_tex_gen (gl, stexture, - rect.x1 - y_src, - rect.y1 - x_src, + rect.x1 - x_src, + rect.y1 - y_src, src->flags); if (src->transform) { diff --git a/src/glitz_rect.c b/src/glitz_rect.c index f08e09b..46ed484 100644 --- a/src/glitz_rect.c +++ b/src/glitz_rect.c @@ -48,11 +48,11 @@ glitz_rectangle_bounds (const glitz_rectangle_t *rects, for (; n_rects; n_rects--, rects++) { if (rects->x < box->x1) box->x1 = rects->x; - else if ((rects->x + rects->width) > box->x2) + if ((rects->x + rects->width) > box->x2) box->x2 = rects->x + rects->width; if (rects->y < box->y1) box->y1 = rects->y; - else if ((rects->y + rects->height) > box->y2) + if ((rects->y + rects->height) > box->y2) box->y2 = rects->y + rects->height; } } @@ -81,7 +81,7 @@ glitz_set_rectangles (glitz_surface_t *dst, dst->flags |= GLITZ_SURFACE_FLAG_DRAWABLE_DIRTY_MASK; return; } - + if (glitz_surface_push_current (dst, GLITZ_CN_SURFACE_DRAWABLE_CURRENT)) { gl->clear_color (color->red / (glitz_gl_clampf_t) 0xffff, color->green / (glitz_gl_clampf_t) 0xffff, @@ -144,6 +144,7 @@ glitz_set_rectangles (glitz_surface_t *dst, glitz_surface_pop_current (dst); } +slim_hidden_def(glitz_set_rectangles); void glitz_set_rectangle (glitz_surface_t *dst, |