org.opencv.utils renamed to org.opencv.android

diff --git a/modules/java/src/cpp/utils.cpp b/modules/java/src/cpp/android.cpp
similarity index 86%
rename from modules/java/src/cpp/utils.cpp
rename to modules/java/src/cpp/android.cpp
index 5f069a7..1c7272c 100644 (file)
--- a/modules/java/src/cpp/utils.cpp
+++ b/modules/java/src/cpp/android.cpp
@@ -9,12 +9,12 @@ extern "C" {
 #endif\r
 \r
 /*\r
- * Class:     org_opencv_utils\r
+ * Class:     org_opencv_android\r
  * Method:    nBitmapToMat(Bitmap b)\r
  * Signature: (L)J\r
  */\r
 \r
-JNIEXPORT jlong JNICALL Java_org_opencv_utils_nBitmapToMat\r
+JNIEXPORT jlong JNICALL Java_org_opencv_android_nBitmapToMat\r
   (JNIEnv * env, jclass cls, jobject bitmap)\r
 {\r
     AndroidBitmapInfo  info;\r
@@ -40,11 +40,11 @@ JNIEXPORT jlong JNICALL Java_org_opencv_utils_nBitmapToMat
 }\r
 \r
 /*\r
- * Class:     org_opencv_utils\r
+ * Class:     org_opencv_android\r
  * Method:    nBitmapToMat(long m, Bitmap b)\r
  * Signature: (JL)Z\r
  */\r
-JNIEXPORT jboolean JNICALL Java_org_opencv_utils_nMatToBitmap\r
+JNIEXPORT jboolean JNICALL Java_org_opencv_android_nMatToBitmap\r
   (JNIEnv * env, jclass cls, jlong m, jobject bitmap)\r
 {\r
     AndroidBitmapInfo  info;\r

diff --git a/modules/java/src/java/utils.java b/modules/java/src/java/android.java
similarity index 90%
rename from modules/java/src/java/utils.java
rename to modules/java/src/java/android.java
index 8f3d397..4d5c560 100644 (file)
--- a/modules/java/src/java/utils.java
+++ b/modules/java/src/java/android.java
@@ -2,7 +2,7 @@ package org.opencv;
 \r
 import android.graphics.Bitmap;\r
 \r
-public class utils {\r
+public class android {\r
 \r
        public static Mat BitmapToMat(Bitmap b) {\r
                return new Mat( nBitmapToMat(b) );\r

diff --git a/samples/android/1-java/src/org/opencv/samples/s1/Sample1View.java b/samples/android/1-java/src/org/opencv/samples/s1/Sample1View.java
index daa5583..6656af2 100644 (file)
--- a/samples/android/1-java/src/org/opencv/samples/s1/Sample1View.java
+++ b/samples/android/1-java/src/org/opencv/samples/s1/Sample1View.java
@@ -16,7 +16,7 @@ import org.opencv.Scalar;
 import org.opencv.Size;
 import org.opencv.core;
 import org.opencv.imgproc;
-import org.opencv.utils;
+import org.opencv.android;
 
 import java.util.List;
 
@@ -163,7 +163,7 @@ class Sample1View extends SurfaceView implements SurfaceHolder.Callback, Runnabl
             }
             
             Bitmap bmp = Bitmap.createBitmap(mFrameWidth, mFrameHeight, Bitmap.Config.ARGB_8888);
-            utils.MatToBitmap(mRgba, bmp);
+            android.MatToBitmap(mRgba, bmp);
             
             Canvas canvas = mHolder.lockCanvas();
             canvas.drawBitmap(bmp, (canvas.getWidth()-mFrameWidth)/2, (canvas.getHeight()-mFrameHeight)/2, null);

diff --git a/samples/android/4-mixed/src/org/opencv/samples/s4/Sample4View.java b/samples/android/4-mixed/src/org/opencv/samples/s4/Sample4View.java
index ca5010b..e64d0ef 100644 (file)
--- a/samples/android/4-mixed/src/org/opencv/samples/s4/Sample4View.java
+++ b/samples/android/4-mixed/src/org/opencv/samples/s4/Sample4View.java
@@ -14,7 +14,7 @@ import org.opencv.Mat;
 import org.opencv.Size;
 import org.opencv.core;
 import org.opencv.imgproc;
-import org.opencv.utils;
+import org.opencv.android;
 
 import java.util.List;
 
@@ -164,7 +164,7 @@ class Sample4View extends SurfaceView implements SurfaceHolder.Callback, Runnabl
             }
             
             Bitmap bmp = Bitmap.createBitmap(mFrameWidth, mFrameHeight, Bitmap.Config.ARGB_8888);
-            utils.MatToBitmap(mRgba, bmp);
+            android.MatToBitmap(mRgba, bmp);
             
             Canvas canvas = mHolder.lockCanvas();
             canvas.drawBitmap(bmp, (canvas.getWidth()-mFrameWidth)/2, (canvas.getHeight()-mFrameHeight)/2, null);