From 845e52b676443cbaccf0e735e935a63f62a138c8 Mon Sep 17 00:00:00 2001 From: Alexander Smorkalov Date: Thu, 22 Nov 2012 12:39:06 +0400 Subject: [PATCH] OpenCV Manager headers refactoring. All constants moved to android independent header file. --- android/service/engine/jni/include/EngineCommon.h | 6 ++++++ android/service/engine/jni/include/IOpenCVEngine.h | 6 +----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/android/service/engine/jni/include/EngineCommon.h b/android/service/engine/jni/include/EngineCommon.h index 67a94e2..8aa99f8 100644 --- a/android/service/engine/jni/include/EngineCommon.h +++ b/android/service/engine/jni/include/EngineCommon.h @@ -5,10 +5,16 @@ #undef LOG_TAG #define LOG_TAG "OpenCVEngine" +// OpenCV Engine API version #ifndef OPEN_CV_ENGINE_VERSION #define OPEN_CV_ENGINE_VERSION 2 #endif #define LIB_OPENCV_INFO_NAME "libopencv_info.so" +// OpenCV Manager package name +#define OPENCV_ENGINE_PACKAGE "org.opencv.engine" +// Class name of OpenCV engine binder object. Is needned for connection to service +#define OPECV_ENGINE_CLASSNAME "org.opencv.engine.OpenCVEngineInterface" + #endif \ No newline at end of file diff --git a/android/service/engine/jni/include/IOpenCVEngine.h b/android/service/engine/jni/include/IOpenCVEngine.h index 87ff3b6..4dbb251 100644 --- a/android/service/engine/jni/include/IOpenCVEngine.h +++ b/android/service/engine/jni/include/IOpenCVEngine.h @@ -4,11 +4,7 @@ #include #include #include - -// OpenCV Manager package name -#define OPENCV_ENGINE_PACKAGE "org.opencv.engine" -// Class name of OpenCV engine binder object. Is needned for connection to service -#define OPECV_ENGINE_CLASSNAME "org.opencv.engine.OpenCVEngineInterface" +#include "EngineCommon.h" enum EngineMethonID { -- 2.7.4