0f3d2a3a5d7f1922711bedbfc5f8b63b425350b4 braney Tue Oct 6 15:58:40 2020 -0700 fix problem with compiling memgfx.c if FREETYPE isn't defined diff --git src/lib/memgfx.c src/lib/memgfx.c index 27865d4..e1d5bb4 100644 --- src/lib/memgfx.c +++ src/lib/memgfx.c @@ -796,33 +796,37 @@ int mgGetFontPixelHeight(struct memGfx *mg, MgFont *font) /* How high in pixels is font? */ { return mgFontPixelHeight(font); } int mgFontLineHeight(MgFont *font) /* How many pixels to next line ideally? */ { return font_line_height(font); } int mgFontWidth(MgFont *font, char *chars, int charCount) /* How wide are a couple of letters? */ { +#ifndef USE_FREETYPE +return fnstring_width(font, (unsigned char *)chars, charCount); +#else if (face == NULL) // have we turned on freetype return fnstring_width(font, (unsigned char *)chars, charCount); return ftWidth(font, (unsigned char *)chars, charCount); +#endif } int mgFontStringWidth(MgFont *font, char *string) /* How wide is a string? */ { return mgFontWidth(font, string, strlen(string)); } int mgGetFontStringWidth(struct memGfx *mg, MgFont *font, char *string) /* How wide is a string? */ { return mgFontStringWidth(font, string); } void mgSetFontMethod(struct memGfx *mg, unsigned int method, char *fontName, char *fontFile)