fdo-mirrors/cairo
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/cairo/cairo.git synced 2026-05-05 00:38:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Carl Worth 2005-08-23 13:57:00 +00:00
parent f229b1abfb
commit a0ecb16417
3 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2005-08-23 Carl Worth <cworth@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.
2005-08-23 Owen Taylor <otaylor@redhat.com>
* src/cairo-ft-font.c (_cairo_ft_scaled_font_show_glyphs):

9
src/cairo.h
View file

@ -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,

9
src/cairoint.h
View file

@ -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);