[cairo-commit] libpixman/src icimage.c,1.16,1.17

[Dave Beckett]

Committed by: dajobe

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

Modified Files:
	icimage.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: icimage.c
===================================================================
RCS file: /cvs/cairo/libpixman/src/icimage.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** icimage.c	10 Dec 2003 22:20:44 -0000	1.16
--- icimage.c	10 Dec 2003 23:23:31 -0000	1.17
***************
*** 25,29 ****
  
  pixman_image_t *
! pixman_image_tCreate (pixman_format_t	*format,
  	       int	width,
  	       int	height)
--- 25,29 ----
  
  pixman_image_t *
! pixman_image_create (pixman_format_t	*format,
  	       int	width,
  	       int	height)
***************
*** 36,40 ****
  	return NULL;
      
!     image = pixman_image_tCreateForPixels (pixels, format);
      if (image == NULL) {
  	IcPixelsDestroy (pixels);
--- 36,40 ----
  	return NULL;
      
!     image = pixman_image_createForPixels (pixels, format);
      if (image == NULL) {
  	IcPixelsDestroy (pixels);
***************
*** 46,53 ****
      return image;
  }
! slim_hidden_def(pixman_image_tCreate);
  
  pixman_image_t *
! pixman_image_tCreateForData (pixman_bits_t *data, pixman_format_t *format, int width, int height, int bpp, int stride)
  {
      pixman_image_t	*image;
--- 46,53 ----
      return image;
  }
! slim_hidden_def(pixman_image_create);
  
  pixman_image_t *
! pixman_image_createForData (pixman_bits_t *data, pixman_format_t *format, int width, int height, int bpp, int stride)
  {
      pixman_image_t	*image;
***************
*** 58,62 ****
  	return NULL;
  
!     image = pixman_image_tCreateForPixels (pixels, format);
      if (image == NULL) {
  	IcPixelsDestroy (pixels);
--- 58,62 ----
  	return NULL;
  
!     image = pixman_image_createForPixels (pixels, format);
      if (image == NULL) {
  	IcPixelsDestroy (pixels);
***************
*** 70,74 ****
  
  pixman_image_t *
! pixman_image_tCreateForPixels (IcPixels	*pixels,
  			pixman_format_t	*format)
  {
--- 70,74 ----
  
  pixman_image_t *
! pixman_image_createForPixels (IcPixels	*pixels,
  			pixman_format_t	*format)
  {
***************
*** 97,101 ****
  */
  
!     pixman_image_tInit (image);
  
      return image;
--- 97,101 ----
  */
  
!     pixman_image_init (image);
  
      return image;
***************
*** 103,107 ****
  
  void
! pixman_image_tInit (pixman_image_t *image)
  {
      image->refcnt = 1;
--- 103,107 ----
  
  void
! pixman_image_init (pixman_image_t *image)
  {
      image->refcnt = 1;
***************
*** 146,150 ****
  
  int
! pixman_image_tSetTransform (pixman_image_t		*image,
  		     pixman_transform_t	*transform)
  {
--- 146,150 ----
  
  int
! pixman_image_set_transform (pixman_image_t		*image,
  		     pixman_transform_t	*transform)
  {
***************
*** 180,184 ****
  
  void
! pixman_image_tSetRepeat (pixman_image_t	*image,
  		  int		repeat)
  {
--- 180,184 ----
  
  void
! pixman_image_set_repeat (pixman_image_t	*image,
  		  int		repeat)
  {
***************
*** 186,193 ****
  	image->repeat = repeat;
  }
! slim_hidden_def(pixman_image_tSetRepeat);
  
  void
! pixman_image_tSetFilter (pixman_image_t	*image,
  		  pixman_filter_t	filter)
  {
--- 186,193 ----
  	image->repeat = repeat;
  }
! slim_hidden_def(pixman_image_set_repeat);
  
  void
! pixman_image_set_filter (pixman_image_t	*image,
  		  pixman_filter_t	filter)
  {
***************
*** 197,201 ****
  
  int
! pixman_image_tGetWidth (pixman_image_t	*image)
  {
      return image->pixels->width;
--- 197,201 ----
  
  int
! pixman_image_get_width (pixman_image_t	*image)
  {
      return image->pixels->width;
***************
*** 203,207 ****
  
  int
! pixman_image_tGetHeight (pixman_image_t	*image)
  {
      return image->pixels->height;
--- 203,207 ----
  
  int
! pixman_image_get_height (pixman_image_t	*image)
  {
      return image->pixels->height;
***************
*** 209,213 ****
  
  int
! pixman_image_tGetDepth (pixman_image_t	*image)
  {
      return image->pixels->depth;
--- 209,213 ----
  
  int
! pixman_image_get_depth (pixman_image_t	*image)
  {
      return image->pixels->depth;
***************
*** 215,219 ****
  
  int
! pixman_image_tGetStride (pixman_image_t	*image)
  {
      return image->pixels->stride;
--- 215,219 ----
  
  int
! pixman_image_get_stride (pixman_image_t	*image)
  {
      return image->pixels->stride;
***************
*** 221,225 ****
  
  pixman_bits_t *
! pixman_image_tGetData (pixman_image_t	*image)
  {
      return image->pixels->data;
--- 221,225 ----
  
  pixman_bits_t *
! pixman_image_get_data (pixman_image_t	*image)
  {
      return image->pixels->data;
***************
*** 227,231 ****
  
  void
! pixman_image_tDestroy (pixman_image_t *image)
  {
      if (image->freeCompClip)
--- 227,231 ----
  
  void
! pixman_image_destroy (pixman_image_t *image)
  {
      if (image->freeCompClip)
***************
*** 240,247 ****
      free (image);
  }
! slim_hidden_def(pixman_image_tDestroy);
  
  void
! pixman_image_tDestroyClip (pixman_image_t *image)
  {
      switch (image->clientClipType) {
--- 240,247 ----
      free (image);
  }
! slim_hidden_def(pixman_image_destroy);
  
  void
! pixman_image_destroyClip (pixman_image_t *image)
  {
      switch (image->clientClipType) {
***************
*** 249,253 ****
  	return;
      case CT_PIXMAP:
! 	pixman_image_tDestroy (image->clientClip);
  	break;
      default:
--- 249,253 ----
  	return;
      case CT_PIXMAP:
! 	pixman_image_destroy (image->clientClip);
  	break;
      default:
***************
*** 260,267 ****
  
  int
! pixman_image_tSetClipRegion (pixman_image_t	*image,
  		      pixman_region16_t	*region)
  {
!     pixman_image_tDestroyClip (image);
      image->clientClip = region;
      image->clientClipType = CT_REGION;
--- 260,267 ----
  
  int
! pixman_image_set_clip_region (pixman_image_t	*image,
  		      pixman_region16_t	*region)
  {
!     pixman_image_destroyClip (image);
      image->clientClip = region;
      image->clientClipType = CT_REGION;
***************
*** 386,390 ****
  		    iAlpha->refcnt++;
  		if (image->alphaMap)
! 		    pixman_image_tDestroy ((void *) image->alphaMap);
  		image->alphaMap = iAlpha;
  	    }
--- 386,390 ----
  		    iAlpha->refcnt++;
  		if (image->alphaMap)
! 		    pixman_image_destroy ((void *) image->alphaMap);
  		image->alphaMap = iAlpha;
  	    }