Add more debug info if creating scaled font failed.

2008-12-06  Behdad Esfahbod  <behdad@gnome.org>

        * pango/pangocairo-font.c
        (_pango_cairo_font_private_get_scaled_font):
        Add more debug info if creating scaled font failed.

svn path=/trunk/; revision=2748

diff --git a/ChangeLog b/ChangeLog
index 03fe446..990e77a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-12-06  Behdad Esfahbod  <behdad@gnome.org>
+
+       * pango/pangocairo-font.c
+       (_pango_cairo_font_private_get_scaled_font):
+       Add more debug info if creating scaled font failed.
+
 2008-12-05  Behdad Esfahbod  <behdad@gnome.org>
 
        Bug 563356 – The input area of firefox and the blank width after text

diff --git a/pango/pangocairo-font.c b/pango/pangocairo-font.c
index 11cb267..472a026 100644 (file)
--- a/pango/pangocairo-font.c
+++ b/pango/pangocairo-font.c
@@ -111,6 +111,7 @@ done:
 
   if (G_UNLIKELY (cf_priv->scaled_font == NULL || cairo_scaled_font_status (cf_priv->scaled_font) != CAIRO_STATUS_SUCCESS))
     {
+      cairo_scaled_font_t *scaled_font = cf_priv->scaled_font;
       PangoFont *font = PANGO_FONT (cf_priv->cfont);
       static GQuark warned_quark = 0;
       if (!warned_quark)
@@ -129,6 +130,18 @@ done:
                     font_face ? "scaled font" : "font face",
                     s);
 
+         if (!font_face)
+               g_warning ("font_face is NULL");
+         else
+               g_warning ("font_font status is: %s",
+                          cairo_status_to_string (cairo_font_face_status (font_face)));
+
+         if (!scaled_font)
+               g_warning ("scaled_font is NULL");
+         else
+               g_warning ("scaled_font status is: %s",
+                          cairo_status_to_string (cairo_scaled_font_status (scaled_font)));
+
          g_free (s);
 
          g_object_set_qdata_full (G_OBJECT (font), warned_quark,