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

[Dave Beckett]

Committed by: dajobe

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

Modified Files:
	icformat.c 
Log Message:
Correct some more renames where the order of the renaming
caused later renames to fail due to earlier prefixes failing.


Index: icformat.c
===================================================================
RCS file: /cvs/cairo/libpixman/src/icformat.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** icformat.c	10 Dec 2003 23:23:25 -0000	1.8
--- icformat.c	10 Dec 2003 23:39:50 -0000	1.9
***************
*** 31,35 ****
      switch (name) {
      case PIXMAN_FORMAT_NAME_AR_GB32:
! 	return pixman_format_createMasks (32,
  				    0xff000000,
  				    0x00ff0000,
--- 31,35 ----
      switch (name) {
      case PIXMAN_FORMAT_NAME_AR_GB32:
! 	return pixman_format_create_masks (32,
  				    0xff000000,
  				    0x00ff0000,
***************
*** 37,41 ****
  				    0x000000ff);
      case PIXMAN_FORMAT_NAME_RG_B24:
! 	return pixman_format_createMasks (32,
  				    0x0,
  				    0xff0000,
--- 37,41 ----
  				    0x000000ff);
      case PIXMAN_FORMAT_NAME_RG_B24:
! 	return pixman_format_create_masks (32,
  				    0x0,
  				    0xff0000,
***************
*** 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);
      }
--- 43,50 ----
  				    0x0000ff);
      case PIXMAN_FORMAT_NAME_A8:
! 	return pixman_format_create_masks (8, 0xff,
  				    0, 0, 0);
      case PIXMAN_FORMAT_NAME_A1:
! 	return pixman_format_create_masks (1, 0x1,
  				    0, 0, 0);
      }
***************
*** 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,
--- 54,63 ----
  
  /* XXX: There's some nonsense going on here. The macros above help
!    pixman_format_create_masks 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_create_masks (int bpp,
  		     int alpha_mask,
  		     int red_mask,