diff options
| author | Marco Nelissen <marcone@google.com> | 2009-10-29 14:02:38 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-10-29 14:02:38 -0700 |
| commit | 923f2cf0dc15ac2bafa8013b31a722b85a64176b (patch) | |
| tree | 144cbf7c1d97bc2778f06d2ab20b6350279b9918 | |
| parent | f545e798ebbe7e081c8e87ad32aa450388364bef (diff) | |
| parent | a89a059ea7f4cb3180feaa131eda4713974c3873 (diff) | |
| download | frameworks_base-923f2cf0dc15ac2bafa8013b31a722b85a64176b.zip frameworks_base-923f2cf0dc15ac2bafa8013b31a722b85a64176b.tar.gz frameworks_base-923f2cf0dc15ac2bafa8013b31a722b85a64176b.tar.bz2 | |
am a89a059e: am 04104665: Merge change I911458a0 into eclair
Merge commit 'a89a059ea7f4cb3180feaa131eda4713974c3873' into eclair-mr2-plus-aosp
* commit 'a89a059ea7f4cb3180feaa131eda4713974c3873':
Fix x offset for boxed textures
| -rw-r--r-- | libs/rs/rsAllocation.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/rs/rsAllocation.cpp b/libs/rs/rsAllocation.cpp index 8ac9c26..b7d1297 100644 --- a/libs/rs/rsAllocation.cpp +++ b/libs/rs/rsAllocation.cpp @@ -405,7 +405,7 @@ RsAllocation rsi_AllocationCreateFromBitmapBoxed(Context *rsc, uint32_t w, uint3 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; } |