aboutsummaryrefslogtreecommitdiff
path: root/backends/platform/android
diff options
context:
space:
mode:
authorJohannes Schickel2012-06-16 03:10:43 +0200
committerJohannes Schickel2012-06-16 03:28:42 +0200
commitd27d951d0b079a301ea1c6a3731bc1fc83234cff (patch)
tree89ba167aa2060ef72e2d33aa3536380852926f5d /backends/platform/android
parent58bf8090cc760cd3c02724ae4479494d3b3a2cc1 (diff)
downloadscummvm-rg350-d27d951d0b079a301ea1c6a3731bc1fc83234cff.tar.gz
scummvm-rg350-d27d951d0b079a301ea1c6a3731bc1fc83234cff.tar.bz2
scummvm-rg350-d27d951d0b079a301ea1c6a3731bc1fc83234cff.zip
BACKENDS: Make OSystem::setMouseCursor take a "const void *" buffer.
This is mainly for consistency with OSystem::copyRectToScreen.
Diffstat (limited to 'backends/platform/android')
-rw-r--r--backends/platform/android/android.h2
-rw-r--r--backends/platform/android/gfx.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/backends/platform/android/android.h b/backends/platform/android/android.h
index bf66270a7a..ce51baec3d 100644
--- a/backends/platform/android/android.h
+++ b/backends/platform/android/android.h
@@ -267,7 +267,7 @@ public:
virtual bool showMouse(bool visible);
virtual void warpMouse(int x, int y);
- virtual void setMouseCursor(const byte *buf, uint w, uint h, int hotspotX,
+ virtual void setMouseCursor(const void *buf, uint w, uint h, int hotspotX,
int hotspotY, uint32 keycolor,
bool dontScale,
const Graphics::PixelFormat *format);
diff --git a/backends/platform/android/gfx.cpp b/backends/platform/android/gfx.cpp
index a40a9e2ee9..1241667533 100644
--- a/backends/platform/android/gfx.cpp
+++ b/backends/platform/android/gfx.cpp
@@ -685,7 +685,7 @@ bool OSystem_Android::showMouse(bool visible) {
return true;
}
-void OSystem_Android::setMouseCursor(const byte *buf, uint w, uint h,
+void OSystem_Android::setMouseCursor(const void *buf, uint w, uint h,
int hotspotX, int hotspotY,
uint32 keycolor, bool dontScale,
const Graphics::PixelFormat *format) {
@@ -741,7 +741,7 @@ void OSystem_Android::setMouseCursor(const byte *buf, uint w, uint h,
byte *tmp = new byte[pitch * h];
// meh, a 16bit cursor without alpha bits... this is so silly
- if (!crossBlit(tmp, buf, pitch, w * 2, w, h,
+ if (!crossBlit(tmp, (const byte *)buf, pitch, w * 2, w, h,
_mouse_texture->getPixelFormat(),
*format)) {
LOGE("crossblit failed");