Commit e9181aba2c5594f5fedba649170c6e8efbabdea2
2016-03-23T06:58:20
[raster, smooth] Fix some clang sanitizer runtime issues. * src/raster/ftraster.c (ft_black_reset, ft_black_set_mode, ft_black_render): Harmonize signatures with `ftimage.h'. * src/smooth/ftgrays.c (gray_raster_render, gray_raster_reset): Ditto.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87
diff --git a/ChangeLog b/ChangeLog
index f3746c3..2a8c04b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2016-03-23 Werner Lemberg <wl@gnu.org>
+
+ [raster, smooth] Fix some clang sanitizer runtime issues.
+
+ * src/raster/ftraster.c (ft_black_reset, ft_black_set_mode,
+ ft_black_render): Harmonize signatures with `ftimage.h'.
+
+ * src/smooth/ftgrays.c (gray_raster_render, gray_raster_reset):
+ Ditto.
+
2016-03-22 Werner Lemberg <wl@gnu.org>
* src/truetype/ttgload.c (TT_Load_Simple_Glyph): Minor.
diff --git a/src/raster/ftraster.c b/src/raster/ftraster.c
index d6c5ded..2972553 100644
--- a/src/raster/ftraster.c
+++ b/src/raster/ftraster.c
@@ -3106,9 +3106,9 @@
static void
- ft_black_reset( black_PRaster raster,
- char* pool_base,
- Long pool_size )
+ ft_black_reset( FT_Raster raster,
+ PByte pool_base,
+ ULong pool_size )
{
FT_UNUSED( raster );
FT_UNUSED( pool_base );
@@ -3117,20 +3117,20 @@
static int
- ft_black_set_mode( black_PRaster raster,
- ULong mode,
- const char* palette )
+ ft_black_set_mode( FT_Raster raster,
+ ULong mode,
+ void* args )
{
FT_UNUSED( raster );
FT_UNUSED( mode );
- FT_UNUSED( palette );
+ FT_UNUSED( args );
return 0;
}
static int
- ft_black_render( black_PRaster raster,
+ ft_black_render( FT_Raster raster,
const FT_Raster_Params* params )
{
const FT_Outline* outline = (const FT_Outline*)params->source;
diff --git a/src/smooth/ftgrays.c b/src/smooth/ftgrays.c
index 6b4ea1f..2d548de 100644
--- a/src/smooth/ftgrays.c
+++ b/src/smooth/ftgrays.c
@@ -2025,7 +2025,7 @@ typedef ptrdiff_t FT_PtrDist;
static int
- gray_raster_render( gray_PRaster raster,
+ gray_raster_render( FT_Raster raster,
const FT_Raster_Params* params )
{
const FT_Outline* outline = (const FT_Outline*)params->source;
@@ -2180,9 +2180,9 @@ typedef ptrdiff_t FT_PtrDist;
static void
- gray_raster_reset( FT_Raster raster,
- char* pool_base,
- long pool_size )
+ gray_raster_reset( FT_Raster raster,
+ unsigned char* pool_base,
+ unsigned long pool_size )
{
FT_UNUSED( raster );
FT_UNUSED( pool_base );