Comment 143 for bug 179988

Revision history for this message
Rygle (rygle) wrote :

That last bit is in src\extensions\internal\cairo-render-context.cpp

There are only a few other bits in the current patch that don't seem to have ifdefs and may affect other platforms

The first four added lines here;
==========
@@ -1421,16 +1426,33 @@
 {
     // create a cairo_font_face from PangoFont
     double size = style->font_size.computed;
+ cairo_font_face_t *font_face = NULL;
+
+ FcPattern *fc_pattern = NULL;
+
+#ifdef USE_PANGO_WIN32
==========

This just seems to be an improvement of code for everyone;
========
- if (FcPatternGetDouble(fc_pattern, FC_PIXEL_SIZE, 0, &size) != FcResultMatch)
+ if (fc_pattern && FcPatternGetDouble(fc_pattern, FC_PIXEL_SIZE, 0, &size) != FcResultMatch)
========

And so does this;
========
     cairo_restore(_cr);

- cairo_font_face_destroy(font_face);
-#else
- (void)size;
- (void)fc_pattern;
+ if (font_face)
+ cairo_font_face_destroy(font_face);

- cairo_restore(_cr);
-#endif
-
========

So I think just one #ifdef WIN32 ... #endif needed for the #include "Fontfactory.h"

Will test now on Windows.

Rygle