[cairo-commit] libpixman/src icformat.c,1.7,1.8

[Dave Beckett]

Committed by: dajobe

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

Modified Files:
	icformat.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: icformat.c
===================================================================
RCS file: /cvs/cairo/libpixman/src/icformat.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** icformat.c	10 Dec 2003 22:20:37 -0000	1.7
--- icformat.c	10 Dec 2003 23:23:25 -0000	1.8
***************
*** 27,35 ****
  
  pixman_format_t *
! pixman_format_tCreate (pixman_format_tName name)
  {
      switch (name) {
      case PIXMAN_FORMAT_NAME_AR_GB32:
! 	return pixman_format_tCreateMasks (32,
  				    0xff000000,
  				    0x00ff0000,
--- 27,35 ----
  
  pixman_format_t *
! pixman_format_create (pixman_format_tName name)
  {
      switch (name) {
      case PIXMAN_FORMAT_NAME_AR_GB32:
! 	return pixman_format_createMasks (32,
  				    0xff000000,
  				    0x00ff0000,
***************
*** 37,41 ****
  				    0x000000ff);
      case PIXMAN_FORMAT_NAME_RG_B24:
! 	return pixman_format_tCreateMasks (32,
  				    0x0,
  				    0xff0000,
--- 37,41 ----
  				    0x000000ff);
      case PIXMAN_FORMAT_NAME_RG_B24:
! 	return pixman_format_createMasks (32,
  				    0x0,
  				    0xff0000,
***************
*** 43,50 ****
  				    0x0000ff);
      case PIXMAN_FORMAT_NAME_A8:
! 	return pixman_format_tCreateMasks (8, 0xff,
  				    0, 0, 0);
      case PIXMAN_FORMAT_NAME_A1:
! 	return pixman_format_tCreateMasks (1, 0x1,
  				    0, 0, 0);
      }
--- 43,50 ----
  				    0x0000ff);
      case PIXMAN_FORMAT_NAME_A8:
! 	return pixman_format_createMasks (8, 0xff,
  				    0, 0, 0);
      case PIXMAN_FORMAT_NAME_A1:
! 	return pixman_format_createMasks (1, 0x1,
  				    0, 0, 0);
      }
***************
*** 54,63 ****
  
  /* XXX: There's some nonsense going on here. The macros above help
!    pixman_format_tCreateMasks to encode a format into an int, while
!    immediately afterwards pixman_format_tInit goes through the effort of
     decoding it. This should all be disentagled, (it's probably
     possible to just eliminate the encoding macros altogether). */
  pixman_format_t *
! pixman_format_tCreateMasks (int bpp,
  		     int alpha_mask,
  		     int red_mask,
--- 54,63 ----
  
  /* XXX: There's some nonsense going on here. The macros above help
!    pixman_format_createMasks to encode a format into an int, while
!    immediately afterwards pixman_format_init goes through the effort of
     decoding it. This should all be disentagled, (it's probably
     possible to just eliminate the encoding macros altogether). */
  pixman_format_t *
! pixman_format_createMasks (int bpp,
  		     int alpha_mask,
  		     int red_mask,
***************
*** 86,90 ****
  	return NULL;
  
!     pixman_format_tInit (format, format_code);
  
      return format;
--- 86,90 ----
  	return NULL;
  
!     pixman_format_init (format, format_code);
  
      return format;
***************
*** 92,96 ****
  
  void
! pixman_format_tInit (pixman_format_t *format, int format_code)
  {
  /* XXX: What do we want to lodge in here?
--- 92,96 ----
  
  void
! pixman_format_init (pixman_format_t *format, int format_code)
  {
  /* XXX: What do we want to lodge in here?
***************
*** 148,155 ****
      }
  }
! slim_hidden_def(pixman_format_tInit);
  
  void
! pixman_format_tDestroy (pixman_format_t *format)
  {
      free (format);
--- 148,155 ----
      }
  }
! slim_hidden_def(pixman_format_init);
  
  void
! pixman_format_destroy (pixman_format_t *format)
  {
      free (format);