[cairo-commit] libglc/src glc.c,1.6,1.7 glc_operator.c,1.1.1.1,1.2 glcint.h,1.4,1.5

[David Reveman]

Committed by: davidr

Update of /cvs/cairo/libglc/src
In directory pdx:/tmp/cvs-serv18183/src

Modified Files:
	glc.c glc_operator.c glcint.h 
Log Message:
Use GLC_OPERATOR_IN instead of GLC_OPERATOR_MASK

Index: glc.c
===================================================================
RCS file: /cvs/cairo/libglc/src/glc.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** glc.c	4 Dec 2003 12:55:29 -0000	1.6
--- glc.c	4 Dec 2003 19:18:08 -0000	1.7
***************
*** 145,149 ****
      height = mask_surface->height;
  
!     glc_composite (GLC_OPERATOR_MASK,
                     src, NULL, mask_surface,
                     x_src, y_src, 0, 0, 0, 0,
--- 145,149 ----
      height = mask_surface->height;
  
!     glc_composite (GLC_OPERATOR_IN,
                     src, NULL, mask_surface,
                     x_src, y_src, 0, 0, 0, 0,

Index: glc_operator.c
===================================================================
RCS file: /cvs/cairo/libglc/src/glc_operator.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** glc_operator.c	27 Nov 2003 11:47:15 -0000	1.1.1.1
--- glc_operator.c	4 Dec 2003 19:18:08 -0000	1.2
***************
*** 34,44 ****
  void
  glc_set_operator (glc_operator_t op) {
- 
-   if (op == GLC_OPERATOR_MASK) {
-     glEnable (GL_BLEND);
-     glBlendFunc (GL_DST_ALPHA, GL_ZERO);
-     return;
-   }
-   
    switch (op) {
    case GLC_OPERATOR_CLEAR:
--- 34,37 ----

Index: glcint.h
===================================================================
RCS file: /cvs/cairo/libglc/src/glcint.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** glcint.h	4 Dec 2003 12:55:29 -0000	1.4
--- glcint.h	4 Dec 2003 19:18:08 -0000	1.5
***************
*** 37,42 ****
  #include <slim_internal.h>
  
- #define GLC_OPERATOR_MASK 0x2c
- 
  #define GLC_STATUS_NO_MEMORY_MASK          (1L << 0)
  #define GLC_STATUS_NULL_POINTER_MASK       (1L << 1)
--- 37,40 ----