[cairo-commit] cairo/src cairo.h, 1.53, 1.54 cairo_image_surface.c, 1.10, 1.11 cairo_png_surface.c, 1.3, 1.4

[Carl Worth]

Committed by: cworth

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

Modified Files:
	cairo.h cairo_image_surface.c cairo_png_surface.c 
Log Message:


        * src/cairo_image_surface.c (_create_pixman_format): Track pixman
        fixes to PIXMAN_FORMAT_NAME_*.

        * src/cairo_png_surface.c (cairo_png_surface_create): Explicitly
        add cases for all enum values to eliminate compiler warnings.

        * src/cairo.h: Remove proposal for surface_clip interface as
        cairo_clip should be able to cover this case now.

        * BUGS: Added bug concerning negative ref_counts.


Index: cairo.h
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo.h,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -d -r1.53 -r1.54
*** a/cairo.h	9 Apr 2004 21:19:47 -0000	1.53
--- b/cairo.h	16 Apr 2004 15:33:20 -0000	1.54
***************
*** 637,653 ****
  cairo_surface_destroy (cairo_surface_t *surface);
  
- /* XXX: NYI
- cairo_status_t
- cairo_surface_clip_restore (cairo_surface_t *surface);
- 
- cairo_status_t
- cairo_surface_clip_begin (cairo_surface_t *surface);
- 
- cairo_status_t
- cairo_surface_clip_rectangle (cairo_surface_t *surface,
- 			      int x, int y,
- 			      int width, int height);
- */
- 
  /* XXX: Note: The current Render/Ic implementations don't do the right
     thing with repeat when the surface has a non-identity matrix. */
--- 637,640 ----

Index: cairo_image_surface.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo_image_surface.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** a/cairo_image_surface.c	6 Apr 2004 16:36:12 -0000	1.10
--- b/cairo_image_surface.c	16 Apr 2004 15:33:20 -0000	1.11
***************
*** 113,121 ****
  	break;
      case CAIRO_FORMAT_RGB24:
! 	return pixman_format_create (PIXMAN_FORMAT_NAME_RG_B24);
  	break;
      case CAIRO_FORMAT_ARGB32:
      default:
! 	return pixman_format_create (PIXMAN_FORMAT_NAME_AR_GB32);
  	break;
      }
--- 113,121 ----
  	break;
      case CAIRO_FORMAT_RGB24:
! 	return pixman_format_create (PIXMAN_FORMAT_NAME_RGB24);
  	break;
      case CAIRO_FORMAT_ARGB32:
      default:
! 	return pixman_format_create (PIXMAN_FORMAT_NAME_ARGB32);
  	break;
      }

Index: cairo_png_surface.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo_png_surface.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** a/cairo_png_surface.c	6 Apr 2004 16:36:12 -0000	1.3
--- b/cairo_png_surface.c	16 Apr 2004 15:33:20 -0000	1.4
***************
*** 104,107 ****
--- 104,111 ----
  		  PNG_FILTER_TYPE_DEFAULT);
      break;
+     case CAIRO_FORMAT_A8:
+     case CAIRO_FORMAT_A1:
+ 	/* These are not currently supported. */
+ 	break;
      }
  
***************
*** 119,122 ****
--- 123,130 ----
  	png_set_bgr (surface->png_w);
  	break;
+     case CAIRO_FORMAT_A8:
+     case CAIRO_FORMAT_A1:
+ 	/* These are not currently supported. */
+ 	break;
      }