From cb7bd9b946fef4fe216bafafd5f1683d7ed1e0be Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Sun, 22 Dec 2013 21:27:03 +0100 Subject: [PATCH] build fix for tripledragon after last merge Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/c33f5e49936373a453838b8287cefab56847409f Author: Stefan Seyfried Date: 2013-12-22 (Sun, 22 Dec 2013) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/driver/framebuffer_ng.h | 2 ++ src/driver/lcdd.cpp | 3 +++ 2 files changed, 5 insertions(+) diff --git a/src/driver/framebuffer_ng.h b/src/driver/framebuffer_ng.h index 194c25345..11949a197 100644 --- a/src/driver/framebuffer_ng.h +++ b/src/driver/framebuffer_ng.h @@ -281,6 +281,8 @@ class CFrameBuffer void setFbArea(int element, int _x=0, int _y=0, int _dx=0, int _dy=0); void fbNoCheck(bool noCheck) { fb_no_check = noCheck; } void doPaintMuteIcon(bool mode) { do_paint_mute_icon = mode; } + /* blit() is unnecessary, but here to avoid patches to the neutrino code */ + void blit(void) {} }; #endif diff --git a/src/driver/lcdd.cpp b/src/driver/lcdd.cpp index db3b5f3cb..3363fd64f 100644 --- a/src/driver/lcdd.cpp +++ b/src/driver/lcdd.cpp @@ -50,6 +50,8 @@ #include extern CRemoteControl * g_RemoteControl; /* neutrino.cpp */ +/* we get edvbstring.h included via from src/system/settings.h */ +#if 0 /* from edvbstring.cpp */ static bool isUTF8(const std::string &string) { @@ -81,6 +83,7 @@ static bool isUTF8(const std::string &string) } return true; // can be UTF8 (or pure ASCII, at least no non-UTF-8 8bit characters) } +#endif CLCD::CLCD() {