diff options
| author | Hans Breuer <hans@breuer.org> | 2006-02-25 17:33:48 +0000 |
|---|---|---|
| committer | Hans Breuer <hans@src.gnome.org> | 2006-02-25 17:33:48 +0000 |
| commit | d952f4afb641fc9f4b42f8347bfa381897ea6830 (patch) | |
| tree | 67932f10f57a6a0a3c531470c050bb0327e1e114 | |
| parent | fef08ef86b516ebff0c28f8c5cd6474548135ac5 (diff) | |
| download | pango-d952f4afb641fc9f4b42f8347bfa381897ea6830.tar.gz | |
return TRUE to glyphs rendered at all (instead of box). This may be
2006-02-25 Hans Breuer <hans@breuer.org>
* pango/pangocairo-win32font.c(pango_cairo_win32_font_install) :
return TRUE to glyphs rendered at all (instead of box). This may
be compiler specific (what to return w/o return) but fixes bug #332538
* pango/makefile.msc : updated
* pango/pango.def : just some sorting
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | pango/makefile.msc | 11 | ||||
| -rw-r--r-- | pango/pango.def | 2 | ||||
| -rw-r--r-- | pango/pangocairo-win32font.c | 2 |
4 files changed, 19 insertions, 5 deletions
@@ -1,3 +1,12 @@ +2006-02-25 Hans Breuer <hans@breuer.org> + + * pango/pangocairo-win32font.c(pango_cairo_win32_font_install) : + return TRUE to glyphs rendered at all (instead of box). This may + be compiler specific (what to return w/o return) but fixes bug #332538 + + * pango/makefile.msc : updated + * pango/pango.def : just some sorting + 2006-02-25 Behdad Esfahbod <behdad@gnome.org> * examples/test-hebrew.txt: Added. Parts of Genesis. diff --git a/pango/makefile.msc b/pango/makefile.msc index 32e164b6..0e3d8d42 100644 --- a/pango/makefile.msc +++ b/pango/makefile.msc @@ -76,7 +76,7 @@ PKG_LINK = $(GLIB_LIBS) $(LIBICONV_LIBS) \ !IFDEF OBJS_pangocairo PKG_LINK = $(GLIB_LIBS) $(LIBICONV_LIBS) \ pango-$(PANGO_VER).lib $(CAIRO_LIBS) \ - pangowin32-$(PANGO_VER).lib pangoft2-$(PANGO_VER).lib $(FREETYPE2_LIBS) $(FONTCONFIG_LIBS) + pangowin32-$(PANGO_VER).lib $(FONTCONFIG_LIBS) !ENDIF !IF DEFINED (OBJS_querymodules) || DEFINED (OBJS_testfonts) @@ -113,7 +113,8 @@ OBJECTS = \ shape.obj \ \ fribidi.obj \ - fribidi_get_type.obj + fribidi_types.obj \ + fribidi_char_type.obj !ENDIF basic-win32.obj : ..\modules\basic\basic-win32.c @@ -128,8 +129,10 @@ basic-x.obj : ..\modules\basic\basic-x.c fribidi.obj : mini-fribidi\fribidi.c $(CC) $(PKG_CFLAGS) -GD -c mini-fribidi\fribidi.c -fribidi_get_type.obj : mini-fribidi\fribidi_get_type.c - $(CC) $(PKG_CFLAGS) -GD -Dpango_get_mirror_char=_pango_get_mirror_char -c mini-fribidi\fribidi_get_type.c +fribidi_types.obj : mini-fribidi\fribidi_types.c + $(CC) $(PKG_CFLAGS) -GD -c mini-fribidi\fribidi_types.c +fribidi_char_type.obj : mini-fribidi\fribidi_char_type.c + $(CC) $(PKG_CFLAGS) -GD -c mini-fribidi\fribidi_char_type.c !IFDEF OBJS_pangowin32 PKG_CFLAGS = $(PKG_CFLAGS) -DPANGO_MODULE_PREFIX=_pango_basic_win32 diff --git a/pango/pango.def b/pango/pango.def index 8fb14fd6..ee8c6856 100644 --- a/pango/pango.def +++ b/pango/pango.def @@ -127,8 +127,8 @@ EXPORTS pango_font_family_list_faces pango_font_find_shaper pango_font_get_coverage - pango_font_get_glyph_extents pango_font_get_font_map + pango_font_get_glyph_extents pango_font_get_metrics pango_font_get_type pango_font_map_get_shape_engine_type diff --git a/pango/pangocairo-win32font.c b/pango/pangocairo-win32font.c index 80661c3c..40e5be85 100644 --- a/pango/pangocairo-win32font.c +++ b/pango/pangocairo-win32font.c @@ -148,6 +148,8 @@ pango_cairo_win32_font_install (PangoCairoFont *font, pango_cairo_win32_font_get_font_face (font)); cairo_set_font_matrix (cr, &cwfont->font_matrix); cairo_set_font_options (cr, cwfont->options); + + return TRUE; } static void |