diff options
| author | mrwastl <mrwastl@users.sourceforge.net> | 2013-03-17 10:09:34 +0100 |
|---|---|---|
| committer | mrwastl <mrwastl@users.sourceforge.net> | 2013-03-17 10:09:34 +0100 |
| commit | fde257735d153922d90a7378d4d577d5001772d0 (patch) | |
| tree | 412c430c5912c8b45ebbe67134eb8b4f47e31fa2 /glcdgraphics/font.c | |
| parent | 1917182efa2d47eb107d97041abea2385ffd33ee (diff) | |
| parent | 281feef328f8e3772f7a0dde0a90c3a5260c334d (diff) | |
| download | graphlcd-base-fde257735d153922d90a7378d4d577d5001772d0.tar.gz graphlcd-base-fde257735d153922d90a7378d4d577d5001772d0.tar.bz2 | |
Merge branch 'touchcol' of ssh://projects.vdr-developer.org/graphlcd-base into touchcol
Diffstat (limited to 'glcdgraphics/font.c')
| -rw-r--r-- | glcdgraphics/font.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/glcdgraphics/font.c b/glcdgraphics/font.c index 24a44a0..7e82cee 100644 --- a/glcdgraphics/font.c +++ b/glcdgraphics/font.c @@ -29,6 +29,8 @@ #include <ft2build.h> #include FT_FREETYPE_H #include <iconv.h> +#else +#include <string.h> #endif namespace GLCD @@ -168,7 +170,7 @@ bool cFont::LoadFNT(const std::string & fileName, const std::string & encoding) character = chdr[0] | (chdr[1] << 8); charWidth = chdr[2] | (chdr[3] << 8); fread(buffer, fontHeight * ((charWidth + 7) / 8), 1, fontFile); -#ifdef DEBUG +#ifdef HAVE_DEBUG printf ("fontHeight %0d - charWidth %0d - character %0d - bytes %0d\n", fontHeight, charWidth, character,fontHeight * ((charWidth + 7) / 8)); #endif |