[cairo-commit] libpixman/src ictrap.c,1.10,1.11

[Dave Beckett]

Committed by: dajobe

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

Modified Files:
	ictrap.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: ictrap.c
===================================================================
RCS file: /cvs/cairo/libpixman/src/ictrap.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** ictrap.c	10 Dec 2003 22:21:36 -0000	1.10
--- ictrap.c	10 Dec 2003 23:24:06 -0000	1.11
***************
*** 46,60 ****
  	own_format = 1;
  	if (dst->polyEdge == PolyEdgeSharp)
! 	    format = pixman_format_tCreate (PIXMAN_FORMAT_NAME_A1);
  	else
! 	    format = pixman_format_tCreate (PIXMAN_FORMAT_NAME_A8);
  	if (!format)
  	    return 0;
      }
  
!     image = pixman_image_tCreate (format, width, height); 
  
      if (own_format)
! 	pixman_format_tDestroy (format);
  
      /* XXX: Is this a reasonable way to clear the image? Would
--- 46,60 ----
  	own_format = 1;
  	if (dst->polyEdge == PolyEdgeSharp)
! 	    format = pixman_format_create (PIXMAN_FORMAT_NAME_A1);
  	else
! 	    format = pixman_format_create (PIXMAN_FORMAT_NAME_A8);
  	if (!format)
  	    return 0;
      }
  
!     image = pixman_image_create (format, width, height); 
  
      if (own_format)
! 	pixman_format_destroy (format);
  
      /* XXX: Is this a reasonable way to clear the image? Would
***************
*** 67,71 ****
  
  static pixman_fixed16_16_t
! pixman_line_fixed_tX (const pixman_line_fixed_t *l, pixman_fixed16_16_t y, int ceil)
  {
      pixman_fixed16_16_t    dx = l->p2.x - l->p1.x;
--- 67,71 ----
  
  static pixman_fixed16_16_t
! pixman_line_fixed_x (const pixman_line_fixed_t *l, pixman_fixed16_16_t y, int ceil)
  {
      pixman_fixed16_16_t    dx = l->p2.x - l->p1.x;
***************
*** 78,82 ****
  
  static void
! pixman_trapezoid_tBounds (int ntrap, const pixman_trapezoid_t *traps, pixman_box16_t *box)
  {
      box->y1 = MAXSHORT;
--- 78,82 ----
  
  static void
! pixman_trapezoid_bounds (int ntrap, const pixman_trapezoid_t *traps, pixman_box16_t *box)
  {
      box->y1 = MAXSHORT;
***************
*** 98,108 ****
  	    box->y2 = y2;
  	
! 	x1 = xFixedToInt (MIN (pixman_line_fixed_tX (&traps->left, traps->top, 0),
! 			       pixman_line_fixed_tX (&traps->left, traps->bottom, 0)));
  	if (x1 < box->x1)
  	    box->x1 = x1;
  	
! 	x2 = xFixedToInt (xFixedCeil (MAX (pixman_line_fixed_tX (&traps->right, traps->top, 1),
! 					   pixman_line_fixed_tX (&traps->right, traps->bottom, 1))));
  	if (x2 > box->x2)
  	    box->x2 = x2;
--- 98,108 ----
  	    box->y2 = y2;
  	
! 	x1 = xFixedToInt (MIN (pixman_line_fixed_x (&traps->left, traps->top, 0),
! 			       pixman_line_fixed_x (&traps->left, traps->bottom, 0)));
  	if (x1 < box->x1)
  	    box->x1 = x1;
  	
! 	x2 = xFixedToInt (xFixedCeil (MAX (pixman_line_fixed_x (&traps->right, traps->top, 1),
! 					   pixman_line_fixed_x (&traps->right, traps->bottom, 1))));
  	if (x2 > box->x2)
  	    box->x2 = x2;
***************
*** 131,139 ****
      yDst = traps[0].left.p1.y >> 16;
      
!     format = pixman_format_tCreate (PIXMAN_FORMAT_NAME_A8);
  
      if (format)
      {
! 	pixman_trapezoid_tBounds (ntraps, traps, &bounds);
  	if (bounds.y1 >= bounds.y2 || bounds.x1 >= bounds.x2)
  	    return;
--- 131,139 ----
      yDst = traps[0].left.p1.y >> 16;
      
!     format = pixman_format_create (PIXMAN_FORMAT_NAME_A8);
  
      if (format)
      {
! 	pixman_trapezoid_bounds (ntraps, traps, &bounds);
  	if (bounds.y1 >= bounds.y2 || bounds.x1 >= bounds.x2)
  	    return;
***************
*** 150,154 ****
  	if (!format)
  	{
! 	    pixman_trapezoid_tBounds (1, traps, &bounds);
  	    if (bounds.y1 >= bounds.y2 || bounds.x1 >= bounds.x2)
  		continue;
--- 150,154 ----
  	if (!format)
  	{
! 	    pixman_trapezoid_bounds (1, traps, &bounds);
  	    if (bounds.y1 >= bounds.y2 || bounds.x1 >= bounds.x2)
  		continue;
***************
*** 169,173 ****
  			 bounds.x2 - bounds.x1,
  			 bounds.y2 - bounds.y1);
! 	    pixman_image_tDestroy (image);
  	}
      }
--- 169,173 ----
  			 bounds.x2 - bounds.x1,
  			 bounds.y2 - bounds.y1);
! 	    pixman_image_destroy (image);
  	}
      }
***************
*** 180,187 ****
  		     bounds.x2 - bounds.x1,
  		     bounds.y2 - bounds.y1);
! 	pixman_image_tDestroy (image);
      }
  
!     pixman_format_tDestroy (format);
  }
  
--- 180,187 ----
  		     bounds.x2 - bounds.x1,
  		     bounds.y2 - bounds.y1);
! 	pixman_image_destroy (image);
      }
  
!     pixman_format_destroy (format);
  }