← Back to branch summary

~ubuntu-branches/ubuntu/saucy/pango1.0/saucy-proposed

« back to all changes in this revision

Viewing changes to pango/pangoatsui-fontmap.c

  • Committer: Bazaar Package Importer
  • Author(s): Emilio Pozuelo Monfort
  • Date: 2010-11-22 14:55:36 UTC
  • mfrom: (1.5.12 upstream)
  • mto: (63.1.13 experimental)
  • mto: This revision was merged to the branch mainline in revision 87.
  • Revision ID: james.westby@ubuntu.com-20101122145536-r9wn3cvi0fjx7hts
Import upstream version 1.28.3

Show diffs side-by-side

added added

removed removed

Lines of Context:
pango/pangoatsui-fontmap.c
672
672
  const gchar *family;
673
673
  gchar *name;
674
674
  gint size;
 
675
  gboolean is_absolute;
675
676
 
676
677
  size = pango_font_description_get_size (description);
677
678
  if (size < 0)
678
679
    return NULL;
679
680
 
 
681
  is_absolute = pango_font_description_get_size_is_absolute (description);
 
682
 
680
683
  family = pango_font_description_get_family (description);
681
684
  family = family ? family : "";
682
685
  name = g_utf8_casefold (family, -1);
695
698
      if (!find_best_match (font_family, description, &best_description, &best_face))
696
699
        return NULL;
697
700
      
698
 
      pango_font_description_set_size (best_description, size);
 
701
      if (is_absolute)
 
702
        pango_font_description_set_absolute_size (best_description, size);
 
703
      else
 
704
        pango_font_description_set_size (best_description, size);
699
705
 
700
706
      best_font = pango_atsui_font_map_lookup (atsuifontmap, 
701
707
                                               context,