diff options
| author | Hans Breuer <hans@breuer.org> | 2005-04-03 22:17:33 +0000 |
|---|---|---|
| committer | Hans Breuer <hans@src.gnome.org> | 2005-04-03 22:17:33 +0000 |
| commit | 05c7e63fc205797a8c2b9fd52aee466ef9e2d6be (patch) | |
| tree | d0678eab50f1bed4d06fe427c059689ff0387474 /pango | |
| parent | e194e2dc04020e3a7c261956ccdb0f6d3af6668f (diff) | |
| download | pango-05c7e63fc205797a8c2b9fd52aee466ef9e2d6be.tar.gz | |
variable declaration on the start of the block, not C99 everywhere.
2005-04-04 Hans Breuer <hans@breuer.org>
* pango/pangocairo-win32font.c(pango_cairor_win32_font_get_metrics) :
variable declaration on the start of the block, not C99 everywhere.
* examples/viewer-win32.c : updated to not so recent Pango api changes
* pango/makefile.msc : pangocairo build win32 version, not freetype
Diffstat (limited to 'pango')
| -rw-r--r-- | pango/makefile.msc | 13 | ||||
| -rw-r--r-- | pango/pangocairo-win32font.c | 2 |
2 files changed, 9 insertions, 6 deletions
diff --git a/pango/makefile.msc b/pango/makefile.msc index 1d1b1103..3d29ec01 100644 --- a/pango/makefile.msc +++ b/pango/makefile.msc @@ -7,7 +7,7 @@ PERL = perl # Possibly override Pango version from build/win32/module.defs PANGO_VER = 1.0 -PANGO_MODULE_VERSION = 1.0.0 +PANGO_MODULE_VERSION = 1.2.0 # INCLUDES = -I .. -I . # DEFINES = -DPACKAGE=\"Pango\" -DVERSION=\"$(PANGO_VER)\" @@ -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) \ - pangoft2-$(PANGO_VER).lib $(FREETYPE2_LIBS) $(FONTCONFIG_LIBS) + pangowin32-$(PANGO_VER).lib pangoft2-$(PANGO_VER).lib $(FREETYPE2_LIBS) $(FONTCONFIG_LIBS) !ENDIF !IF DEFINED (OBJS_querymodules) || DEFINED (OBJS_testfonts) @@ -166,16 +166,19 @@ OBJECTS = \ basic-x.obj !ENDIF +# -DHAVE_CAIRO_FREETYPE !IFDEF OBJS_pangocairo PKG_CFLAGS = \ $(PKG_CFLAGS) $(FONTCONFIG_CFLAGS) $(FREETYPE2_CFLAGS) \ - -DHAVE_CAIRO_FREETYPE $(CAIRO_CFLAGS) + -DHAVE_CAIRO_WIN32 $(CAIRO_CFLAGS) OBJECTS = \ - pangocairo-fcfont.obj \ - pangocairo-fcfontmap.obj \ pangocairo-font.obj \ pangocairo-fontmap.obj \ pangocairo-render.obj \ + pangocairo-win32font.obj \ + pangocairo-win32fontmap.obj \ + pangocairo-fcfont.obj \ + pangocairo-fcfontmap.obj \ !ENDIF !IFDEF OBJS_querymodules diff --git a/pango/pangocairo-win32font.c b/pango/pangocairo-win32font.c index ad2960a2..033c49f2 100644 --- a/pango/pangocairo-win32font.c +++ b/pango/pangocairo-win32font.c @@ -178,10 +178,10 @@ pango_cairo_win32_font_get_metrics (PangoFont *font, if (!cwfont->metrics) { + double height; cairo_font_t *cairo_font; cairo_font_extents_t font_extents; cwfont->metrics = pango_font_metrics_new (); - double height; cairo_font = pango_cairo_win32_font_get_cairo_font (PANGO_CAIRO_FONT (font)); |