From 9fecf3d4c5e4b52e47d29a9aee9a91cd55ceb1bd Mon Sep 17 00:00:00 2001 From: Michael Liebmann Date: Mon, 27 Feb 2017 00:13:33 +0100 Subject: [PATCH] fb_generic: Add "#define SCALE2RES_DEFINED" to check... ...presence of 'CFrameBuffer::scale2Res()' - Revert this patch when pu/fb-setmode branch is merged to master Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/1fea75f428d9d70b65d353e58feb31b359691182 Author: Michael Liebmann Date: 2017-02-27 (Mon, 27 Feb 2017) ------------------ This commit was generated by Migit --- src/driver/fb_generic.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/driver/fb_generic.h b/src/driver/fb_generic.h index 37c5a1572..810fcc063 100644 --- a/src/driver/fb_generic.h +++ b/src/driver/fb_generic.h @@ -278,6 +278,8 @@ class CFrameBuffer : public sigc::trackable virtual void blitBox2FB(const fb_pixel_t* boxBuf, uint32_t width, uint32_t height, uint32_t xoff, uint32_t yoff); virtual void mark(int x, int y, int dx, int dy); +/* Remove this when pu/fb-setmode branch is merged to master */ +#define SCALE2RES_DEFINED virtual int scale2Res(int size) { return size; }; virtual bool fullHdAvailable() { return false; }; virtual void setOsdResolutions();