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
|
$NetBSD: patch-aa,v 1.2 2007/08/19 15:16:11 heinz Exp $
--- src/freetype/SVGCanvasTextFreetype.cpp.orig 2006-06-20 12:31:40.000000000 +0000
+++ src/freetype/SVGCanvasTextFreetype.cpp
@@ -165,7 +165,11 @@ void wxSVGCanvasTextFreetype::RenderLine
}
}
+#if (FREETYPE_MAJOR == 2 && FREETYPE_MINOR >= 2) || FREETYPE_MAJOR > 2
+gint moveto(const FT_Vector* to, gpointer data)
+#else
gint moveto(FT_Vector* to, gpointer data)
+#endif
{
wxSVGCanvasTextFreetype* canvasText = (wxSVGCanvasTextFreetype*) data;
@@ -181,7 +185,11 @@ gint moveto(FT_Vector* to, gpointer data
return 0;
}
+#if (FREETYPE_MAJOR == 2 && FREETYPE_MINOR >= 2) || FREETYPE_MAJOR > 2
+static gint lineto (const FT_Vector* to, gpointer data)
+#else
static gint lineto (FT_Vector* to, gpointer data)
+#endif
{
wxSVGCanvasTextFreetype* canvasText = (wxSVGCanvasTextFreetype*) data;
if (!canvasText->m_endpath)
@@ -194,7 +202,11 @@ static gint lineto (FT_Vector* to, gpoin
return 0;
}
+#if (FREETYPE_MAJOR == 2 && FREETYPE_MINOR >= 2) || FREETYPE_MAJOR > 2
+static gint conicto(const FT_Vector* ftcontrol, const FT_Vector* to, gpointer data)
+#else
static gint conicto(FT_Vector* ftcontrol, FT_Vector* to, gpointer data)
+#endif
{
wxSVGCanvasTextFreetype* canvasText = (wxSVGCanvasTextFreetype*) data;
if (!canvasText->m_endpath)
@@ -209,8 +221,13 @@ static gint conicto(FT_Vector* ftcontrol
return 0;
}
+#if (FREETYPE_MAJOR == 2 && FREETYPE_MINOR >= 2) || FREETYPE_MAJOR > 2
+static gint cubicto(const FT_Vector* ftcontrol1, const FT_Vector* ftcontrol2,
+ const FT_Vector* to, gpointer data)
+#else
static gint cubicto(FT_Vector* ftcontrol1, FT_Vector* ftcontrol2,
FT_Vector* to, gpointer data)
+#endif
{
wxSVGCanvasTextFreetype* canvasText = (wxSVGCanvasTextFreetype*) data;
if (!canvasText->m_endpath)
|
