← Back to branch summary

~ubuntu-branches/debian/sid/pango1.0/sid

« back to all changes in this revision

Viewing changes to pango/pango-ot-info.c

  • Committer: Package Import Robot
  • Author(s): Iain Lane
  • Date: 2014-03-20 18:01:45 UTC
  • mfrom: (1.9.3)
  • Revision ID: package-import@ubuntu.com-20140320180145-y2zs0pzp6390a6y9
Tags: 1.36.3-1
* Add xauth test-dep, needed for xvfb-run
* New upstream release
  - Fix builddir != srdir builds
    + Drop 0001-Fix-tests-for-builddir-srcdir-by-setting-G_TEST_-SRC.patch,
      which was a cherry-pick of this fix.
  - Avoid a crash when FT_Face is NULL
  - Update pango_color_parse docs

Show diffs side-by-side

added added

removed removed

Lines of Context:
pango/pango-ot-info.c
88
88
{
89
89
  PangoOTInfo *info;
90
90
 
 
91
  if (G_UNLIKELY (!face))
 
92
    return NULL;
 
93
 
91
94
  if (G_LIKELY (face->generic.data && face->generic.finalizer == pango_ot_info_finalizer))
92
95
    return face->generic.data;
93
96
  else