diff options
| -rw-r--r-- | ChangeLog | 15 | ||||
| -rw-r--r-- | pango/Makefile.am | 1 | ||||
| -rw-r--r-- | pango/pangoatsui-fontmap.c | 3 |
3 files changed, 19 insertions, 0 deletions
@@ -1,3 +1,18 @@ +2006-07-17 Richard Hult <richard@imendio.com> + + Bug 322374 ? Examples does not build on MacOS X (merge from HEAD). + + * pango/Makefile.am (libpangocairo_1_0_la_LDFLAGS): Add the + necessary frameworks to make this build with -no-undefined. + +2006-07-17 Richard Hult <richard@imendio.com> + + Bug 347021 ? atsui crash when a matching font cannot be found. + Patch from Brian Tarricone. + + * pango/pangoatsui-fontmap.c (pango_atsui_font_map_load_font): + Bail out if best desc or best face isn't found. + 2006-07-08 Behdad Esfahbod <behdad@gnome.org> Bug 345274 – list of new symbols for each version is missing in docs diff --git a/pango/Makefile.am b/pango/Makefile.am index ebd40994..695befc4 100644 --- a/pango/Makefile.am +++ b/pango/Makefile.am @@ -297,6 +297,7 @@ libpangocairo_1_0_la_SOURCES += \ pangocairo-atsuifontmap.c libpangocairo_1_0_la_CFLAGS = -xobjective-c +libpangocairo_1_0_la_LDFLAGS += -framework CoreFoundation -framework Carbon -framework Cocoa endif # ------------------- libpangowin32 ------------------- diff --git a/pango/pangoatsui-fontmap.c b/pango/pangoatsui-fontmap.c index 340334a3..6ac9630d 100644 --- a/pango/pangoatsui-fontmap.c +++ b/pango/pangoatsui-fontmap.c @@ -578,6 +578,9 @@ pango_atsui_font_map_load_font (PangoFontMap *fontmap, } } + if (best_desc == NULL || best_face == NULL) + return NULL; + pango_font_description_set_size (best_desc, size); best_font = pango_atsui_font_map_lookup (atsuifontmap, context, best_desc, best_face->postscript_name); |