1 |
From 28e6caab0a9c04b306f723fb3390332f5ef94a61 Mon Sep 17 00:00:00 2001 |
2 |
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com> |
3 |
Date: Thu, 10 Mar 2011 13:54:58 +0000 |
4 |
Subject: [PATCH] add cairo_ft_font_face_create_for_pattern wrapper |
5 |
|
6 |
--- |
7 |
vcl/unx/source/gdi/salgdi3.cxx | 6 ++++++ |
8 |
1 files changed, 6 insertions(+), 0 deletions(-) |
9 |
|
10 |
diff --git a/vcl/unx/source/gdi/salgdi3.cxx b/vcl/unx/source/gdi/salgdi3.cxx |
11 |
index 3056f92..9834028 100644 |
12 |
--- a/vcl/unx/source/gdi/salgdi3.cxx |
13 |
+++ b/vcl/unx/source/gdi/salgdi3.cxx |
14 |
@@ -89,6 +89,7 @@ struct cairo_surface_t; |
15 |
struct cairo_t; |
16 |
struct cairo_font_face_t; |
17 |
typedef void* FT_Face; |
18 |
+typedef void* FcPattern; |
19 |
struct cairo_matrix_t { |
20 |
double xx; double yx; |
21 |
double xy; double yy; |
22 |
@@ -742,6 +743,7 @@ private: |
23 |
void (*mp_clip)(cairo_t*); |
24 |
void (*mp_rectangle)(cairo_t*, double, double, double, double); |
25 |
cairo_font_face_t * (*mp_ft_font_face_create_for_ft_face)(FT_Face, int); |
26 |
+ cairo_font_face_t * (*mp_ft_font_face_create_for_pattern)(FcPattern*); |
27 |
void (*mp_set_font_face)(cairo_t *, cairo_font_face_t *); |
28 |
void (*mp_font_face_destroy)(cairo_font_face_t *); |
29 |
void (*mp_matrix_init_identity)(cairo_matrix_t *); |
30 |
@@ -771,6 +773,8 @@ public: |
31 |
{ (*mp_rectangle)(cr, x, y, width, height); } |
32 |
cairo_font_face_t* ft_font_face_create_for_ft_face(FT_Face face, int load_flags) |
33 |
{ return (*mp_ft_font_face_create_for_ft_face)(face, load_flags); } |
34 |
+ cairo_font_face_t* ft_font_face_create_for_pattern(FcPattern *pattern) |
35 |
+ { return (*mp_ft_font_face_create_for_pattern)(pattern); } |
36 |
void set_font_face(cairo_t *cr, cairo_font_face_t *font_face) |
37 |
{ (*mp_set_font_face)(cr, font_face); } |
38 |
void font_face_destroy(cairo_font_face_t *font_face) |
39 |
@@ -844,6 +848,8 @@ CairoWrapper::CairoWrapper() |
40 |
osl_getAsciiFunctionSymbol( mpCairoLib, "cairo_rectangle" ); |
41 |
mp_ft_font_face_create_for_ft_face = (cairo_font_face_t * (*)(FT_Face, int)) |
42 |
osl_getAsciiFunctionSymbol( mpCairoLib, "cairo_ft_font_face_create_for_ft_face" ); |
43 |
+ mp_ft_font_face_create_for_pattern = (cairo_font_face_t * (*)(FcPattern*)) |
44 |
+ osl_getAsciiFunctionSymbol( mpCairoLib, "cairo_ft_font_face_create_for_pattern" ); |
45 |
mp_set_font_face = (void (*)(cairo_t *, cairo_font_face_t *)) |
46 |
osl_getAsciiFunctionSymbol( mpCairoLib, "cairo_set_font_face" ); |
47 |
mp_font_face_destroy = (void (*)(cairo_font_face_t *)) |
48 |
-- |
49 |
1.7.4.1 |