diff options
| author | Carl Worth <cworth@cworth.org> | 2006-08-28 19:00:48 -0700 |
|---|---|---|
| committer | Carl Worth <cworth@cworth.org> | 2006-08-28 19:00:48 -0700 |
| commit | 06a962886806be5e68061e24223c617980ac8248 (patch) | |
| tree | 66d1e907fef03c3738e58b3e96867b4c7ffa978f /src | |
| parent | 7d1399a4bb0d8d74a4294700e6040accccefff2a (diff) | |
| download | cairo-06a962886806be5e68061e24223c617980ac8248.tar.gz | |
Eliminate conditions checking for unsigned or enum values less than 0.
Diffstat (limited to 'src')
| -rw-r--r-- | src/cairo-array.c | 2 | ||||
| -rw-r--r-- | src/cairo-svg-surface.c | 4 | ||||
| -rw-r--r-- | src/cairoint.h | 3 |
3 files changed, 4 insertions, 5 deletions
diff --git a/src/cairo-array.c b/src/cairo-array.c index 218f51115..9d07f5675 100644 --- a/src/cairo-array.c +++ b/src/cairo-array.c @@ -203,7 +203,7 @@ _cairo_array_index (cairo_array_t *array, unsigned int index) if (index == 0 && array->num_elements == 0) return NULL; - assert (0 <= index && index < array->num_elements); + assert (index < array->num_elements); return (void *) &(*array->elements)[index * array->element_size]; } diff --git a/src/cairo-svg-surface.c b/src/cairo-svg-surface.c index abc1ec3a3..2b24bf22d 100644 --- a/src/cairo-svg-surface.c +++ b/src/cairo-svg-surface.c @@ -289,7 +289,7 @@ cairo_svg_surface_restrict_to_version (cairo_surface_t *abstract_surface, return; } - if (version >= 0 && version < CAIRO_SVG_VERSION_LAST) + if (version < CAIRO_SVG_VERSION_LAST) surface->document->svg_version = version; } @@ -329,7 +329,7 @@ cairo_svg_get_versions (cairo_svg_version_t const **versions, const char * cairo_svg_version_to_string (cairo_svg_version_t version) { - if (version < 0 || version >= CAIRO_SVG_VERSION_LAST) + if (version >= CAIRO_SVG_VERSION_LAST) return NULL; return _cairo_svg_version_strings[version]; diff --git a/src/cairoint.h b/src/cairoint.h index 4846ac3fd..119ee26e4 100644 --- a/src/cairoint.h +++ b/src/cairoint.h @@ -1972,8 +1972,7 @@ _cairo_surface_has_device_transform (cairo_surface_t *surface); * to support it (at least cairo_surface_write_to_png and a few spots * in cairo-xlib-surface.c--again see -Wswitch-enum). */ -#define CAIRO_FORMAT_VALID(format) ((format) >= CAIRO_FORMAT_ARGB32 && \ - (format) <= CAIRO_FORMAT_A1) +#define CAIRO_FORMAT_VALID(format) ((format) <= CAIRO_FORMAT_A1) #define CAIRO_CONTENT_VALID(content) ((content) && \ (((content) & ~(CAIRO_CONTENT_COLOR | \ |