From bd41e52327ae8afc9ed9bb5f928a013d7bfdc340 Mon Sep 17 00:00:00 2001 From: David Hoese Date: Wed, 11 Sep 2024 15:39:26 +0000 Subject: [PATCH] Switch to casting patch for tags pointer --- agg2/font_freetype/agg_font_freetype.cpp | 4 ++-- patches/tags_pointer_type_fix.patch | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/agg2/font_freetype/agg_font_freetype.cpp b/agg2/font_freetype/agg_font_freetype.cpp index 8218d15..ce95a38 100644 --- a/agg2/font_freetype/agg_font_freetype.cpp +++ b/agg2/font_freetype/agg_font_freetype.cpp @@ -150,7 +150,7 @@ namespace agg FT_Vector* point; FT_Vector* limit; - unsigned char* tags; + char* tags; int n; // index of contour in outline int first; // index of first point in contour @@ -171,7 +171,7 @@ namespace agg v_control = v_start; point = outline.points + first; - tags = outline.tags + first; + tags = (char *)outline.tags + first; tag = FT_CURVE_TAG(tags[0]); // A contour cannot start with a cubic control point! diff --git a/patches/tags_pointer_type_fix.patch b/patches/tags_pointer_type_fix.patch index 14d85a6..ad4173a 100644 --- a/patches/tags_pointer_type_fix.patch +++ b/patches/tags_pointer_type_fix.patch @@ -1,11 +1,11 @@ --- agg2/font_freetype/agg_font_freetype.cpp.orig 2024-03-06 10:16:58 -+++ agg2/font_freetype/agg_font_freetype.cpp 2024-09-11 09:17:23 -@@ -150,7 +150,7 @@ ++++ agg2/font_freetype/agg_font_freetype.cpp 2024-09-10 21:13:37 +@@ -171,7 +171,7 @@ + v_control = v_start; - FT_Vector* point; - FT_Vector* limit; -- char* tags; -+ unsigned char* tags; + point = outline.points + first; +- tags = outline.tags + first; ++ tags = (char *)outline.tags + first; + tag = FT_CURVE_TAG(tags[0]); - int n; // index of contour in outline - int first; // index of first point in contour + // A contour cannot start with a cubic control point!