with_pango to true and use fontconfig to load fonts

Automattic · Dec 9, 2014 · 7522aca · 7522aca
1 parent 14e8b6c
commit 7522aca
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/binding.gyp b/binding.gyp
@@ -13,7 +13,7 @@
         'with_jpeg%': '<!(./util/has_lib.sh jpeg)',
         'with_gif%': '<!(./util/has_lib.sh gif)',
         # disable pango as it causes issues with freetype.
-        'with_pango%': 'false',
+        'with_pango%': '<!(./util/has_lib.sh pangocairo)',
         'with_freetype%': '<!(./util/has_cairo_freetype.sh)'
       }
     }]

diff --git a/src/FontFace.cc b/src/FontFace.cc
@@ -6,6 +6,8 @@
 
 #include "FontFace.h"
 
+#include <fontconfig/fontconfig.h>
+
 Persistent<FunctionTemplate> FontFace::constructor;
 
 /*
@@ -79,6 +81,14 @@ NAN_METHOD(FontFace::New) {
     return NanThrowError("Could not load font file");
   }
 
+  #if HAVE_PANGO
+    // Load the font file in fontconfig
+    FcBool ok = FcConfigAppFontAddFile(FcConfigGetCurrent(), (FcChar8 *)(*filePath));
+    if (!ok) {
+      return NanThrowError("Could not load font in FontConfig");
+    }
+  #endif
+
   // Create new cairo font face.
   crFace = cairo_ft_font_face_create_for_ft_face(ftFace, 0);