diff options
| author | bjasspa <bjasspa@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2012-07-01 07:58:00 +0000 |
|---|---|---|
| committer | bjasspa <bjasspa@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2012-07-01 07:58:00 +0000 |
| commit | 8f65647892debd04292454db3162a12b7806d65d (patch) | |
| tree | 4a4f3d38ce93ed66f3cc2b5d9a053f99c7888a15 /navit/font | |
| parent | b87f98ff8b12319eddb55f714f962a10f6625996 (diff) | |
| download | navit-8f65647892debd04292454db3162a12b7806d65d.tar.gz | |
Simple fixes to get navit compiling with MSVC
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@5165 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'navit/font')
| -rw-r--r-- | navit/font/freetype/font_freetype.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/navit/font/freetype/font_freetype.c b/navit/font/freetype/font_freetype.c index 4a3317df5..504cc55c0 100644 --- a/navit/font/freetype/font_freetype.c +++ b/navit/font/freetype/font_freetype.c @@ -64,6 +64,7 @@ struct font_freetype_font { }; struct font_priv { + int data; }; static struct font_priv dummy; @@ -89,10 +90,11 @@ font_freetype_get_text_bbox(struct graphics_priv *gr, FT_Glyph glyph; FT_Matrix matrix; FT_Vector pen; - pen.x = 0 * 64; - pen.y = 0 * 64; int i; struct point pt; + int n, len, x = 0, y = 0; + pen.x = 0 * 64; + pen.y = 0 * 64; #if 0 matrix.xx = dx; matrix.xy = dy; @@ -104,7 +106,6 @@ font_freetype_get_text_bbox(struct graphics_priv *gr, matrix.yx = 0; matrix.yy = 0x10000; #endif - int n, len, x = 0, y = 0; len = g_utf8_strlen(text, -1); if (estimate) { @@ -122,8 +123,8 @@ font_freetype_get_text_bbox(struct graphics_priv *gr, FT_BBox glyph_bbox; #if USE_CACHING FTC_Node anode = NULL; - glyph_index = FTC_CMapCache_Lookup(charmap_cache, font->scaler.face_id, font->charmap_index, g_utf8_get_char(p)); FT_Glyph cached_glyph; + glyph_index = FTC_CMapCache_Lookup(charmap_cache, font->scaler.face_id, font->charmap_index, g_utf8_get_char(p)); #if HAVE_LOOKUP_SCALER FTC_ImageCache_LookupScaler(image_cache, &font->scaler, FT_LOAD_DEFAULT, glyph_index, &cached_glyph, &anode); #else @@ -384,8 +385,6 @@ font_freetype_font_new(struct graphics_priv *gr, { struct font_freetype_font *font = g_new(struct font_freetype_font, 1); - - *meth = font_methods; int exact, found=0; char **family, **family_sav; #if USE_CACHING @@ -395,6 +394,7 @@ font_freetype_font_new(struct graphics_priv *gr, #ifndef HAVE_FONTCONFIG char *name; #endif + *meth = font_methods; if (!library_init) { FT_Init_FreeType(&library); |