From 6717f0d748000416172057d0aab2471377456e27 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Wed, 20 May 2009 17:35:19 +0100 Subject: [win32] Wrap win32-font usage with CAIRO_HAS_WIN32_FONT Bug 19251: --enable-win32=yes and --enable-win32-font=no causes compilation failure [https://bugs.freedesktop.org/show_bug.cgi?id=19251] Wrap use of the win32 font backend within win32-printing-surface within CAIRO_HAS_WIN32_FONT ifdefs to prevent compilation failure if the user explicitly disables the win32 font backend. --- src/cairo-win32-printing-surface.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/cairo-win32-printing-surface.c b/src/cairo-win32-printing-surface.c index 0dc889ba..e7ff3bb6 100644 --- a/src/cairo-win32-printing-surface.c +++ b/src/cairo-win32-printing-surface.c @@ -1451,6 +1451,7 @@ _cairo_win32_printing_surface_show_glyphs (void *abstract_surfac * If we are printing a bitmap font, use fallback images to * ensure the font is not substituted. */ +#if CAIRO_HAS_WIN32_FONT if (cairo_scaled_font_get_type (scaled_font) == CAIRO_FONT_TYPE_WIN32) { if (_cairo_win32_scaled_font_is_bitmap (scaled_font)) return CAIRO_INT_STATUS_UNSUPPORTED; @@ -1472,6 +1473,7 @@ _cairo_win32_printing_surface_show_glyphs (void *abstract_surfac if (status) return status; } +#endif return _cairo_win32_printing_surface_analyze_operation (surface, op, source); } @@ -1490,6 +1492,7 @@ _cairo_win32_printing_surface_show_glyphs (void *abstract_surfac source = opaque; } +#if CAIRO_HAS_WIN32_FONT if (cairo_scaled_font_get_type (scaled_font) == CAIRO_FONT_TYPE_WIN32 && source->type == CAIRO_PATTERN_TYPE_SOLID) { @@ -1554,6 +1557,7 @@ _cairo_win32_printing_surface_show_glyphs (void *abstract_surfac return status; } +#endif SaveDC (surface->dc); old_ctm = surface->ctm; -- cgit v1.2.3