diff options
| author | Romain Guy <romainguy@google.com> | 2010-08-20 15:43:11 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-08-20 15:43:11 -0700 |
| commit | d6f7f225689ecd33dc54699acc01cfafc781c20d (patch) | |
| tree | 31867d480a7ce5feb221c13ef390500264404f27 | |
| parent | 06c81f29a61ad3568a77f111b6be93e1f437f5bd (diff) | |
| parent | f92a0a6d4e95660b0e7ebe259323de17d821c50f (diff) | |
| download | frameworks_base-d6f7f225689ecd33dc54699acc01cfafc781c20d.zip frameworks_base-d6f7f225689ecd33dc54699acc01cfafc781c20d.tar.gz frameworks_base-d6f7f225689ecd33dc54699acc01cfafc781c20d.tar.bz2 | |
Merge "Load bitmaps in the correct format." into gingerbread
| -rw-r--r-- | graphics/java/android/renderscript/Allocation.java | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/graphics/java/android/renderscript/Allocation.java b/graphics/java/android/renderscript/Allocation.java index 17c0778..b27c7f5 100644 --- a/graphics/java/android/renderscript/Allocation.java +++ b/graphics/java/android/renderscript/Allocation.java @@ -363,6 +363,17 @@ public class Allocation extends BaseObj { static public Allocation createFromBitmapResourceBoxed(RenderScript rs, Resources res, int id, Element dstFmt, boolean genMips) throws IllegalArgumentException { + mBitmapOptions.inPreferredConfig = null; + if (dstFmt == rs.mElement_RGBA_8888) { + mBitmapOptions.inPreferredConfig = Bitmap.Config.ARGB_8888; + } else if (dstFmt == rs.mElement_RGB_888) { + mBitmapOptions.inPreferredConfig = Bitmap.Config.ARGB_8888; + } else if (dstFmt == rs.mElement_RGBA_4444) { + mBitmapOptions.inPreferredConfig = Bitmap.Config.ARGB_4444; + } else if (dstFmt == rs.mElement_RGB_565) { + mBitmapOptions.inPreferredConfig = Bitmap.Config.RGB_565; + } + Bitmap b = BitmapFactory.decodeResource(res, id, mBitmapOptions); return createFromBitmapBoxed(rs, b, dstFmt, genMips); } |