mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-31 09:21:09 +02:00
Merge branch 'master' into pu/mp
Origin commit data
------------------
Commit: 1763bb9e64
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-08-08 (Tue, 08 Aug 2017)
This commit is contained in:
@@ -238,6 +238,7 @@ class CFrameBuffer : public sigc::trackable
|
||||
const int h = 0, const unsigned char offset = 1, bool paint = true, bool paintBg = false, const fb_pixel_t colBg = 0);
|
||||
bool paintIcon8(const std::string & filename, const int x, const int y, const unsigned char offset = 0);
|
||||
void loadPal (const std::string & filename, const unsigned char offset = 0, const unsigned char endidx = 255);
|
||||
void clearIconCache();
|
||||
|
||||
bool loadPicture2Mem (const std::string & filename, fb_pixel_t * const memp);
|
||||
bool loadPicture2FrameBuffer(const std::string & filename);
|
||||
|
Reference in New Issue
Block a user