[cairo-commit] libpixman/src ic.c,1.12,1.13

Dave Beckett commit at pdx.freedesktop.org
Wed Dec 10 14:20:07 PST 2003


Committed by: dajobe

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

Modified Files:
	ic.c 
Log Message:
Rename exported Ic* and PixRegion* functions, types, enums
to be prefixed pixman (or PIXMAN for enum values)


Index: ic.c
===================================================================
RCS file: /cvs/cairo/libpixman/src/ic.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** ic.c	29 Oct 2003 18:45:02 -0000	1.12
--- ic.c	10 Dec 2003 22:20:05 -0000	1.13
***************
*** 98,102 ****
  
  #define IcComposeGetSolid(image, bits) { \
!     IcBits	*__bits__; \
      IcStride	__stride__; \
      int		__bpp__; \
--- 98,102 ----
  
  #define IcComposeGetSolid(image, bits) { \
!     pixman_bits_t	*__bits__; \
      IcStride	__stride__; \
      int		__bpp__; \
***************
*** 124,128 ****
  
  #define IcComposeGetStart(image,x,y,type,stride,line,mul) {\
!     IcBits	*__bits__; \
      IcStride	__stride__; \
      int		__bpp__; \
--- 124,128 ----
  
  #define IcComposeGetStart(image,x,y,type,stride,line,mul) {\
!     pixman_bits_t	*__bits__; \
      IcStride	__stride__; \
      int		__bpp__; \
***************
*** 130,134 ****
  \
      IcGetPixels((image)->pixels,__bits__,__stride__,__bpp__,__xoff__,__yoff__); \
!     (stride) = __stride__ * sizeof (IcBits) / sizeof (type); \
      (line) = ((type *) __bits__) + (stride) * ((y) - __yoff__) + (mul) * ((x) - __xoff__); \
  }
--- 130,134 ----
  \
      IcGetPixels((image)->pixels,__bits__,__stride__,__bpp__,__xoff__,__yoff__); \
!     (stride) = __stride__ * sizeof (pixman_bits_t) / sizeof (type); \
      (line) = ((type *) __bits__) + (stride) * ((y) - __yoff__) + (mul) * ((x) - __xoff__); \
  }
***************
*** 141,148 ****
  
  static void
! IcCompositeSolidMask_nx8x8888 (IcOperator   op,
! 			       IcImage    *iSrc,
! 			       IcImage    *iMask,
! 			       IcImage    *iDst,
  			       int16_t      xSrc,
  			       int16_t      ySrc,
--- 141,148 ----
  
  static void
! pixman_compositeSolidMask_nx8x8888 (pixman_operator_t   op,
! 			       pixman_image_t    *iSrc,
! 			       pixman_image_t    *iMask,
! 			       pixman_image_t    *iDst,
  			       int16_t      xSrc,
  			       int16_t      ySrc,
***************
*** 199,206 ****
  
  static void
! IcCompositeSolidMask_nx8888x8888C (IcOperator   op,
! 				   IcImage    *iSrc,
! 				   IcImage    *iMask,
! 				   IcImage    *iDst,
  				   int16_t      xSrc,
  				   int16_t      ySrc,
--- 199,206 ----
  
  static void
! pixman_compositeSolidMask_nx8888x8888C (pixman_operator_t   op,
! 				   pixman_image_t    *iSrc,
! 				   pixman_image_t    *iMask,
! 				   pixman_image_t    *iDst,
  				   int16_t      xSrc,
  				   int16_t      ySrc,
***************
*** 272,279 ****
  
  static void
! IcCompositeSolidMask_nx8x0888 (IcOperator   op,
! 			       IcImage    *iSrc,
! 			       IcImage    *iMask,
! 			       IcImage    *iDst,
  			       int16_t      xSrc,
  			       int16_t      ySrc,
--- 272,279 ----
  
  static void
! pixman_compositeSolidMask_nx8x0888 (pixman_operator_t   op,
! 			       pixman_image_t    *iSrc,
! 			       pixman_image_t    *iMask,
! 			       pixman_image_t    *iDst,
  			       int16_t      xSrc,
  			       int16_t      ySrc,
***************
*** 334,341 ****
  
  static void
! IcCompositeSolidMask_nx8x0565 (IcOperator      op,
! 				  IcImage    *iSrc,
! 				  IcImage    *iMask,
! 				  IcImage    *iDst,
  				  int16_t      xSrc,
  				  int16_t      ySrc,
--- 334,341 ----
  
  static void
! pixman_compositeSolidMask_nx8x0565 (pixman_operator_t      op,
! 				  pixman_image_t    *iSrc,
! 				  pixman_image_t    *iMask,
! 				  pixman_image_t    *iDst,
  				  int16_t      xSrc,
  				  int16_t      ySrc,
***************
*** 397,404 ****
  
  static void
! IcCompositeSolidMask_nx8888x0565C (IcOperator   op,
! 				   IcImage    *iSrc,
! 				   IcImage    *iMask,
! 				   IcImage    *iDst,
  				   int16_t      xSrc,
  				   int16_t      ySrc,
--- 397,404 ----
  
  static void
! pixman_compositeSolidMask_nx8888x0565C (pixman_operator_t   op,
! 				   pixman_image_t    *iSrc,
! 				   pixman_image_t    *iMask,
! 				   pixman_image_t    *iDst,
  				   int16_t      xSrc,
  				   int16_t      ySrc,
***************
*** 470,477 ****
  
  static void
! IcCompositeSrc_8888x8888 (IcOperator  op,
! 			 IcImage    *iSrc,
! 			 IcImage    *iMask,
! 			 IcImage    *iDst,
  			 int16_t      xSrc,
  			 int16_t      ySrc,
--- 470,477 ----
  
  static void
! pixman_compositeSrc_8888x8888 (pixman_operator_t  op,
! 			 pixman_image_t    *iSrc,
! 			 pixman_image_t    *iMask,
! 			 pixman_image_t    *iDst,
  			 int16_t      xSrc,
  			 int16_t      ySrc,
***************
*** 516,523 ****
  
  static void
! IcCompositeSrc_8888x0888 (IcOperator  op,
! 			 IcImage    *iSrc,
! 			 IcImage    *iMask,
! 			 IcImage    *iDst,
  			 int16_t      xSrc,
  			 int16_t      ySrc,
--- 516,523 ----
  
  static void
! pixman_compositeSrc_8888x0888 (pixman_operator_t  op,
! 			 pixman_image_t    *iSrc,
! 			 pixman_image_t    *iMask,
! 			 pixman_image_t    *iDst,
  			 int16_t      xSrc,
  			 int16_t      ySrc,
***************
*** 565,572 ****
  
  static void
! IcCompositeSrc_8888x0565 (IcOperator  op,
! 			 IcImage    *iSrc,
! 			 IcImage    *iMask,
! 			 IcImage    *iDst,
  			 int16_t      xSrc,
  			 int16_t      ySrc,
--- 565,572 ----
  
  static void
! pixman_compositeSrc_8888x0565 (pixman_operator_t  op,
! 			 pixman_image_t    *iSrc,
! 			 pixman_image_t    *iMask,
! 			 pixman_image_t    *iDst,
  			 int16_t      xSrc,
  			 int16_t      ySrc,
***************
*** 617,624 ****
  
  static void
! IcCompositeSrc_0565x0565 (IcOperator   op,
! 			  IcImage    *iSrc,
! 			  IcImage    *iMask,
! 			  IcImage    *iDst,
  			  int16_t      xSrc,
  			  int16_t      ySrc,
--- 617,624 ----
  
  static void
! pixman_compositeSrc_0565x0565 (pixman_operator_t   op,
! 			  pixman_image_t    *iSrc,
! 			  pixman_image_t    *iMask,
! 			  pixman_image_t    *iDst,
  			  int16_t      xSrc,
  			  int16_t      ySrc,
***************
*** 653,660 ****
  
  static void
! IcCompositeSrcAdd_8000x8000 (IcOperator	  op,
! 			     IcImage    *iSrc,
! 			     IcImage    *iMask,
! 			     IcImage    *iDst,
  			     int16_t      xSrc,
  			     int16_t      ySrc,
--- 653,660 ----
  
  static void
! pixman_compositeSrcAdd_8000x8000 (pixman_operator_t	  op,
! 			     pixman_image_t    *iSrc,
! 			     pixman_image_t    *iMask,
! 			     pixman_image_t    *iDst,
  			     int16_t      xSrc,
  			     int16_t      ySrc,
***************
*** 699,706 ****
  
  static void
! IcCompositeSrcAdd_8888x8888 (IcOperator   op,
! 			     IcImage    *iSrc,
! 			     IcImage    *iMask,
! 			     IcImage    *iDst,
  			     int16_t      xSrc,
  			     int16_t      ySrc,
--- 699,706 ----
  
  static void
! pixman_compositeSrcAdd_8888x8888 (pixman_operator_t   op,
! 			     pixman_image_t    *iSrc,
! 			     pixman_image_t    *iMask,
! 			     pixman_image_t    *iDst,
  			     int16_t      xSrc,
  			     int16_t      ySrc,
***************
*** 752,759 ****
  
  static void
! IcCompositeSrcAdd_1000x1000 (IcOperator   op,
! 			     IcImage    *iSrc,
! 			     IcImage    *iMask,
! 			     IcImage    *iDst,
  			     int16_t      xSrc,
  			     int16_t      ySrc,
--- 752,759 ----
  
  static void
! pixman_compositeSrcAdd_1000x1000 (pixman_operator_t   op,
! 			     pixman_image_t    *iSrc,
! 			     pixman_image_t    *iMask,
! 			     pixman_image_t    *iDst,
  			     int16_t      xSrc,
  			     int16_t      ySrc,
***************
*** 765,769 ****
  			     uint16_t     height)
  {
!     IcBits	*dstBits, *srcBits;
      IcStride	dstStride, srcStride;
      int		dstBpp, srcBpp;
--- 765,769 ----
  			     uint16_t     height)
  {
!     pixman_bits_t	*dstBits, *srcBits;
      IcStride	dstStride, srcStride;
      int		dstBpp, srcBpp;
***************
*** 795,802 ****
  
  static void
! IcCompositeSolidMask_nx1xn (IcOperator   op,
! 			    IcImage    *iSrc,
! 			    IcImage    *iMask,
! 			    IcImage    *iDst,
  			    int16_t      xSrc,
  			    int16_t      ySrc,
--- 795,802 ----
  
  static void
! pixman_compositeSolidMask_nx1xn (pixman_operator_t   op,
! 			    pixman_image_t    *iSrc,
! 			    pixman_image_t    *iMask,
! 			    pixman_image_t    *iDst,
  			    int16_t      xSrc,
  			    int16_t      ySrc,
***************
*** 808,812 ****
  			    uint16_t     height)
  {
!     IcBits	*dstBits;
      IcStip	*maskBits;
      IcStride	dstStride, maskStride;
--- 808,812 ----
  			    uint16_t     height)
  {
!     pixman_bits_t	*dstBits;
      IcStip	*maskBits;
      IcStride	dstStride, maskStride;
***************
*** 814,818 ****
      int		dstXoff, dstYoff;
      int		maskXoff, maskYoff;
!     IcBits	src;
      
      IcComposeGetSolid(iSrc, src);
--- 814,818 ----
      int		dstXoff, dstYoff;
      int		maskXoff, maskYoff;
!     pixman_bits_t	src;
      
      IcComposeGetSolid(iSrc, src);
***************
*** 820,824 ****
      if ((src & 0xff000000) != 0xff000000)
      {
! 	IcCompositeGeneral  (op, iSrc, iMask, iDst,
  			     xSrc, ySrc, xMask, yMask, xDst, yDst, 
  			     width, height);
--- 820,824 ----
      if ((src & 0xff000000) != 0xff000000)
      {
! 	pixman_compositeGeneral  (op, iSrc, iMask, iDst,
  			     xSrc, ySrc, xMask, yMask, xDst, yDst, 
  			     width, height);
***************
*** 861,868 ****
  
  void
! IcComposite (IcOperator	op,
! 	     IcImage	*iSrc,
! 	     IcImage	*iMask,
! 	     IcImage	*iDst,
  	     int	xSrc,
  	     int	ySrc,
--- 861,868 ----
  
  void
! pixman_composite (pixman_operator_t	op,
! 	     pixman_image_t	*iSrc,
! 	     pixman_image_t	*iMask,
! 	     pixman_image_t	*iDst,
  	     int	xSrc,
  	     int	ySrc,
***************
*** 874,880 ****
  	     int	height)
  {
!     PixRegion	    *region;
      int		    n;
!     PixRegionBox    *pbox;
      CompositeFunc   func;
      int	    srcRepeat = iSrc->repeat;
--- 874,880 ----
  	     int	height)
  {
!     pixman_region16_t	    *region;
      int		    n;
!     pixman_box16_t    *pbox;
      CompositeFunc   func;
      int	    srcRepeat = iSrc->repeat;
***************
*** 898,903 ****
      }
  
!     region = PixRegionCreate();
!     PixRegionUnionRect (region, region, xDst, yDst, width, height);
      
      if (!IcComputeCompositeRegion (region,
--- 898,903 ----
      }
  
!     region = pixman_region_create();
!     pixman_region_unionRect (region, region, xDst, yDst, width, height);
      
      if (!IcComputeCompositeRegion (region,
***************
*** 915,923 ****
  	return;
  				   
!     func = IcCompositeGeneral;
      if (!iSrc->transform && !(iMask && iMask->transform))
      if (!maskAlphaMap && !srcAlphaMap && !dstAlphaMap)
      switch (op) {
!     case IcOperatorOver:
  	if (iMask)
  	{
--- 915,923 ----
  	return;
  				   
!     func = pixman_compositeGeneral;
      if (!iSrc->transform && !(iMask && iMask->transform))
      if (!maskAlphaMap && !srcAlphaMap && !dstAlphaMap)
      switch (op) {
!     case PIXMAN_OPERATOR_OVER:
  	if (iMask)
  	{
***************
*** 933,941 ****
  			case PICT_r5g6b5:
  			case PICT_b5g6r5:
! 			    func = IcCompositeSolidMask_nx8x0565;
  			    break;
  			case PICT_r8g8b8:
  			case PICT_b8g8r8:
! 			    func = IcCompositeSolidMask_nx8x0888;
  			    break;
  			case PICT_a8r8g8b8:
--- 933,941 ----
  			case PICT_r5g6b5:
  			case PICT_b5g6r5:
! 			    func = pixman_compositeSolidMask_nx8x0565;
  			    break;
  			case PICT_r8g8b8:
  			case PICT_b8g8r8:
! 			    func = pixman_compositeSolidMask_nx8x0888;
  			    break;
  			case PICT_a8r8g8b8:
***************
*** 943,947 ****
  			case PICT_a8b8g8r8:
  			case PICT_x8b8g8r8:
! 			    func = IcCompositeSolidMask_nx8x8888;
  			    break;
  			}
--- 943,947 ----
  			case PICT_a8b8g8r8:
  			case PICT_x8b8g8r8:
! 			    func = pixman_compositeSolidMask_nx8x8888;
  			    break;
  			}
***************
*** 952,959 ****
  			    case PICT_a8r8g8b8:
  			    case PICT_x8r8g8b8:
! 				func = IcCompositeSolidMask_nx8888x8888C;
  				break;
  			    case PICT_r5g6b5:
! 				func = IcCompositeSolidMask_nx8888x0565C;
  				break;
  			    }
--- 952,959 ----
  			    case PICT_a8r8g8b8:
  			    case PICT_x8r8g8b8:
! 				func = pixman_compositeSolidMask_nx8888x8888C;
  				break;
  			    case PICT_r5g6b5:
! 				func = pixman_compositeSolidMask_nx8888x0565C;
  				break;
  			    }
***************
*** 965,972 ****
  			    case PICT_a8b8g8r8:
  			    case PICT_x8b8g8r8:
! 				func = IcCompositeSolidMask_nx8888x8888C;
  				break;
  			    case PICT_b5g6r5:
! 				func = IcCompositeSolidMask_nx8888x0565C;
  				break;
  			    }
--- 965,972 ----
  			    case PICT_a8b8g8r8:
  			    case PICT_x8b8g8r8:
! 				func = pixman_compositeSolidMask_nx8888x8888C;
  				break;
  			    case PICT_b5g6r5:
! 				func = pixman_compositeSolidMask_nx8888x0565C;
  				break;
  			    }
***************
*** 983,987 ****
  			case PICT_a8b8g8r8:
  			case PICT_x8b8g8r8:
! 			    func = IcCompositeSolidMask_nx1xn;
  			    break;
  			}
--- 983,987 ----
  			case PICT_a8b8g8r8:
  			case PICT_x8b8g8r8:
! 			    func = pixman_compositeSolidMask_nx1xn;
  			    break;
  			}
***************
*** 998,1008 ****
  		case PICT_a8r8g8b8:
  		case PICT_x8r8g8b8:
! 		    func = IcCompositeSrc_8888x8888;
  		    break;
  		case PICT_r8g8b8:
! 		    func = IcCompositeSrc_8888x0888;
  		    break;
  		case PICT_r5g6b5:
! 		    func = IcCompositeSrc_8888x0565;
  		    break;
  		}
--- 998,1008 ----
  		case PICT_a8r8g8b8:
  		case PICT_x8r8g8b8:
! 		    func = pixman_compositeSrc_8888x8888;
  		    break;
  		case PICT_r8g8b8:
! 		    func = pixman_compositeSrc_8888x0888;
  		    break;
  		case PICT_r5g6b5:
! 		    func = pixman_compositeSrc_8888x0565;
  		    break;
  		}
***************
*** 1013,1023 ****
  		case PICT_a8b8g8r8:
  		case PICT_x8b8g8r8:
! 		    func = IcCompositeSrc_8888x8888;
  		    break;
  		case PICT_b8g8r8:
! 		    func = IcCompositeSrc_8888x0888;
  		    break;
  		case PICT_b5g6r5:
! 		    func = IcCompositeSrc_8888x0565;
  		    break;
  		}
--- 1013,1023 ----
  		case PICT_a8b8g8r8:
  		case PICT_x8b8g8r8:
! 		    func = pixman_compositeSrc_8888x8888;
  		    break;
  		case PICT_b8g8r8:
! 		    func = pixman_compositeSrc_8888x0888;
  		    break;
  		case PICT_b5g6r5:
! 		    func = pixman_compositeSrc_8888x0565;
  		    break;
  		}
***************
*** 1026,1030 ****
  		switch (iDst->format_code) {
  		case PICT_r5g6b5:
! 		    func = IcCompositeSrc_0565x0565;
  		    break;
  		}
--- 1026,1030 ----
  		switch (iDst->format_code) {
  		case PICT_r5g6b5:
! 		    func = pixman_compositeSrc_0565x0565;
  		    break;
  		}
***************
*** 1033,1037 ****
  		switch (iDst->format_code) {
  		case PICT_b5g6r5:
! 		    func = IcCompositeSrc_0565x0565;
  		    break;
  		}
--- 1033,1037 ----
  		switch (iDst->format_code) {
  		case PICT_b5g6r5:
! 		    func = pixman_compositeSrc_0565x0565;
  		    break;
  		}
***************
*** 1040,1044 ****
  	}
  	break;
!     case IcOperatorAdd:
  	if (iMask == 0)
  	{
--- 1040,1044 ----
  	}
  	break;
!     case PIXMAN_OPERATOR_ADD:
  	if (iMask == 0)
  	{
***************
*** 1047,1051 ****
  		switch (iDst->format_code) {
  		case PICT_a8r8g8b8:
! 		    func = IcCompositeSrcAdd_8888x8888;
  		    break;
  		}
--- 1047,1051 ----
  		switch (iDst->format_code) {
  		case PICT_a8r8g8b8:
! 		    func = pixman_compositeSrcAdd_8888x8888;
  		    break;
  		}
***************
*** 1054,1058 ****
  		switch (iDst->format_code) {
  		case PICT_a8b8g8r8:
! 		    func = IcCompositeSrcAdd_8888x8888;
  		    break;
  		}
--- 1054,1058 ----
  		switch (iDst->format_code) {
  		case PICT_a8b8g8r8:
! 		    func = pixman_compositeSrcAdd_8888x8888;
  		    break;
  		}
***************
*** 1061,1065 ****
  		switch (iDst->format_code) {
  		case PICT_a8:
! 		    func = IcCompositeSrcAdd_8000x8000;
  		    break;
  		}
--- 1061,1065 ----
  		switch (iDst->format_code) {
  		case PICT_a8:
! 		    func = pixman_compositeSrcAdd_8000x8000;
  		    break;
  		}
***************
*** 1068,1072 ****
  		switch (iDst->format_code) {
  		case PICT_a1:
! 		    func = IcCompositeSrcAdd_1000x1000;
  		    break;
  		}
--- 1068,1072 ----
  		switch (iDst->format_code) {
  		case PICT_a1:
! 		    func = pixman_compositeSrcAdd_1000x1000;
  		    break;
  		}
***************
*** 1076,1084 ****
  	break;
      default:
! 	func = IcCompositeGeneral;
  	break;
      }
!     n = PixRegionNumRects (region);
!     pbox = PixRegionRects (region);
      while (n--)
      {
--- 1076,1084 ----
  	break;
      default:
! 	func = pixman_compositeGeneral;
  	break;
      }
!     n = pixman_region_num_rects (region);
!     pbox = pixman_region_rects (region);
      while (n--)
      {
***************
*** 1136,1140 ****
  	pbox++;
      }
!     PixRegionDestroy (region);
  }
! slim_hidden_def(IcComposite);
--- 1136,1140 ----
  	pbox++;
      }
!     pixman_region_destroy (region);
  }
! slim_hidden_def(pixman_composite);





More information about the cairo-commit mailing list