diff options
author | Siarhei Siamashka <siarhei.siamashka@gmail.com> | 2012-12-20 05:14:39 +0200 |
---|---|---|
committer | Siarhei Siamashka <siarhei.siamashka@gmail.com> | 2012-12-20 05:14:39 +0200 |
commit | 0477ba7457a705b6b668ab497a9a591fd503759a (patch) | |
tree | 27b24cb10cbd6993dcdb6a651532196fd0aea270 | |
parent | 9c90e4ed1b89f6a6bb289c1d2e0d96bd09cf04e2 (diff) |
Use more appropriate types and remove a magic constant
-rw-r--r-- | pixman/pixman-glyph.c | 2 | ||||
-rw-r--r-- | pixman/pixman-image.c | 2 | ||||
-rw-r--r-- | pixman/pixman-region.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/pixman/pixman-glyph.c b/pixman/pixman-glyph.c index 15b3f1f..6d2c8bb 100644 --- a/pixman/pixman-glyph.c +++ b/pixman/pixman-glyph.c @@ -508,7 +508,7 @@ add_glyphs (pixman_glyph_cache_t *cache, uint32_t glyph_flags = 0; pixman_composite_func_t func = NULL; pixman_implementation_t *implementation = NULL; - uint32_t dest_format; + pixman_format_code_t dest_format; uint32_t dest_flags; pixman_box32_t dest_box; pixman_composite_info_t info; diff --git a/pixman/pixman-image.c b/pixman/pixman-image.c index 6f076d5..65041b4 100644 --- a/pixman/pixman-image.c +++ b/pixman/pixman-image.c @@ -888,7 +888,7 @@ pixman_image_get_format (pixman_image_t *image) if (image->type == BITS) return image->bits.format; - return 0; + return PIXMAN_null; } uint32_t diff --git a/pixman/pixman-region.c b/pixman/pixman-region.c index 8955fe7..2d6f157 100644 --- a/pixman/pixman-region.c +++ b/pixman/pixman-region.c @@ -202,7 +202,7 @@ PIXREGION_SZOF (size_t n) return size + sizeof(region_data_type_t); } -static void * +static region_data_type_t * alloc_data (size_t n) { size_t sz = PIXREGION_SZOF (n); |