[cairo-commit] cairo/src cairo.h, 1.148, 1.149 cairoint.h, 1.204, 1.205

[Carl Worth]

Committed by: cworth

Update of /cvs/cairo/cairo/src
In directory gabe:/tmp/cvs-serv29055/src

Modified Files:
	cairo.h cairoint.h 
Log Message:

2005-08-23  Carl Worth  <cworth at cworth.org>

        * src/cairo.h:
        * src/cairoint.h: Move CAIRO_CONTENT_VALID and CAIRO_FORMAT_VALID
        from the public cairo.h to the private cairoint.h where they
        belong.


Index: cairo.h
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo.h,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -d -r1.148 -r1.149
--- cairo.h	19 Aug 2005 19:02:14 -0000	1.148
+++ cairo.h	23 Aug 2005 20:57:00 -0000	1.149
@@ -1116,12 +1116,6 @@
     CAIRO_CONTENT_COLOR_ALPHA	= 0x3000
 } cairo_content_t;
 
-#define CAIRO_CONTENT_VALID(content) ((content) && 			         \
-				      (((content) & ~(CAIRO_CONTENT_COLOR |      \
-						      CAIRO_CONTENT_ALPHA |      \
-						      CAIRO_CONTENT_COLOR_ALPHA))\
-				       == 0))
-
 cairo_surface_t *
 cairo_surface_create_similar (cairo_surface_t  *other,
 			      cairo_content_t	content,
@@ -1216,9 +1210,6 @@
     CAIRO_FORMAT_A1
 } cairo_format_t;
 
-#define CAIRO_FORMAT_VALID(format) ((format) >= CAIRO_FORMAT_ARGB32 && \
-				    (format) <= CAIRO_FORMAT_A1)
-
 cairo_surface_t *
 cairo_image_surface_create (cairo_format_t	format,
 			    int			width,

Index: cairoint.h
===================================================================
RCS file: /cvs/cairo/cairo/src/cairoint.h,v
retrieving revision 1.204
retrieving revision 1.205
diff -u -d -r1.204 -r1.205
--- cairoint.h	22 Aug 2005 23:52:40 -0000	1.204
+++ cairoint.h	23 Aug 2005 20:57:00 -0000	1.205
@@ -1744,6 +1744,15 @@
 
 /* cairo_image_surface.c */
 
+#define CAIRO_FORMAT_VALID(format) ((format) >= CAIRO_FORMAT_ARGB32 && \
+				    (format) <= CAIRO_FORMAT_A1)
+
+#define CAIRO_CONTENT_VALID(content) ((content) && 			         \
+				      (((content) & ~(CAIRO_CONTENT_COLOR |      \
+						      CAIRO_CONTENT_ALPHA |      \
+						      CAIRO_CONTENT_COLOR_ALPHA))\
+				       == 0))
+
 cairo_private cairo_format_t
 _cairo_format_from_content (cairo_content_t content);