diff options
| author | Carl Worth <cworth@cworth.org> | 2005-08-23 13:57:00 +0000 |
|---|---|---|
| committer | Carl Worth <cworth@cworth.org> | 2005-08-23 13:57:00 +0000 |
| commit | a0ecb16417a4c3f92b0a7682b84be702480748b4 (patch) | |
| tree | 4482825e8dde8687e863c0f223e48317e59b57b3 /src | |
| parent | f229b1abfb01d3c42cba1dec36a271fe75c503a9 (diff) | |
Move CAIRO_CONTENT_VALID and CAIRO_FORMAT_VALID from the public cairo.h to the private cairoint.h where they belong.
Diffstat (limited to 'src')
| -rw-r--r-- | src/cairo.h | 9 | ||||
| -rw-r--r-- | src/cairoint.h | 9 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/cairo.h b/src/cairo.h index 8c12336f..813ff4f4 100644 --- a/src/cairo.h +++ b/src/cairo.h @@ -1116,12 +1116,6 @@ typedef enum _cairo_content { 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 @@ typedef enum _cairo_format { 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, diff --git a/src/cairoint.h b/src/cairoint.h index 7ae3132d..2ebb38da 100644 --- a/src/cairoint.h +++ b/src/cairoint.h @@ -1744,6 +1744,15 @@ _cairo_surface_composite_shape_fixup_unbounded (cairo_surface_t *dst, /* 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); |