git.ucc.asn.au
/
tpg
/
acess2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Usermode - More hackery to get glib compiling
[tpg/acess2.git]
/
KernelLand
/
Kernel
/
drvutil_video.c
diff --git
a/KernelLand/Kernel/drvutil_video.c
b/KernelLand/Kernel/drvutil_video.c
index
c8b044e
..
2bffb1a
100644
(file)
--- a/
KernelLand/Kernel/drvutil_video.c
+++ b/
KernelLand/Kernel/drvutil_video.c
@@
-480,7
+480,8
@@
void DrvUtil_Video_RenderCursor(tDrvUtil_Video_BufInfo *Buf)
{
case 15:
case 16:
- Log_Warning("DrvUtil", "TODO: Support 15/16 bpp modes in cursor draw");
+ //Log_Warning("DrvUtil", "TODO: Support 15/16 bpp modes in cursor draw");
+ //Proc_PrintBacktrace();
break;
case 24:
LOG("24-bit render");
@@
-535,8
+536,6
@@
void DrvUtil_Video_RenderCursor(tDrvUtil_Video_BufInfo *Buf)
void DrvUtil_Video_RemoveCursor(tDrvUtil_Video_BufInfo *Buf)
{
int bytes_per_px = (Buf->Depth + 7) / 8;
- int y, save_pitch;
- Uint8 *dest, *src;
// Just a little sanity
if( !Buf->CursorBitmap || Buf->CursorX == -1 ) return ;
@@
-545,16
+544,21
@@
void DrvUtil_Video_RemoveCursor(tDrvUtil_Video_BufInfo *Buf)
// Debug("DrvUtil_Video_RemoveCursor: (Buf=%p) dest_x=%i, dest_y=%i", Buf, Buf->CursorDestX, Buf->CursorDestY);
// Set up
- save_pitch = Buf->CursorBitmap->W * bytes_per_px;
- dest = (Uint8*)Buf->Framebuffer + Buf->CursorDestY * Buf->Pitch + Buf->CursorDestX*bytes_per_px;
- src = Buf->CursorSaveBuf;
-
+ size_t save_pitch = Buf->CursorBitmap->W * bytes_per_px;
+ Uint8 *dst = (Uint8*)Buf->Framebuffer + Buf->CursorDestY * Buf->Pitch + Buf->CursorDestX*bytes_per_px;
+ const Uint8 *src = Buf->CursorSaveBuf;
+
+ ASSERT(Buf->Framebuffer);
+ ASSERT(src);
+ ASSERT(CheckMem(dst, Buf->CursorRenderH*Buf->Pitch));
+ ASSERT(CheckMem(src, Buf->CursorRenderH*save_pitch));
+
// Copy each line back
- for( y = 0; y < Buf->CursorRenderH; y ++ )
+ for(
int
y = 0; y < Buf->CursorRenderH; y ++ )
{
- memcpy( d
e
st, src, Buf->CursorRenderW * bytes_per_px );
+ memcpy( dst, src, Buf->CursorRenderW * bytes_per_px );
src += save_pitch;
- d
e
st += Buf->Pitch;
+ dst += Buf->Pitch;
}
// Set the cursor as removed
UCC
git Repository :: git.ucc.asn.au