fixing stability of testBitmapToMat()

diff --git a/modules/java/android_test/src/org/opencv/test/android/UtilsTest.java b/modules/java/android_test/src/org/opencv/test/android/UtilsTest.java
index 8c9b2b7..8977dca 100644 (file)
--- a/modules/java/android_test/src/org/opencv/test/android/UtilsTest.java
+++ b/modules/java/android_test/src/org/opencv/test/android/UtilsTest.java
@@ -23,10 +23,12 @@ public class UtilsTest extends OpenCVTestCase {
         Bitmap bmp16 = BitmapFactory.decodeFile(OpenCVTestRunner.LENA_PATH, opt16);\r
         Mat m16 = new Mat();\r
         Utils.bitmapToMat(bmp16, m16);\r
+        assertTrue(m16.rows() == 512 && m16.cols() == 512 && m16.type() == CvType.CV_8UC4);\r
 \r
-        BitmapFactory.Options opt32 = new BitmapFactory.Options();\r
+        /*BitmapFactory.Options opt32 = new BitmapFactory.Options();\r
         opt32.inPreferredConfig = Bitmap.Config.ARGB_8888;\r
-        Bitmap bmp32 = BitmapFactory.decodeFile(OpenCVTestRunner.LENA_PATH, opt32);\r
+        Bitmap bmp32 = BitmapFactory.decodeFile(OpenCVTestRunner.LENA_PATH, opt32);*/\r
+        Bitmap bmp32 = bmp16.copy(Bitmap.Config.ARGB_8888, false);\r
         Mat m32 = new Mat();\r
         Utils.bitmapToMat(bmp32, m32);\r
         \r
@@ -34,6 +36,7 @@ public class UtilsTest extends OpenCVTestCase {
         \r
         double maxDiff = Core.norm(m16, m32, Core.NORM_INF);\r
         Log.d("Bmp->Mat", "bmp16->Mat vs bmp32->Mat diff = " + maxDiff);\r
+\r
         assertTrue(maxDiff <= 8 /* 8 == 2^8 / 2^5 */);\r
     }\r
 \r