Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 5a14271a: am d6f7f225: Merge "Load bitmaps in the correct format." into gingerbread

Browse Source 
Merge commit '5a14271aacb932ba0d52978c939f74e4c685f7d6'

* commit '5a14271aacb932ba0d52978c939f74e4c685f7d6':
  Load bitmaps in the correct format.
This commit is contained in:
Romain Guy
2010-08-24 10:15:51 -07:00
committed by Android Git Automerger
parent 4077d7a75d 5a14271aac
commit 104422039b
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
graphics/java/android/renderscript/Allocation.java
View File

@@ -395,6 +395,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);
}