diff options
| author | dhewg | 2011-03-04 21:30:53 +0100 |
|---|---|---|
| committer | dhewg | 2011-03-04 21:36:48 +0100 |
| commit | f639466ab2417cb8b6052b362b7d624ea739fc8b (patch) | |
| tree | 0986e2b185c3f8a652445c69e6aa09309e6f2bd1 | |
| parent | 1b0d4724f4526e1fccec3d457be72eb911908a90 (diff) | |
| download | scummvm-rg350-f639466ab2417cb8b6052b362b7d624ea739fc8b.tar.gz scummvm-rg350-f639466ab2417cb8b6052b362b7d624ea739fc8b.tar.bz2 scummvm-rg350-f639466ab2417cb8b6052b362b7d624ea739fc8b.zip | |
ANDROID: Cleanup
| -rw-r--r-- | backends/platform/android/gfx.cpp | 4 | ||||
| -rw-r--r-- | backends/platform/android/texture.cpp | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/backends/platform/android/gfx.cpp b/backends/platform/android/gfx.cpp index e0994b1d60..6c2208fd6f 100644 --- a/backends/platform/android/gfx.cpp +++ b/backends/platform/android/gfx.cpp @@ -411,7 +411,7 @@ void OSystem_Android::grabOverlay(OverlayColor *buf, int pitch) { const Graphics::Surface *surface = _overlay_texture->surface_const(); assert(surface->bytesPerPixel == sizeof(buf[0])); - int h = surface->h; + uint h = surface->h; do { memset(buf, 0, surface->w * sizeof(buf[0])); @@ -475,7 +475,7 @@ void OSystem_Android::setMouseCursor(const byte *buf, uint w, uint h, // Update palette alpha based on keycolor byte *palette = _mouse_texture->palette(); - int i = 256; + uint i = 256; do { palette[3] = 0xff; diff --git a/backends/platform/android/texture.cpp b/backends/platform/android/texture.cpp index fb9f3bb913..7d87c144c9 100644 --- a/backends/platform/android/texture.cpp +++ b/backends/platform/android/texture.cpp @@ -175,9 +175,6 @@ void GLESTexture::updateBuffer(GLuint x, GLuint y, GLuint w, GLuint h, } else { // GLES removed the ability to specify pitch, so we // have to do this ourselves. - if (h == 0) - return; - #if TEXSUBIMAGE_IS_EXPENSIVE byte *tmp = new byte[w * h * bytesPerPixel()]; assert(tmp); |