From b1a74f13b1c37f599704b5265574dc78556ce000 Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Thu, 25 Dec 2014 19:35:14 +0100 Subject: [PATCH] lcd fontrenderer: port to new API usage Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/754262bbc3d23cbaaa89b39066aacec0f08a23c3 Author: Stefan Seyfried Date: 2014-12-25 (Thu, 25 Dec 2014) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/lcddisplay/fontrenderer.cpp | 5 +++++ src/lcddisplay/fontrenderer.h | 12 +++++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/lcddisplay/fontrenderer.cpp b/src/lcddisplay/fontrenderer.cpp index 43bf2562c..4a0bfa7ec 100644 --- a/src/lcddisplay/fontrenderer.cpp +++ b/src/lcddisplay/fontrenderer.cpp @@ -308,6 +308,11 @@ void LcdFont::RenderString(int x, int y, const int width, const char * text, con pthread_mutex_unlock(&renderer->render_mutex); } +int LcdFont::getRenderWidth(const std::string &text, const bool utf8_encoded) +{ + return getRenderWidth(text.c_str(), utf8_encoded); +}; + int LcdFont::getRenderWidth(const char * text, const bool utf8_encoded) { pthread_mutex_lock(&renderer->render_mutex); diff --git a/src/lcddisplay/fontrenderer.h b/src/lcddisplay/fontrenderer.h index 805149c1c..97479f590 100644 --- a/src/lcddisplay/fontrenderer.h +++ b/src/lcddisplay/fontrenderer.h @@ -56,13 +56,15 @@ class LcdFont FT_Error getGlyphBitmap(FT_ULong glyph_index, FTC_SBit *sbit); - public: - void RenderString(int x, int y, int width, const char *text, int color, int selected=0, const bool utf8_encoded = false); + public: + void RenderString(int x, int y, int width, const char *text, int color, + int selected = 0, const bool utf8_encoded = true); - int getRenderWidth(const char *text, const bool utf8_encoded = false); + int getRenderWidth(const char *text, const bool utf8_encoded = true); + int getRenderWidth(const std::string &text, const bool utf8_encoded = true); - LcdFont(CLCDDisplay *fb, LcdFontRenderClass *render, FTC_FaceID faceid, int isize); - ~LcdFont(){} + LcdFont(CLCDDisplay *fb, LcdFontRenderClass *render, FTC_FaceID faceid, int isize); + ~LcdFont(){} };