From b5eba2847864bd464ec3859c1665a0eae97a9dc1 Mon Sep 17 00:00:00 2001 From: seife Date: Wed, 26 Jan 2011 20:01:05 +0000 Subject: [PATCH] fix lcd display code for Tripledragon (shadow warnings) git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1071 e54a6e83-5905-42d5-8d5c-058d10e6a962 --- src/driver/lcdfontrenderer.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/driver/lcdfontrenderer.cpp b/src/driver/lcdfontrenderer.cpp index 471425a24..23fed49c6 100644 --- a/src/driver/lcdfontrenderer.cpp +++ b/src/driver/lcdfontrenderer.cpp @@ -36,7 +36,7 @@ #include FT_FREETYPE_H FT_Error LcdFontRenderClass::myFTC_Face_Requester(FTC_FaceID face_id, - FT_Library library, + FT_Library /*library*/, FT_Pointer request_data, FT_Face* aface) { @@ -94,13 +94,13 @@ void LcdFontRenderClass::InitFontCache() FT_Error LcdFontRenderClass::FTC_Face_Requester(FTC_FaceID face_id, FT_Face* aface) { - fontListEntry *font=(fontListEntry *)face_id; - if (!font) + fontListEntry *f = (fontListEntry *)face_id; + if (!f) return -1; - printf("[LCDFONT] FTC_Face_Requester (%s/%s)\n", font->family, font->style); + printf("[LCDFONT] FTC_Face_Requester (%s/%s)\n", f->family, f->style); int error; - if ((error=FT_New_Face(library, font->filename, 0, aface))) + if ((error = FT_New_Face(library, f->filename, 0, aface))) { printf(" failed: %i\n", error); return error; @@ -118,9 +118,9 @@ FTC_FaceID LcdFontRenderClass::getFaceID(const char *family, const char *style) return 0; } -FT_Error LcdFontRenderClass::getGlyphBitmap(FTC_ImageType font, FT_ULong glyph_index, FTC_SBit *sbit) +FT_Error LcdFontRenderClass::getGlyphBitmap(FTC_ImageType f, FT_ULong glyph_index, FTC_SBit *sbit) { - return FTC_SBitCache_Lookup(sbitsCache, font, glyph_index, sbit, NULL); + return FTC_SBitCache_Lookup(sbitsCache, f, glyph_index, sbit, NULL); } const char * LcdFontRenderClass::AddFont(const char * const filename)