merge neutrino-apollo

This commit is contained in:
[CST] Bas
2013-01-18 14:21:41 +08:00
committed by [CST] Focus
parent 5d7406831a
commit e7833b099f
2 changed files with 262 additions and 266 deletions

View File

@@ -118,6 +118,9 @@ class CFrameBuffer
int cache_size;
void * int_convertRGB2FB(unsigned char *rgbbuff, unsigned long x, unsigned long y, int transp, bool alpha);
int m_transparent_default, m_transparent;
// Unlocked versions (no mutex)
void paintHLineRelInternal(int x, int dx, int y, const fb_pixel_t col);
void paintVLineRelInternal(int x, int y, int dy, const fb_pixel_t col);
public:
fb_pixel_t realcolor[256];
@@ -176,7 +179,6 @@ class CFrameBuffer
inline void paintHLine(int xa, int xb, int y, const fb_pixel_t col) { paintHLineRel(xa, xb - xa, y, col); }
void paintHLineRel(int x, int dx, int y, const fb_pixel_t col);
void setIconBasePath(const std::string & iconPath);
void getIconSize(const char * const filename, int* width, int *height);