diff options
| author | Tor Lillqvist <tml@iki.fi> | 2000-08-20 22:02:14 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2000-08-20 22:02:14 +0000 |
| commit | cd3238a63b904fd0792ca04f1dac7ff04ef98eb4 (patch) | |
| tree | 20e3507658937baaf610ef3a48bac98439672255 /examples | |
| parent | 1c7f0ddea0ef2f9471a1dd87cebee30443524bd6 (diff) | |
| download | pango-cd3238a63b904fd0792ca04f1dac7ff04ef98eb4.tar.gz | |
Handle also ft_pixel_mode_mono glyphs.
2000-08-21 Tor Lillqvist <tml@iki.fi>
* pango/pangoft2.c (pango_ft2_render): Handle also ft_pixel_mode_mono
glyphs.
* pango/pangoft2*: Portability enhancements (non-gcc).
* examples/viewer-{ft2,win32}.c: One more 1000 vs. PANGO_SCALE fix.
* pango/module-defs.c.win32: New file.
* pango/Makefile.am: Distribute it.
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/makefile.mingw.in | 4 | ||||
| -rw-r--r-- | examples/viewer-ft2.c | 2 | ||||
| -rw-r--r-- | examples/viewer-win32.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/examples/makefile.mingw.in b/examples/makefile.mingw.in index cc086b78..69ef74f6 100644 --- a/examples/makefile.mingw.in +++ b/examples/makefile.mingw.in @@ -14,7 +14,7 @@ DEPCFLAGS = $(GTK_CFLAGS) $(GLIB_CFLAGS) $(FREETYPE2_CFLAGS) all : \ ../config.h \ viewer-win32.exe \ - viewer-ft2.exe \ + viewer-ft2.exe ../config.h : ../config.h.win32 cp $< $@ @@ -23,7 +23,7 @@ viewer-win32.exe : viewer-win32.o $(CC) -o $@ $< $(OPTIMIZE) -L ../pango -lpango-$(PANGO_VER) -lpangowin32-$(PANGO_VER) $(GTK_LIBS) $(GLIB_LIBS) -gdi32 viewer-ft2.exe : viewer-ft2.o - $(CC) -mwindows -o $@ $< $(OPTIMIZE) -L ../pango -lpango-$(PANGO_VER) -lpangoft2-$(PANGO_VER) $(FREETYPE2_LIBS) $(GTK_LIBS) $(GLIB_LIBS) + $(CC) -o $@ $< $(OPTIMIZE) -L ../pango -lpango-$(PANGO_VER) -lpangoft2-$(PANGO_VER) $(FREETYPE2_LIBS) $(GTK_LIBS) $(GLIB_LIBS) # Hack to get an updated makefile.mingw automatically after updating # makefile.mingw.in. Only for developer use. diff --git a/examples/viewer-ft2.c b/examples/viewer-ft2.c index e077c525..e7e24bd1 100644 --- a/examples/viewer-ft2.c +++ b/examples/viewer-ft2.c @@ -696,7 +696,7 @@ main (int argc, font_description.variant = PANGO_VARIANT_NORMAL; font_description.weight = PANGO_WEIGHT_NORMAL; font_description.stretch = PANGO_STRETCH_NORMAL; - font_description.size = 24000; + font_description.size = 24 * PANGO_SCALE; pango_context_set_font_description (context, &font_description); diff --git a/examples/viewer-win32.c b/examples/viewer-win32.c index cbfb8033..6ecb41c9 100644 --- a/examples/viewer-win32.c +++ b/examples/viewer-win32.c @@ -650,7 +650,7 @@ main (int argc, char **argv) font_description.variant = PANGO_VARIANT_NORMAL; font_description.weight = 500; font_description.stretch = PANGO_STRETCH_NORMAL; - font_description.size = 16000; + font_description.size = 16 * PANGO_SCALE; pango_context_set_font_description (context, &font_description); |