mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-14 00:43:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'neutrino-hd-tripledragon' into neutrino-mp

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2e46d81b88
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-09-15 (Sat, 15 Sep 2012)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2012-09-15 12:14:33 +02:00
parent d973e0fa1a df317d3103
commit 9eaeb2866d
10 changed files with 81 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/driver/framebuffer_spark.cpp
View File

@@ -1509,14 +1509,42 @@ void CFrameBuffer::displayRGB(unsigned char *rgbbuff, int x_size, int y_size, in
void CFrameBuffer::blitRect(int x, int y, int width, int height, unsigned long color)
{
//printf ("[fb - blitRect]: x=%d, y=%d, width=%d, height=%d\n", x, y, width, height);
if (width == 0 || height == 0)
if (width <= 0 || height <= 0)
return;
if (x + width > (int)xRes) {
/* maybe we should just return instead of fixing this up... */
if (x < 0) {
fprintf(stderr, "[neutrino] fb::%s: x < 0 (%d)\n", __func__, x);
width += x;
if (width <= 0)
return;
x = 0;
}
if (y < 0) {
fprintf(stderr, "[neutrino] fb::%s: y < 0 (%d)\n", __func__, y);
height += y;
if (height <= 0)
return;
y = 0;
}
int right = x + width;
int bottom = y + height;
if (right > (int)xRes) {
if (x >= (int)xRes) {
fprintf(stderr, "[neutrino] fb::%s: x >= xRes (%d > %d)\n", __func__, x, xRes);
return;
}
fprintf(stderr, "[neutrino] fb::%s: x + w > xRes! (%d+%d > %d)\n", __func__, x, width, xRes);
width = xRes - x;
}
if (y + height > (int)yRes) {
if (bottom > (int)yRes) {
if (y >= (int)yRes) {
fprintf(stderr, "[neutrino] fb::%s: y >= yRes (%d > %d)\n", __func__, y, yRes);
return;
}
fprintf(stderr, "[neutrino] fb::%s: y + h > yRes! (%d+%d > %d)\n", __func__, y, height, yRes);
height = yRes - y;
}
@@ -1530,8 +1558,8 @@ void CFrameBuffer::blitRect(int x, int y, int width, int height, unsigned long c
bltData.dst_left = x;
bltData.dst_top = y;
bltData.dst_right = x + width;
bltData.dst_bottom = y + height;
bltData.dst_right = right;
bltData.dst_bottom = bottom;
bltData.dstFormat = SURF_ARGB8888;
bltData.srcFormat = SURF_ARGB8888;

8
src/driver/simple_display.cpp
View File

@@ -117,8 +117,12 @@ void* CLCD::TimeThread(void *)
CLCD::getInstance()->showTime();
/* hack, just if we missed the blit() somewhere
* this will update the framebuffer once per second */
if (getenv("SPARK_NOBLIT") == NULL)
CFrameBuffer::getInstance()->blit();
if (getenv("SPARK_NOBLIT") == NULL) {
CFrameBuffer *fb = CFrameBuffer::getInstance();
/* plugin start locks the framebuffer... */
if (!fb->Locked())
fb->blit();
}
}
return NULL;
}