[cairo-commit] libpixman/src icrect.c,1.8,1.9

Dave Beckett commit at pdx.freedesktop.org
Wed Dec 10 15:23:57 PST 2003


Committed by: dajobe

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

Modified Files:
	icrect.c 
Log Message:
Correct over-eager renames of the form pixman_thing_tName into
pixman_thing_name.  It was inevitable really this would happen!


Index: icrect.c
===================================================================
RCS file: /cvs/cairo/libpixman/src/icrect.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** icrect.c	10 Dec 2003 22:21:10 -0000	1.8
--- icrect.c	10 Dec 2003 23:23:55 -0000	1.9
***************
*** 126,130 ****
  	pixman_bits_t		pixel;
  
! 	pixman_format_tInit (&rgbaFormat, PICT_a8r8g8b8);
  	
  	pixels = IcPixelsCreate (1, 1, rgbaFormat.depth);
--- 126,130 ----
  	pixman_bits_t		pixel;
  
! 	pixman_format_init (&rgbaFormat, PICT_a8r8g8b8);
  	
  	pixels = IcPixelsCreate (1, 1, rgbaFormat.depth);
***************
*** 132,136 ****
  	    goto bail1;
  	
! 	pixman_color_tToPixel (&rgbaFormat, &color_s, &pixel);
  
  	/* XXX: Originally, fb had the following:
--- 132,136 ----
  	    goto bail1;
  	
! 	pixman_color_to_pixel (&rgbaFormat, &color_s, &pixel);
  
  	/* XXX: Originally, fb had the following:
***************
*** 143,151 ****
  	pixels->data[0] = pixel;
  
! 	src = pixman_image_tCreateForPixels (pixels, &rgbaFormat);
  	if (!src)
  	    goto bail2;
  
! 	pixman_image_tSetRepeat (src, 1);
  
  	while (nRects--)
--- 143,151 ----
  	pixels->data[0] = pixel;
  
! 	src = pixman_image_createForPixels (pixels, &rgbaFormat);
  	if (!src)
  	    goto bail2;
  
! 	pixman_image_set_repeat (src, 1);
  
  	while (nRects--)
***************
*** 159,163 ****
  	}
  
! 	pixman_image_tDestroy (src);
  bail2:
  	IcPixelsDestroy (pixels);
--- 159,163 ----
  	}
  
! 	pixman_image_destroy (src);
  bail2:
  	IcPixelsDestroy (pixels);





More information about the cairo-commit mailing list