diff --git a/jni/Android.mk b/jni/Android.mk index 2e2fa75..390adbc 100644 --- a/jni/Android.mk +++ b/jni/Android.mk @@ -4,7 +4,7 @@ include $(CLEAR_VARS) OPENCV_CAMERA_MODULES:=off OPENCV_LIB_TYPE:=STATIC -include C:\Users\miguel.astor\Documents\OpenCV-2.4.8-android-sdk\sdk\native\jni\OpenCV.mk +include /home/miky/Escritorio/OpenCV-2.4.7-android-sdk/sdk/native/jni/OpenCV.mk LOCAL_MODULE := cvproc LOCAL_SRC_FILES := cv_proc.cpp marker.cpp diff --git a/jni/cv_proc.cpp b/jni/cv_proc.cpp index 8afebd8..207c1fe 100644 --- a/jni/cv_proc.cpp +++ b/jni/cv_proc.cpp @@ -23,15 +23,10 @@ extern "C"{ #ifdef CAN_LOG - #define log(TAG, MSG) (__android_log_write(ANDROID_LOG_DEBUG, TAG, MSG)) - const char * TAG = "CVPROC_NATIVE"; - #else - #define log(TAG, MSG) (1 + 1) - #endif JNIEXPORT void JNICALL Java_ve_ucv_ciens_ccg_nxtar_MainActivity_getMarkerCodesAndLocations( diff --git a/project.properties b/project.properties index 57ada93..13bb423 100644 --- a/project.properties +++ b/project.properties @@ -9,4 +9,4 @@ # Project target. target=android-19 -android.library.reference.1=../../../../../Documents/OpenCV-2.4.8-android-sdk/sdk/java +android.library.reference.1=../../../../../Escritorio/OpenCV-2.4.7-android-sdk/sdk/java diff --git a/src/ve/ucv/ciens/ccg/nxtar/MainActivity.java b/src/ve/ucv/ciens/ccg/nxtar/MainActivity.java index dfccb39..b75a6f5 100644 --- a/src/ve/ucv/ciens/ccg/nxtar/MainActivity.java +++ b/src/ve/ucv/ciens/ccg/nxtar/MainActivity.java @@ -51,16 +51,21 @@ public class MainActivity extends AndroidApplication implements Toaster, Multica private MulticastLock multicastLock; private Handler uiHandler; private Context uiContext; - private boolean ocvOn; + private static boolean ocvOn = false; private BaseLoaderCallback loaderCallback; private final ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); - /*static{ - if (!OpenCVLoader.initDebug()){ - Gdx.app.exit(); - } - System.loadLibrary("cvproc"); - }*/ + static{ + if(!OpenCVLoader.initDebug()){ + Gdx.app.exit(); + } + try{ + System.loadLibrary("cvproc"); + ocvOn = true; + }catch(UnsatisfiedLinkError u){ + Gdx.app.exit(); + } + } public native void getMarkerCodesAndLocations(long inMat, long outMat, int[] codes); @@ -68,7 +73,7 @@ public class MainActivity extends AndroidApplication implements Toaster, Multica public void onCreate(Bundle savedInstanceState){ super.onCreate(savedInstanceState); - ocvOn = false; + //ocvOn = false; if(!Ouya.runningOnOuya){ setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT); @@ -93,6 +98,7 @@ public class MainActivity extends AndroidApplication implements Toaster, Multica case LoaderCallbackInterface.SUCCESS: System.loadLibrary("cvproc"); ocvOn = true; + Toast.makeText(uiContext, R.string.ocv_success, Toast.LENGTH_LONG).show(); break; default: Toast.makeText(uiContext, R.string.ocv_failed, Toast.LENGTH_LONG).show(); @@ -102,7 +108,7 @@ public class MainActivity extends AndroidApplication implements Toaster, Multica } }; - OpenCVLoader.initAsync(OpenCVLoader.OPENCV_VERSION_2_4_7, this, loaderCallback); + //OpenCVLoader.initAsync(OpenCVLoader.OPENCV_VERSION_2_4_7, this, loaderCallback); initialize(new NxtARCore(this), cfg); }