[cairo-commit] glitz/src glitz.c,1.23,1.24 glitz_rect.c,1.9,1.10

[David Reveman]

Committed by: davidr

Update of /cvs/cairo/glitz/src
In directory gabe:/tmp/cvs-serv29804/src

Modified Files:
	glitz.c glitz_rect.c 
Log Message:
A few bug fixes

Index: glitz.c
===================================================================
RCS file: /cvs/cairo/glitz/src/glitz.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** glitz.c	9 Sep 2004 09:50:26 -0000	1.23
--- glitz.c	11 Sep 2004 00:16:23 -0000	1.24
***************
*** 224,229 ****
      glitz_texture_set_tex_gen (gl,
                                 stexture,
!                                rect.x1 - y_src,
!                                rect.y1 - x_src,
                                 src->flags);
  
--- 224,229 ----
      glitz_texture_set_tex_gen (gl,
                                 stexture,
!                                rect.x1 - x_src,
!                                rect.y1 - y_src,
                                 src->flags);
  

Index: glitz_rect.c
===================================================================
RCS file: /cvs/cairo/glitz/src/glitz_rect.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** glitz_rect.c	6 Sep 2004 22:23:29 -0000	1.9
--- glitz_rect.c	11 Sep 2004 00:16:23 -0000	1.10
***************
*** 49,57 ****
      if (rects->x < box->x1)
        box->x1 = rects->x;
!     else 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)
        box->y2 = rects->y + rects->height;
    }
--- 49,57 ----
      if (rects->x < box->x1)
        box->x1 = rects->x;
!     if ((rects->x + rects->width) > box->x2)
        box->x2 = rects->x + rects->width;
      if (rects->y < box->y1)
        box->y1 = rects->y;
!     if ((rects->y + rects->height) > box->y2)
        box->y2 = rects->y + rects->height;
    }
***************
*** 82,86 ****
      return;
    }
!   
    if (glitz_surface_push_current (dst, GLITZ_CN_SURFACE_DRAWABLE_CURRENT)) {
      gl->clear_color (color->red / (glitz_gl_clampf_t) 0xffff,
--- 82,86 ----
      return;
    }
! 
    if (glitz_surface_push_current (dst, GLITZ_CN_SURFACE_DRAWABLE_CURRENT)) {
      gl->clear_color (color->red / (glitz_gl_clampf_t) 0xffff,
***************
*** 145,148 ****
--- 145,149 ----
    glitz_surface_pop_current (dst);
  }
+ slim_hidden_def(glitz_set_rectangles);
  
  void