diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2009-07-04 22:00:09 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2009-07-04 22:00:09 +0100 |
| commit | ee8c50f2d6f1dba41f829c715b7bc59b5eeda50d (patch) | |
| tree | 4ac93f48418a5cfb8073bb67ead648726b59225d /boilerplate | |
| parent | 88cb69b10c66751f687c3745c8e9861b105de3a2 (diff) | |
Remove the defunct test-meta surface
Replace the internal test-meta surface will the freshly exported,
real meta-surface.
Diffstat (limited to 'boilerplate')
| -rw-r--r-- | boilerplate/cairo-boilerplate-test-surfaces.c | 38 | ||||
| -rw-r--r-- | boilerplate/cairo-boilerplate.c | 35 |
2 files changed, 35 insertions, 38 deletions
diff --git a/boilerplate/cairo-boilerplate-test-surfaces.c b/boilerplate/cairo-boilerplate-test-surfaces.c index 844991c9..849627fd 100644 --- a/boilerplate/cairo-boilerplate-test-surfaces.c +++ b/boilerplate/cairo-boilerplate-test-surfaces.c @@ -30,7 +30,6 @@ #include <test-fallback-surface.h> #include <test-fallback16-surface.h> -#include <test-meta-surface.h> #include <test-paginated-surface.h> #if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1,9,3) #include <test-null-surface.h> @@ -69,21 +68,6 @@ _cairo_boilerplate_test_fallback16_create_surface (const char *name, } static cairo_surface_t * -_cairo_boilerplate_test_meta_create_surface (const char *name, - cairo_content_t content, - double width, - double height, - double max_width, - double max_height, - cairo_boilerplate_mode_t mode, - int id, - void **closure) -{ - *closure = NULL; - return _cairo_test_meta_surface_create (content, width, height); -} - -static cairo_surface_t * _cairo_boilerplate_test_null_create_surface (const char *name, cairo_content_t content, double width, @@ -297,28 +281,6 @@ static const cairo_boilerplate_target_t targets[] = { cairo_surface_write_to_png }, { - "test-meta", "image", NULL, NULL, - CAIRO_INTERNAL_SURFACE_TYPE_TEST_META, - CAIRO_CONTENT_COLOR_ALPHA, 0, - _cairo_boilerplate_test_meta_create_surface, - NULL, NULL, - _cairo_boilerplate_get_image_surface, - cairo_surface_write_to_png, - NULL, NULL, - FALSE, TRUE - }, - { - "test-meta", "image", NULL, NULL, - CAIRO_INTERNAL_SURFACE_TYPE_TEST_META, - CAIRO_CONTENT_COLOR, 0, - _cairo_boilerplate_test_meta_create_surface, - NULL, NULL, - _cairo_boilerplate_get_image_surface, - cairo_surface_write_to_png, - NULL, NULL, - FALSE, TRUE - }, - { "test-paginated", "image", NULL, NULL, CAIRO_INTERNAL_SURFACE_TYPE_TEST_PAGINATED, CAIRO_CONTENT_COLOR_ALPHA, 0, diff --git a/boilerplate/cairo-boilerplate.c b/boilerplate/cairo-boilerplate.c index dfca1dbf..ea88c691 100644 --- a/boilerplate/cairo-boilerplate.c +++ b/boilerplate/cairo-boilerplate.c @@ -125,6 +125,21 @@ _cairo_boilerplate_image_create_surface (const char *name, return cairo_image_surface_create (format, ceil (width), ceil (height)); } +static cairo_surface_t * +_cairo_boilerplate_meta_create_surface (const char *name, + cairo_content_t content, + double width, + double height, + double max_width, + double max_height, + cairo_boilerplate_mode_t mode, + int id, + void **closure) +{ + *closure = NULL; + return cairo_meta_surface_create (content, width, height); +} + cairo_surface_t * _cairo_boilerplate_get_image_surface (cairo_surface_t *src, int page, @@ -255,6 +270,26 @@ static const cairo_boilerplate_target_t builtin_targets[] = { _cairo_boilerplate_get_image_surface, cairo_surface_write_to_png }, + { + "meta", "image", NULL, NULL, + CAIRO_SURFACE_TYPE_META, CAIRO_CONTENT_COLOR_ALPHA, 0, + _cairo_boilerplate_meta_create_surface, + NULL, NULL, + _cairo_boilerplate_get_image_surface, + cairo_surface_write_to_png, + NULL, NULL, + FALSE, TRUE + }, + { + "meta", "image", NULL, NULL, + CAIRO_SURFACE_TYPE_META, CAIRO_CONTENT_COLOR, 0, + _cairo_boilerplate_meta_create_surface, + NULL, NULL, + _cairo_boilerplate_get_image_surface, + cairo_surface_write_to_png, + NULL, NULL, + FALSE, TRUE + }, }; CAIRO_BOILERPLATE (builtin, builtin_targets) |