summaryrefslogtreecommitdiff
path: root/src/cairo-win32-font.c
diff options
context:
space:
mode:
authorAdrian Johnson <ajohnson@redneon.com>2008-12-21 17:03:17 +1030
committerAdrian Johnson <ajohnson@redneon.com>2008-12-21 17:09:20 +1030
commitd99583bae680fea852e957afdf674e2031aa7928 (patch)
tree7767ecf92333334f0fa97c8e5aa5dfdd7621c5fa /src/cairo-win32-font.c
parenta5983929f8f07f384f78e0b604e22037cf5ed716 (diff)
Fix win32 font breakage
as a result of the toy font face changes in f7ab65e9b0c0f08be8d294e90131baa2decf1f1d
Diffstat (limited to 'src/cairo-win32-font.c')
-rw-r--r--src/cairo-win32-font.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/cairo-win32-font.c b/src/cairo-win32-font.c
index 94769f03..be50c6c5 100644
--- a/src/cairo-win32-font.c
+++ b/src/cairo-win32-font.c
@@ -541,7 +541,6 @@ _cairo_win32_font_face_create_for_toy (cairo_toy_font_face_t *toy_face,
memcpy (logfont.lfFaceName, face_name, sizeof (uint16_t) * (face_name_len + 1));
free (face_name);
- logfont.lfFaceName[ARRAY_LENGTH (logfont.lfFaceName) - 1] = 0;
logfont.lfHeight = 0; /* filled in later */
logfont.lfWidth = 0; /* filled in later */
@@ -581,7 +580,7 @@ _cairo_win32_font_face_create_for_toy (cairo_toy_font_face_t *toy_face,
logfont.lfQuality = DEFAULT_QUALITY; /* filled in later */
logfont.lfPitchAndFamily = DEFAULT_PITCH | FF_DONTCARE;
- *font_face = cairo_win32_font_face_create_for_logfontw (logfont);
+ *font_face = cairo_win32_font_face_create_for_logfontw (&logfont);
return CAIRO_STATUS_SUCCESS;
}
@@ -1898,11 +1897,10 @@ _cairo_win32_font_face_scaled_font_create (void *abstract_face,
font);
}
-static const cairo_font_face_backend_t _cairo_win32_font_face_backend = {
+const cairo_font_face_backend_t _cairo_win32_font_face_backend = {
CAIRO_FONT_TYPE_WIN32,
_cairo_win32_font_face_create_for_toy,
_cairo_win32_font_face_destroy,
- NULL, /* direct implementation */
_cairo_win32_font_face_scaled_font_create
};