commit a6e385cf20a3dd2dc01aca09520845c58187387f
author Marco Nelissen <marcone@google.com> Thu Oct 29 14:47:10 2009 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Oct 29 14:47:10 2009 -0700
tree 4ec77476776c8441b251db76ea09610a03fef512
parent 53359736ecaa77eaa51bde3b46ed314eeb6f8029
parent 923f2cf0dc15ac2bafa8013b31a722b85a64176b

am 923f2cf0: am a89a059e: am 04104665: Merge change I911458a0 into eclair

Merge commit '923f2cf0dc15ac2bafa8013b31a722b85a64176b'

* commit '923f2cf0dc15ac2bafa8013b31a722b85a64176b':
  Fix x offset for boxed textures

libs/rs/rsAllocation.cpp

diff --git a/libs/rs/rsAllocation.cpp b/libs/rs/rsAllocation.cpp
index 5e0959a..6770611 100644
--- a/libs/rs/rsAllocation.cpp
+++ b/libs/rs/rsAllocation.cpp
@@ -429,7 +429,7 @@
     const uint8_t * src = static_cast<const uint8_t *>(data);
     for (uint32_t y = 0; y < h; y++) {
         uint8_t * ydst = &tmp[(y + ((h2 - h) >> 1)) * w2 * bpp];
-        memcpy(&ydst[(w2 - w) >> 1], src, w * bpp);
+        memcpy(&ydst[((w2 - w) >> 1) * bpp], src, w * bpp);
         src += w * bpp;
     }