diff options
| author | M Joonas Pihlaja <jpihlaja@cc.helsinki.fi> | 2010-02-28 23:31:06 +0200 |
|---|---|---|
| committer | M Joonas Pihlaja <jpihlaja@cc.helsinki.fi> | 2010-03-01 01:21:31 +0200 |
| commit | 5b7f4bb241f3191c1589cd714f373719efded56e (patch) | |
| tree | 6eb5cf59bb1b3ac50304dc1a4465450e83e06517 /util | |
| parent | 620cd9c2be4a6bef790e6818652470a5c53d578d (diff) | |
api: Introduce CAIRO_FORMAT_INVALID formally in the API.
We were exposing the actual value of CAIRO_FORMAT_INVALID
through API functions already, so it makes sense to just
go ahead and put it in the cairo_format_t enum.
Diffstat (limited to 'util')
| -rw-r--r-- | util/cairo-script/cairo-script-operators.c | 5 | ||||
| -rw-r--r-- | util/cairo-sphinx/sphinx.c | 9 | ||||
| -rw-r--r-- | util/cairo-trace/trace.c | 4 |
3 files changed, 15 insertions, 3 deletions
diff --git a/util/cairo-script/cairo-script-operators.c b/util/cairo-script/cairo-script-operators.c index 2456c3acd..1f8ae90a0 100644 --- a/util/cairo-script/cairo-script-operators.c +++ b/util/cairo-script/cairo-script-operators.c @@ -2844,6 +2844,7 @@ _image_read_raw (csi_file_t *src, len = 3 * width * height; break; default: + case CAIRO_FORMAT_INVALID: case CAIRO_FORMAT_ARGB32: len = 4 * width * height; break; @@ -2894,6 +2895,7 @@ _image_read_raw (csi_file_t *src, #endif } break; + case CAIRO_FORMAT_INVALID: case CAIRO_FORMAT_ARGB32: /* stride == width */ break; @@ -2968,6 +2970,7 @@ _image_read_raw (csi_file_t *src, #endif } break; + case CAIRO_FORMAT_INVALID: case CAIRO_FORMAT_ARGB32: /* stride == width */ break; @@ -2994,6 +2997,7 @@ _image_read_raw (csi_file_t *src, break; case CAIRO_FORMAT_RGB24: + case CAIRO_FORMAT_INVALID: default: break; } @@ -6140,6 +6144,7 @@ _integer_constants[] = { { "A8", CAIRO_FORMAT_A8 }, { "RGB24", CAIRO_FORMAT_RGB24 }, { "ARGB32", CAIRO_FORMAT_ARGB32 }, + { "INVALID", CAIRO_FORMAT_INVALID }, { NULL, 0 } }; diff --git a/util/cairo-sphinx/sphinx.c b/util/cairo-sphinx/sphinx.c index 6d2cda700..20d9f01b4 100644 --- a/util/cairo-sphinx/sphinx.c +++ b/util/cairo-sphinx/sphinx.c @@ -618,6 +618,9 @@ compare_images (cairo_surface_t *a, bb += stride; } break; + + case CAIRO_FORMAT_INVALID: + break; } return TRUE; @@ -831,7 +834,7 @@ request_image (struct client *c, unsigned long offset = -1; int len; - assert (format != (cairo_format_t) -1); + assert (format != CAIRO_FORMAT_INVALID); len = sprintf (buf, ".image %lu %d %d %d %d\n", closure->id, format, width, height, stride); @@ -900,14 +903,14 @@ send_surface (struct client *c, { cairo_surface_t *source = closure->surface; cairo_surface_t *image; - cairo_format_t format = (cairo_format_t) -1; + cairo_format_t format = CAIRO_FORMAT_INVALID; cairo_t *cr; int width, height, stride; void *data; unsigned long serial; get_surface_size (source, &width, &height, &format); - if (format == (cairo_format_t) -1) + if (format == CAIRO_FORMAT_INVALID) format = format_for_content (cairo_surface_get_content (source)); stride = cairo_format_stride_for_width (format, width); diff --git a/util/cairo-trace/trace.c b/util/cairo-trace/trace.c index 46ec7f29e..9bc06e0c9 100644 --- a/util/cairo-trace/trace.c +++ b/util/cairo-trace/trace.c @@ -1439,6 +1439,7 @@ _format_to_string (cairo_format_t format) { #define f(name) case CAIRO_FORMAT_ ## name: return #name switch (format) { + f(INVALID); f(ARGB32); f(RGB24); f(A8); @@ -1570,6 +1571,7 @@ _emit_image (cairo_surface_t *image, case CAIRO_FORMAT_A8: len = width; break; case CAIRO_FORMAT_RGB24: len = 3*width; break; default: + case CAIRO_FORMAT_INVALID: case CAIRO_FORMAT_ARGB32: len = 4*width; break; } @@ -1607,6 +1609,7 @@ _emit_image (cairo_surface_t *image, data += stride; } break; + case CAIRO_FORMAT_INVALID: default: break; } @@ -1659,6 +1662,7 @@ _emit_image (cairo_surface_t *image, data += stride; } break; + case CAIRO_FORMAT_INVALID: default: break; } |