diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-1-4 | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-1-6 | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-1-8 | 9 | ||||
| -rw-r--r-- | pango/Makefile.am | 10 | ||||
| -rw-r--r-- | pango/pangox-fontmap.c | 5 |
7 files changed, 50 insertions, 10 deletions
@@ -1,3 +1,12 @@ +Fri Oct 31 13:01:25 2003 Owen Taylor <otaylor@redhat.com> + + * pango/Makefile.am (libpangox_1_0_la_LDFLAGS): Fix some + leftover references to INCLUDE_XFT_MODULES, + INCLUDED_FC_MODULES. (#125588, Martin Kretzschmar) + + * pango/pangox-fontmap.c (pango_x_face_get_coverage): + Fix some code that was never quite finished. + Fri Oct 31 12:32:38 2003 Owen Taylor <otaylor@redhat.com> Fix one problem with iteration by chars (Part of diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index 9fe9d9be..d3b5e33f 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,12 @@ +Fri Oct 31 13:01:25 2003 Owen Taylor <otaylor@redhat.com> + + * pango/Makefile.am (libpangox_1_0_la_LDFLAGS): Fix some + leftover references to INCLUDE_XFT_MODULES, + INCLUDED_FC_MODULES. (#125588, Martin Kretzschmar) + + * pango/pangox-fontmap.c (pango_x_face_get_coverage): + Fix some code that was never quite finished. + Fri Oct 31 12:32:38 2003 Owen Taylor <otaylor@redhat.com> Fix one problem with iteration by chars (Part of diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index 9fe9d9be..d3b5e33f 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,3 +1,12 @@ +Fri Oct 31 13:01:25 2003 Owen Taylor <otaylor@redhat.com> + + * pango/Makefile.am (libpangox_1_0_la_LDFLAGS): Fix some + leftover references to INCLUDE_XFT_MODULES, + INCLUDED_FC_MODULES. (#125588, Martin Kretzschmar) + + * pango/pangox-fontmap.c (pango_x_face_get_coverage): + Fix some code that was never quite finished. + Fri Oct 31 12:32:38 2003 Owen Taylor <otaylor@redhat.com> Fix one problem with iteration by chars (Part of diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index 9fe9d9be..d3b5e33f 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,12 @@ +Fri Oct 31 13:01:25 2003 Owen Taylor <otaylor@redhat.com> + + * pango/Makefile.am (libpangox_1_0_la_LDFLAGS): Fix some + leftover references to INCLUDE_XFT_MODULES, + INCLUDED_FC_MODULES. (#125588, Martin Kretzschmar) + + * pango/pangox-fontmap.c (pango_x_face_get_coverage): + Fix some code that was never quite finished. + Fri Oct 31 12:32:38 2003 Owen Taylor <otaylor@redhat.com> Fix one problem with iteration by chars (Part of diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index 9fe9d9be..d3b5e33f 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,12 @@ +Fri Oct 31 13:01:25 2003 Owen Taylor <otaylor@redhat.com> + + * pango/Makefile.am (libpangox_1_0_la_LDFLAGS): Fix some + leftover references to INCLUDE_XFT_MODULES, + INCLUDED_FC_MODULES. (#125588, Martin Kretzschmar) + + * pango/pangox-fontmap.c (pango_x_face_get_coverage): + Fix some code that was never quite finished. + Fri Oct 31 12:32:38 2003 Owen Taylor <otaylor@redhat.com> Fix one problem with iteration by chars (Part of diff --git a/pango/Makefile.am b/pango/Makefile.am index 895553cb..b0dbcb21 100644 --- a/pango/Makefile.am +++ b/pango/Makefile.am @@ -160,8 +160,8 @@ lib_LTLIBRARIES += libpangoxft-1.0.la endif libpangoxft_1_0_la_LDFLAGS = -version-info $(LT_VERSION_INFO) -libpangoxft_1_0_la_LIBADD = libpangoft2-$(PANGO_API_VERSION).la libpango-$(PANGO_API_VERSION).la $(INCLUDED_XFT_MODULES) $(XFT_LIBS) -libpangoxft_1_0_la_DEPENDENCIES = libpangoft2-$(PANGO_API_VERSION).la libpango-$(PANGO_API_VERSION).la $(INCLUDED_XFT_MODULES) +libpangoxft_1_0_la_LIBADD = libpangoft2-$(PANGO_API_VERSION).la libpango-$(PANGO_API_VERSION).la $(XFT_LIBS) +libpangoxft_1_0_la_DEPENDENCIES = libpangoft2-$(PANGO_API_VERSION).la libpango-$(PANGO_API_VERSION).la libpangoxft_1_0_la_SOURCES = \ pangoxft-font.c \ @@ -177,8 +177,8 @@ lib_LTLIBRARIES += libpangoft2-1.0.la endif libpangoft2_1_0_la_LDFLAGS = -version-info $(LT_VERSION_INFO) $(no_undefined) -libpangoft2_1_0_la_LIBADD = opentype/libpango-ot.la libpango-$(PANGO_API_VERSION).la $(INCLUDED_FT2_MODULES) $(FREETYPE_LIBS) $(GLIB_LIBS) -libpangoft2_1_0_la_DEPENDENCIES = opentype/libpango-ot.la libpango-$(PANGO_API_VERSION).la $(INCLUDED_FT2_MODULES) +libpangoft2_1_0_la_LIBADD = opentype/libpango-ot.la libpango-$(PANGO_API_VERSION).la $(INCLUDED_FC_MODULES) $(FREETYPE_LIBS) $(GLIB_LIBS) +libpangoft2_1_0_la_DEPENDENCIES = opentype/libpango-ot.la libpango-$(PANGO_API_VERSION).la $(INCLUDED_FC_MODULES) libpangoft2_1_0_la_SOURCES = \ pangofc-font.c \ @@ -322,7 +322,7 @@ if HAVE_INCLUDED_MODULES included-modules: @cd $(top_builddir)/modules && $(MAKE) $(AM_MAKEFLAGS) included-modules -$(INCLUDED_X_MODULES) $(INCLUDED_XFT_MODULES) $(INCLUDED_FT2_MODULES) $(INCLUDED_WIN32_MODULES): included-modules +$(INCLUDED_X_MODULES) $(INCLUDED_FC_MODULES) $(INCLUDED_WIN32_MODULES): included-modules @true .PHONY: included-modules diff --git a/pango/pangox-fontmap.c b/pango/pangox-fontmap.c index 09fbfcc9..308d5621 100644 --- a/pango/pangox-fontmap.c +++ b/pango/pangox-fontmap.c @@ -1571,11 +1571,6 @@ pango_x_face_get_coverage (PangoXFace *xface, pango_coverage_set (result, wc, level); } - return result; - - - result = _pango_engine_shape_get_coverage (engine, font, language); - if (atom) pango_x_store_cached_coverage (xfontmap, atom, result); } |