Java API: (per code review) renaming and moving utility classes
Testing: 1079/0/584
This commit is contained in:
@@ -3,7 +3,7 @@ package org.opencv.test;
|
|||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import org.opencv.Converters;
|
import org.opencv.utils.Converters;
|
||||||
import org.opencv.core.CvType;
|
import org.opencv.core.CvType;
|
||||||
import org.opencv.core.Mat;
|
import org.opencv.core.Mat;
|
||||||
import org.opencv.core.Point;
|
import org.opencv.core.Point;
|
||||||
|
@@ -5,7 +5,7 @@ import android.test.AndroidTestRunner;
|
|||||||
import android.test.InstrumentationTestRunner;
|
import android.test.InstrumentationTestRunner;
|
||||||
import android.util.Log;
|
import android.util.Log;
|
||||||
|
|
||||||
import org.opencv.Android;
|
import org.opencv.android.Utils;
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
@@ -50,9 +50,9 @@ public class OpenCVTestRunner extends InstrumentationTestRunner {
|
|||||||
@Override
|
@Override
|
||||||
public void onStart() {
|
public void onStart() {
|
||||||
context = getContext();
|
context = getContext();
|
||||||
LENA_PATH = Android.ExportResource(context, R.drawable.lena);
|
LENA_PATH = Utils.ExportResource(context, R.drawable.lena);
|
||||||
CHESS_PATH = Android.ExportResource(context, R.drawable.chessboard);
|
CHESS_PATH = Utils.ExportResource(context, R.drawable.chessboard);
|
||||||
LBPCASCADE_FRONTALFACE_PATH = Android.ExportResource(context, R.raw.lbpcascade_frontalface);
|
LBPCASCADE_FRONTALFACE_PATH = Utils.ExportResource(context, R.raw.lbpcascade_frontalface);
|
||||||
|
|
||||||
// List<TestCase> testCases = androidTestRunner.getTestCases();
|
// List<TestCase> testCases = androidTestRunner.getTestCases();
|
||||||
// Collections.shuffle(testCases); //shuffle the tests order
|
// Collections.shuffle(testCases); //shuffle the tests order
|
||||||
|
@@ -3,7 +3,7 @@ package org.opencv.test.core;
|
|||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import org.opencv.Converters;
|
import org.opencv.utils.Converters;
|
||||||
import org.opencv.core.Core;
|
import org.opencv.core.Core;
|
||||||
import org.opencv.core.CvException;
|
import org.opencv.core.CvException;
|
||||||
import org.opencv.core.CvType;
|
import org.opencv.core.CvType;
|
||||||
|
@@ -811,7 +811,7 @@ extern "C" {
|
|||||||
if ctype.startswith('vector'):
|
if ctype.startswith('vector'):
|
||||||
imports.add("java.util.List")
|
imports.add("java.util.List")
|
||||||
imports.add("org.opencv.core.Mat")
|
imports.add("org.opencv.core.Mat")
|
||||||
imports.add("org.opencv.Converters")
|
imports.add("org.opencv.utils.Converters")
|
||||||
ctype = ctype.replace('vector_', '')
|
ctype = ctype.replace('vector_', '')
|
||||||
j_type = ''
|
j_type = ''
|
||||||
if ctype in type_dict:
|
if ctype in type_dict:
|
||||||
|
@@ -9,12 +9,12 @@ extern "C" {
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Class: org_opencv_Android
|
* Class: org_opencv_android_Utils
|
||||||
* Method: nBitmapToMat(Bitmap b)
|
* Method: nBitmapToMat(Bitmap b)
|
||||||
* Signature: (L)J
|
* Signature: (L)J
|
||||||
*/
|
*/
|
||||||
|
|
||||||
JNIEXPORT jlong JNICALL Java_org_opencv_Android_nBitmapToMat
|
JNIEXPORT jlong JNICALL Java_org_opencv_android_Utils_nBitmapToMat
|
||||||
(JNIEnv * env, jclass cls, jobject bitmap)
|
(JNIEnv * env, jclass cls, jobject bitmap)
|
||||||
{
|
{
|
||||||
AndroidBitmapInfo info;
|
AndroidBitmapInfo info;
|
||||||
@@ -40,11 +40,11 @@ JNIEXPORT jlong JNICALL Java_org_opencv_Android_nBitmapToMat
|
|||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Class: org_opencv_Android
|
* Class: org_opencv_android_Utils
|
||||||
* Method: nBitmapToMat(long m, Bitmap b)
|
* Method: nBitmapToMat(long m, Bitmap b)
|
||||||
* Signature: (JL)Z
|
* Signature: (JL)Z
|
||||||
*/
|
*/
|
||||||
JNIEXPORT jboolean JNICALL Java_org_opencv_Android_nMatToBitmap
|
JNIEXPORT jboolean JNICALL Java_org_opencv_android_Utils_nMatToBitmap
|
||||||
(JNIEnv * env, jclass cls, jlong m, jobject bitmap)
|
(JNIEnv * env, jclass cls, jlong m, jobject bitmap)
|
||||||
{
|
{
|
||||||
AndroidBitmapInfo info;
|
AndroidBitmapInfo info;
|
@@ -1,4 +1,4 @@
|
|||||||
package org.opencv;
|
package org.opencv.android;
|
||||||
|
|
||||||
import org.opencv.core.CvException;
|
import org.opencv.core.CvException;
|
||||||
import org.opencv.core.Mat;
|
import org.opencv.core.Mat;
|
||||||
@@ -11,7 +11,7 @@ import java.io.InputStream;
|
|||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.graphics.Bitmap;
|
import android.graphics.Bitmap;
|
||||||
|
|
||||||
public class Android {
|
public class Utils {
|
||||||
|
|
||||||
public static String ExportResource(Context context, int resourceId) {
|
public static String ExportResource(Context context, int resourceId) {
|
||||||
return ExportResource(context, resourceId, "OpenCV_data");
|
return ExportResource(context, resourceId, "OpenCV_data");
|
@@ -1,4 +1,4 @@
|
|||||||
package org.opencv;
|
package org.opencv.utils;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
Reference in New Issue
Block a user