From 8fd5853c1c07c2fd3954b3c5e64702d70af31144 Mon Sep 17 00:00:00 2001 From: Jason Sams Date: Wed, 5 Sep 2012 15:30:18 -0700 Subject: Document ColorMatrix intrinsic and add helpers Increase size of test image. Add helpers for greyscale and yuv<>rgb conversions Change-Id: I6cdd06ae23623b47f5034585ed5d385ff11348ac --- .../ImageProcessing/res/drawable-nodpi/city.png | Bin 611708 -> 0 bytes .../res/drawable-nodpi/img1600x1067.jpg | Bin 0 -> 1062402 bytes .../ImageProcessing/res/drawable-nodpi/img640x427.jpg | Bin 0 -> 199029 bytes .../com/android/rs/image/ImageProcessingActivity.java | 4 ++-- 4 files changed, 2 insertions(+), 2 deletions(-) delete mode 100644 tests/RenderScriptTests/ImageProcessing/res/drawable-nodpi/city.png create mode 100644 tests/RenderScriptTests/ImageProcessing/res/drawable-nodpi/img1600x1067.jpg create mode 100644 tests/RenderScriptTests/ImageProcessing/res/drawable-nodpi/img640x427.jpg (limited to 'tests/RenderScriptTests') diff --git a/tests/RenderScriptTests/ImageProcessing/res/drawable-nodpi/city.png b/tests/RenderScriptTests/ImageProcessing/res/drawable-nodpi/city.png deleted file mode 100644 index 856eeff59b9d..000000000000 Binary files a/tests/RenderScriptTests/ImageProcessing/res/drawable-nodpi/city.png and /dev/null differ diff --git a/tests/RenderScriptTests/ImageProcessing/res/drawable-nodpi/img1600x1067.jpg b/tests/RenderScriptTests/ImageProcessing/res/drawable-nodpi/img1600x1067.jpg new file mode 100644 index 000000000000..05d3ee2063ad Binary files /dev/null and b/tests/RenderScriptTests/ImageProcessing/res/drawable-nodpi/img1600x1067.jpg differ diff --git a/tests/RenderScriptTests/ImageProcessing/res/drawable-nodpi/img640x427.jpg b/tests/RenderScriptTests/ImageProcessing/res/drawable-nodpi/img640x427.jpg new file mode 100644 index 000000000000..5bce3926ca6f Binary files /dev/null and b/tests/RenderScriptTests/ImageProcessing/res/drawable-nodpi/img640x427.jpg differ 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 001dea8e18ac..2e7c67138c53 100644 --- a/tests/RenderScriptTests/ImageProcessing/src/com/android/rs/image/ImageProcessingActivity.java +++ b/tests/RenderScriptTests/ImageProcessing/src/com/android/rs/image/ImageProcessingActivity.java @@ -243,8 +243,8 @@ public class ImageProcessingActivity extends Activity super.onCreate(savedInstanceState); setContentView(R.layout.main); - mBitmapIn = loadBitmap(R.drawable.city); - mBitmapOut = loadBitmap(R.drawable.city); + mBitmapIn = loadBitmap(R.drawable.img1600x1067); + mBitmapOut = loadBitmap(R.drawable.img1600x1067); mSurfaceView = (SurfaceView) findViewById(R.id.surface); -- cgit v1.2.3-59-g8ed1b