[cairo-commit] cairo/src cairo_gstate.c, 1.49, 1.50 cairo_pattern.c, 1.7, 1.8 cairo_surface.c, 1.29, 1.30 cairoint.h, 1.60, 1.61

[David Reveman]

Committed by: davidr

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

Modified Files:
	cairo_gstate.c cairo_pattern.c cairo_surface.c cairoint.h 
Log Message:
Removed pattern_offset

Index: cairo_gstate.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo_gstate.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** a/cairo_gstate.c	30 Apr 2004 05:09:06 -0000	1.49
--- b/cairo_gstate.c	11 May 2004 18:20:06 -0000	1.50
***************
*** 79,84 ****
      
      gstate->pattern = _cairo_pattern_create_solid (1.0, 1.0, 1.0);
-     gstate->pattern_offset.x = 0.0;
-     gstate->pattern_offset.y = 0.0;
      gstate->alpha = 1.0;
  
--- 79,82 ----
***************
*** 401,406 ****
      
      gstate->pattern = _cairo_pattern_create_solid (red, green, blue);
-     gstate->pattern_offset.x = 0.0;
-     gstate->pattern_offset.y = 0.0;
      
      return CAIRO_STATUS_SUCCESS;
--- 399,402 ----
***************
*** 1277,1284 ****
      _cairo_pattern_transform (pattern, &gstate->ctm_inverse);
  
-     _cairo_pattern_set_source_offset (pattern,
- 				      gstate->pattern_offset.x,
- 				      gstate->pattern_offset.y);
- 
      status = _cairo_surface_create_pattern (gstate->surface, pattern, extents);
      if (status) {
--- 1273,1276 ----

Index: cairo_pattern.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo_pattern.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** a/cairo_pattern.c	4 May 2004 11:01:18 -0000	1.7
--- b/cairo_pattern.c	11 May 2004 18:20:06 -0000	1.8
***************
*** 701,714 ****
  	
  	if (pattern->type == CAIRO_PATTERN_RADIAL)
! 	    _cairo_image_data_set_radial (pattern,
! 					  x - pattern->source_offset.x,
! 					  y - pattern->source_offset.y,
! 					  (int *) data,
  					  width, height);
  	else
! 	    _cairo_image_data_set_linear (pattern,
! 					  x - pattern->source_offset.x,
! 					  y - pattern->source_offset.y,
! 					  (int *) data,
  					  width, height);
  
--- 701,708 ----
  	
  	if (pattern->type == CAIRO_PATTERN_RADIAL)
! 	    _cairo_image_data_set_radial (pattern, x, y, (int *) data,
  					  width, height);
  	else
! 	    _cairo_image_data_set_linear (pattern, x, y, (int *) data,
  					  width, height);
  

Index: cairo_surface.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo_surface.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** a/cairo_surface.c	25 Apr 2004 11:02:38 -0000	1.29
--- b/cairo_surface.c	11 May 2004 18:20:06 -0000	1.30
***************
*** 462,470 ****
  						  save_repeat);
              
! 			if (status == CAIRO_STATUS_SUCCESS) {
! 			    _cairo_pattern_set_source_offset (pattern,
! 							      pattern->source_offset.x + x,
! 							      pattern->source_offset.y + y);
! 			} else
  			    cairo_surface_destroy (pattern->source);
  		    }
--- 462,468 ----
  						  save_repeat);
              
! 			if (status == CAIRO_STATUS_SUCCESS)
! 			    _cairo_pattern_set_source_offset (pattern, x, y);
! 			else
  			    cairo_surface_destroy (pattern->source);
  		    }

Index: cairoint.h
===================================================================
RCS file: /cvs/cairo/cairo/src/cairoint.h,v
retrieving revision 1.60
retrieving revision 1.61
diff -C2 -d -r1.60 -r1.61
*** a/cairoint.h	30 Apr 2004 03:26:56 -0000	1.60
--- b/cairoint.h	11 May 2004 18:20:06 -0000	1.61
***************
*** 575,579 ****
  
      cairo_pattern_t *pattern;
-     cairo_point_double_t pattern_offset;
      double alpha;
  
--- 575,578 ----