Bjørn Lie
78fbdb4202
dia-0.97.3-get_data_size.patch, dia-0.97.3-const-ft_vector.patch, dia-0.97.3-g_test_add_data_func_1.patch and dia-0.97.3-g_test_add_data_func_2.patch to address C99 compliance issues (mainly use of incompatible pointer types) that are errors by default with GCC 14 [boo#1224536]. All of these patches were taken from the Fedora dia package. Please (assuming the request is OK) forward to Factory soon-ish too so that we can switch the default compiler. Thanks. OBS-URL: https://build.opensuse.org/package/show/GNOME:Apps/dia?expand=0&rev=56
84 lines
2.8 KiB
Diff
84 lines
2.8 KiB
Diff
From e5557aa1d396bc3ca80240f7b5c0a1831a5cf209 Mon Sep 17 00:00:00 2001
|
|
From: Hans Breuer <hans@breuer.org>
|
|
Date: Sat, 4 May 2013 15:20:15 +0200
|
|
Subject: [PATCH] [warningectomy] initialization from incompatible pointer type
|
|
|
|
FT_Outline_Funcs take const FT_Vector* nowadays.
|
|
---
|
|
plug-ins/postscript/diapsft2renderer.c | 28 +++++++++++++-------------
|
|
1 file changed, 14 insertions(+), 14 deletions(-)
|
|
|
|
diff --git a/plug-ins/postscript/diapsft2renderer.c b/plug-ins/postscript/diapsft2renderer.c
|
|
index 63aac74b5..ed4182e5e 100644
|
|
--- a/plug-ins/postscript/diapsft2renderer.c
|
|
+++ b/plug-ins/postscript/diapsft2renderer.c
|
|
@@ -61,16 +61,16 @@ void draw_bezier_outline(DiaPsRenderer *renderer,
|
|
double pos_y
|
|
);
|
|
/* Countour traveling functions */
|
|
-static int paps_move_to( FT_Vector* to,
|
|
+static int paps_move_to( const FT_Vector* to,
|
|
void *user_data);
|
|
-static int paps_line_to( FT_Vector* to,
|
|
+static int paps_line_to( const FT_Vector* to,
|
|
void *user_data);
|
|
-static int paps_conic_to( FT_Vector* control,
|
|
- FT_Vector* to,
|
|
+static int paps_conic_to( const FT_Vector* control,
|
|
+ const FT_Vector* to,
|
|
void *user_data);
|
|
-static int paps_cubic_to( FT_Vector* control1,
|
|
- FT_Vector* control2,
|
|
- FT_Vector* to,
|
|
+static int paps_cubic_to( const FT_Vector* control1,
|
|
+ const FT_Vector* control2,
|
|
+ const FT_Vector* to,
|
|
void *user_data);
|
|
|
|
static void dia_ps_ft2_renderer_class_init (DiaPsFt2RendererClass *klass);
|
|
@@ -111,7 +111,7 @@ set_font(DiaRenderer *self, DiaFont *font, real height)
|
|
/*======================================================================
|
|
outline traversing functions.
|
|
----------------------------------------------------------------------*/
|
|
-static int paps_move_to( FT_Vector* to,
|
|
+static int paps_move_to( const FT_Vector* to,
|
|
void *user_data)
|
|
{
|
|
OutlineInfo *outline_info = (OutlineInfo*)user_data;
|
|
@@ -121,7 +121,7 @@ static int paps_move_to( FT_Vector* to,
|
|
return 0;
|
|
}
|
|
|
|
-static int paps_line_to( FT_Vector* to,
|
|
+static int paps_line_to( const FT_Vector* to,
|
|
void *user_data)
|
|
{
|
|
OutlineInfo *outline_info = (OutlineInfo*)user_data;
|
|
@@ -131,8 +131,8 @@ static int paps_line_to( FT_Vector* to,
|
|
return 0;
|
|
}
|
|
|
|
-static int paps_conic_to( FT_Vector* control,
|
|
- FT_Vector* to,
|
|
+static int paps_conic_to( const FT_Vector* control,
|
|
+ const FT_Vector* to,
|
|
void *user_data)
|
|
{
|
|
OutlineInfo *outline_info = (OutlineInfo*)user_data;
|
|
@@ -144,9 +144,9 @@ static int paps_conic_to( FT_Vector* control,
|
|
return 0;
|
|
}
|
|
|
|
-static int paps_cubic_to( FT_Vector* control1,
|
|
- FT_Vector* control2,
|
|
- FT_Vector* to,
|
|
+static int paps_cubic_to( const FT_Vector* control1,
|
|
+ const FT_Vector* control2,
|
|
+ const FT_Vector* to,
|
|
void *user_data)
|
|
{
|
|
OutlineInfo *outline_info = (OutlineInfo*)user_data;
|
|
--
|
|
GitLab
|
|
|