← Back to branch summary

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

« back to all changes in this revision

Viewing changes to pango/pangocoretext-fontmap.c

  • Committer: Package Import Robot
  • Author(s): Michael Biebl, Michael Biebl, Andreas Henriksson
  • Date: 2013-10-21 13:45:21 UTC
  • mfrom: (1.6.7)
  • Revision ID: package-import@ubuntu.com-20131021134521-sc98iu83v2j7kb3g
Tags: 1.36.0-1
[ Michael Biebl ]
* Use Breaks instead of Conflicts since that is recommended nowadays for
  moving files between packages.
* Use the official field for udebs: Package-Type.

[ Andreas Henriksson ]
* New upstream release.
* Update debian/libpango-1.0-0.symbols with one added symbol.

[ Michael Biebl ]
* Refresh patches.
* Bump minimum required version of libcairo2-dev to >= 1.12.10 and
  libfontconfig1-dev to >= 2.10.91 to get the thread-safe version.

Show diffs side-by-side

added added

removed removed

Lines of Context:
pango/pangocoretext-fontmap.c
1199
1199
  return ctfontmap->serial;
1200
1200
}
1201
1201
 
 
1202
static void
 
1203
pango_core_text_font_map_changed (PangoFontMap *fontmap)
 
1204
{
 
1205
  PangoCoreTextFontMap *ctfontmap = PANGO_CORE_TEXT_FONT_MAP (fontmap);
 
1206
 
 
1207
  ctfontmap->serial++;
 
1208
  if (ctfontmap->serial == 0)
 
1209
    ctfontmap->serial++;
 
1210
}
 
1211
 
1202
1212
static PangoFont *
1203
1213
pango_core_text_font_map_load_font (PangoFontMap               *fontmap,
1204
1214
                                    PangoContext               *context,
1471
1481
  fontmap_class->load_fontset = pango_core_text_font_map_load_fontset;
1472
1482
  fontmap_class->shape_engine_type = PANGO_RENDER_TYPE_CORE_TEXT;
1473
1483
  fontmap_class->get_serial = pango_core_text_font_map_get_serial;
 
1484
  fontmap_class->changed = pango_core_text_font_map_changed;
1474
1485
}
1475
1486
 
1476
1487
/*