From 57b35572cc2780b83d1dc239b24fae51c9fbd561 Mon Sep 17 00:00:00 2001 From: Tim Murray Date: Wed, 17 Oct 2012 15:51:48 -0700 Subject: Remove copyBitmap from ImageProcessing. Change-Id: Ib9079fab3b3d3da429f32c4c6688e6c437eb8795 --- .../src/com/android/rs/image/ImageProcessingActivity.java | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'tests/RenderScriptTests/ImageProcessing') diff --git a/tests/RenderScriptTests/ImageProcessing/src/com/android/rs/image/ImageProcessingActivity.java b/tests/RenderScriptTests/ImageProcessing/src/com/android/rs/image/ImageProcessingActivity.java index db0ef787a96e..445751e13cb5 100644 --- a/tests/RenderScriptTests/ImageProcessing/src/com/android/rs/image/ImageProcessingActivity.java +++ b/tests/RenderScriptTests/ImageProcessing/src/com/android/rs/image/ImageProcessingActivity.java @@ -296,7 +296,8 @@ public class ImageProcessingActivity extends Activity mBitmapIn = loadBitmap(R.drawable.img1600x1067); mBitmapIn2 = loadBitmap(R.drawable.img1600x1067b); - mBitmapOut = loadBitmap(R.drawable.img1600x1067); + mBitmapOut = Bitmap.createBitmap(mBitmapIn.getWidth(), mBitmapIn.getHeight(), + mBitmapIn.getConfig()); mSurfaceView = (SurfaceView) findViewById(R.id.surface); @@ -337,15 +338,7 @@ public class ImageProcessingActivity extends Activity private Bitmap loadBitmap(int resource) { final BitmapFactory.Options options = new BitmapFactory.Options(); options.inPreferredConfig = Bitmap.Config.ARGB_8888; - return copyBitmap(BitmapFactory.decodeResource(getResources(), resource, options)); - } - - private static Bitmap copyBitmap(Bitmap source) { - Bitmap b = Bitmap.createBitmap(source.getWidth(), source.getHeight(), source.getConfig()); - Canvas c = new Canvas(b); - c.drawBitmap(source, 0, 0, null); - source.recycle(); - return b; + return BitmapFactory.decodeResource(getResources(), resource, options); } // button hook -- cgit v1.2.3-59-g8ed1b