Skip to content

Fix Cairo for Windows #1697

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nilason merged 1 commit into from
Jul 15, 2021
Merged

Fix Cairo for Windows #1697

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions lib/cairodriver/text.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,13 @@

#if CAIRO_HAS_FT_FONT
#include <cairo-ft.h>
#if CAIRO_VERSION < CAIRO_VERSION_ENCODE(1,10,0) || defined(CAIRO_HAS_FC_FONT)
#define USE_FONTCONFIG 1
#include <fontconfig/fontconfig.h>
#else
#define USE_FONTCONFIG 0
#endif
#endif /* CAIRO_HAS_FT_FONT */

#ifdef HAVE_ICONV_H
#include <iconv.h>
Expand Down Expand Up @@ -170,7 +175,7 @@ static void set_font_toy(const char *name)
G_free(font);
}

#if CAIRO_HAS_FT_FONT
#if USE_FONTCONFIG

static void fc_init(void)
{
Expand Down Expand Up @@ -281,7 +286,7 @@ static int is_toy_font(const char *name)
*/
void Cairo_set_font(const char *name)
{
#if CAIRO_HAS_FT_FONT
#if USE_FONTCONFIG
if (is_toy_font(name))
set_font_toy(name);
else
Expand Down Expand Up @@ -322,7 +327,7 @@ static void font_list_toy(char ***list, int *count, int verbose)
void Cairo_font_list(char ***list, int *count)
{
font_list_toy(list, count, 0);
#if CAIRO_HAS_FT_FONT
#if USE_FONTCONFIG
font_list_fc(list, count, 0);
#endif
}
Expand All @@ -336,7 +341,7 @@ void Cairo_font_list(char ***list, int *count)
void Cairo_font_info(char ***list, int *count)
{
font_list_toy(list, count, 1);
#if CAIRO_HAS_FT_FONT
#if USE_FONTCONFIG
font_list_fc(list, count, 1);
#endif
}