summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSiarhei Siamashka <siarhei.siamashka@gmail.com>2012-12-20 03:14:39 (GMT)
committerSiarhei Siamashka <siarhei.siamashka@gmail.com>2013-01-03 23:27:06 (GMT)
commit1abde88ae60ae0877073d85cbf5b39013337f5da (patch)
tree8f4205e1ee240de07993163da09dc6e8dc2f430f
parentc1fd5a42439b21872170979d8c400cbb374e1f9d (diff)
downloadpixman-1abde88ae60ae0877073d85cbf5b39013337f5da.tar.gz
pixman-1abde88ae60ae0877073d85cbf5b39013337f5da.tar.xz
Use more appropriate types and remove a magic constant
-rw-r--r--pixman/pixman-glyph.c2
-rw-r--r--pixman/pixman-image.c2
-rw-r--r--pixman/pixman-region.c2
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);