Merge branch 'master' into pu/fb-setmode

This commit is contained in:
M. Liebmann
2017-02-21 06:39:24 +01:00
18 changed files with 74 additions and 336 deletions

View File

@@ -119,7 +119,7 @@ class CFrameBuffer : public sigc::trackable
fb_pixel_t backgroundColor;
std::string backgroundFilename;
bool useBackgroundPaint;
unsigned int xRes, yRes, stride, bpp;
unsigned int xRes, yRes, stride, swidth, bpp;
t_fb_var_screeninfo screeninfo;
fb_cmap cmap;
__u16 red[256], green[256], blue[256], trans[256];