diff options
| author | Matthew Hoops | 2011-12-12 15:25:28 -0500 |
|---|---|---|
| committer | Matthew Hoops | 2011-12-12 15:25:28 -0500 |
| commit | 00279659b22cbd5db739d5351e83a9fc2a2ae408 (patch) | |
| tree | 497f06f46820043cbdf1725652b8f0073223e24a /backends/platform/android/texture.cpp | |
| parent | d932df79bed5aac97e17c0920a5e75cb5ce733ee (diff) | |
| parent | d1628feb761acc9f4607f64de3eb620fea53bcc9 (diff) | |
| download | scummvm-rg350-00279659b22cbd5db739d5351e83a9fc2a2ae408.tar.gz scummvm-rg350-00279659b22cbd5db739d5351e83a9fc2a2ae408.tar.bz2 scummvm-rg350-00279659b22cbd5db739d5351e83a9fc2a2ae408.zip | |
Merge remote branch 'upstream/master' into pegasus
Conflicts:
video/qt_decoder.cpp
Diffstat (limited to 'backends/platform/android/texture.cpp')
| -rw-r--r-- | backends/platform/android/texture.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/backends/platform/android/texture.cpp b/backends/platform/android/texture.cpp index 53b4d1cc59..e211e5941f 100644 --- a/backends/platform/android/texture.cpp +++ b/backends/platform/android/texture.cpp @@ -287,7 +287,7 @@ void GLESTexture::fillBuffer(uint32 color) { ((color & 0xff) == ((color >> 8) & 0xff))) memset(_pixels, color & 0xff, _surface.pitch * _surface.h); else - Common::set_to(_pixels, _pixels + _surface.pitch * _surface.h, + Common::fill(_pixels, _pixels + _surface.pitch * _surface.h, (uint16)color); setDirty(); |