From 00db5a69a20cb863bfe2d96561a94d9feef18b75 Mon Sep 17 00:00:00 2001 From: Andrey Kamaev Date: Mon, 20 Feb 2012 11:50:43 +0000 Subject: [PATCH] More granular build of Java API: it is now possible to build Java wrappers only for the subset of OpenCV modules --- cmake/OpenCVModule.cmake | 2 + modules/java/CMakeLists.txt | 230 +++++++++++---------- modules/java/src/cpp/VideoCapture.cpp | 8 +- modules/java/src/cpp/converters.cpp | 7 +- modules/java/src/cpp/converters.h | 7 +- modules/java/src/cpp/features2d_manual.hpp | 10 + 6 files changed, 149 insertions(+), 115 deletions(-) diff --git a/cmake/OpenCVModule.cmake b/cmake/OpenCVModule.cmake index 66e917a19..324014408 100644 --- a/cmake/OpenCVModule.cmake +++ b/cmake/OpenCVModule.cmake @@ -98,6 +98,8 @@ macro(ocv_add_module _name) endif() set(OPENCV_MODULE_${the_module}_DESCRIPTION "${the_description}" CACHE INTERNAL "Brief description of ${the_module} module") set(OPENCV_MODULE_${the_module}_LOCATION "${CMAKE_CURRENT_SOURCE_DIR}" CACHE INTERNAL "Location of ${the_module} module sources") + unset(OPENCV_MODULE_${the_module}_REQ_DEPS CACHE) + unset(OPENCV_MODULE_${the_module}_OPT_DEPS CACHE) #create option to enable/disable this module option(BUILD_${the_module} "Include ${the_module} module into the OpenCV build" ON) diff --git a/modules/java/CMakeLists.txt b/modules/java/CMakeLists.txt index 193779966..0c46c3617 100644 --- a/modules/java/CMakeLists.txt +++ b/modules/java/CMakeLists.txt @@ -5,66 +5,72 @@ if(NOT ANDROID OR NOT PYTHON_EXECUTABLE) ocv_module_disable(java) endif() -set(the_description "The java bindings") -ocv_add_module(java BINDINGS opencv_objdetect opencv_features2d opencv_imgproc opencv_video opencv_highgui opencv_ml opencv_core opencv_calib3d) +set(OPENCV_MODULES_EXPORTED_TO_JAVA opencv_objdetect opencv_features2d opencv_video opencv_highgui opencv_ml opencv_calib3d CACHE STRING "List of modules exported to Java API") +mark_as_advanced(OPENCV_MODULES_EXPORTED_TO_JAVA) -string(REPLACE "opencv_" "" OPENCV_JAVA_MODULES "${OPENCV_MODULE_${the_module}_REQ_DEPS}") +set(the_description "The java bindings") +ocv_add_module(java BINDINGS opencv_core opencv_imgproc OPTIONAL ${OPENCV_MODULES_EXPORTED_TO_JAVA}) + +string(REPLACE "opencv_" "" OPENCV_JAVA_MODULES "${OPENCV_MODULE_${the_module}_REQ_DEPS};${OPENCV_MODULE_${the_module}_OPT_DEPS}") +foreach(module ${OPENCV_JAVA_MODULES}) + if(NOT HAVE_opencv_${module}) + list(REMOVE_ITEM OPENCV_JAVA_MODULES ${module}) + endif() +endforeach() set(target ${the_module}) include_directories("${CMAKE_CURRENT_BINARY_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/src/cpp") -SET(GEN_JAVA "${CMAKE_CURRENT_SOURCE_DIR}/gen_java.py") -SET(HDR_PARSER "${CMAKE_CURRENT_SOURCE_DIR}/../python/src2/hdr_parser.py") -SET(GEN_JAVADOC "${CMAKE_CURRENT_SOURCE_DIR}/gen_javadoc.py") -SET(RST_PARSER "${CMAKE_CURRENT_SOURCE_DIR}/rst_parser.py") -SET(CHECK_TEST_COVERAGE "${CMAKE_CURRENT_SOURCE_DIR}/check-tests.py") +set(GEN_JAVA "${CMAKE_CURRENT_SOURCE_DIR}/gen_java.py") +set(HDR_PARSER "${CMAKE_CURRENT_SOURCE_DIR}/../python/src2/hdr_parser.py") +set(GEN_JAVADOC "${CMAKE_CURRENT_SOURCE_DIR}/gen_javadoc.py") +set(RST_PARSER "${CMAKE_CURRENT_SOURCE_DIR}/rst_parser.py") +set(CHECK_TEST_COVERAGE "${CMAKE_CURRENT_SOURCE_DIR}/check-tests.py") # setup raw java and cpp files generation (without javadoc and at temporary location) foreach(module ${OPENCV_JAVA_MODULES}) - # get list of module headers - IF(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/config/${module}.filelist") - FILE(STRINGS "${CMAKE_CURRENT_SOURCE_DIR}/config/${module}.filelist" headers_to_parse) - SET (module_cheaders "") - SET (module_cppheaders "") - foreach(header ${headers_to_parse}) - list(APPEND module_cppheaders "${CMAKE_CURRENT_SOURCE_DIR}/../${module}/${header}") - endforeach() - ELSE() - FILE(GLOB module_cheaders "${CMAKE_CURRENT_SOURCE_DIR}/../${module}/include/opencv2/${module}/*.h") - FILE(GLOB module_cppheaders "${CMAKE_CURRENT_SOURCE_DIR}/../${module}/include/opencv2/${module}/*.hpp") - list(SORT module_cheaders) - list(SORT module_cppheaders) - ENDIF() - - # add dependencies to cmake (we should rerun cmake if any of these headers are modified) - foreach(header ${module_cheaders} ${module_cppheaders}) - get_filename_component(header_name "${header}" NAME_WE) - configure_file("${header}" "${CMAKE_BINARY_DIR}/junk/${header_name}.junk" COPYONLY) + # get list of module headers + if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/config/${module}.filelist") + file(STRINGS "${CMAKE_CURRENT_SOURCE_DIR}/config/${module}.filelist" headers_to_parse) + set(module_cheaders "") + set(module_cppheaders "") + foreach(header ${headers_to_parse}) + list(APPEND module_cppheaders "${CMAKE_CURRENT_SOURCE_DIR}/../${module}/${header}") endforeach() + else() + file(GLOB module_cheaders "${CMAKE_CURRENT_SOURCE_DIR}/../${module}/include/opencv2/${module}/*.h") + file(GLOB module_cppheaders "${CMAKE_CURRENT_SOURCE_DIR}/../${module}/include/opencv2/${module}/*.hpp") + list(SORT module_cheaders) + list(SORT module_cppheaders) + endif() - # the same about gen_java.py and hdr_parser.py - configure_file("${GEN_JAVA}" "${CMAKE_BINARY_DIR}/junk/gen_java.junk" COPYONLY) - configure_file("${HDR_PARSER}" "${CMAKE_BINARY_DIR}/junk/hdr_parser.junk" COPYONLY) + # add dependencies to cmake (we should rerun cmake if any of these headers is modified) + foreach(header ${module_cheaders} ${module_cppheaders}) + get_filename_component(header_name "${header}" NAME_WE) + configure_file("${header}" "${CMAKE_BINARY_DIR}/junk/${header_name}.junk" COPYONLY) + endforeach() + # the same about gen_java.py and hdr_parser.py + configure_file("${GEN_JAVA}" "${CMAKE_BINARY_DIR}/junk/gen_java.junk" COPYONLY) + configure_file("${HDR_PARSER}" "${CMAKE_BINARY_DIR}/junk/hdr_parser.junk" COPYONLY) - # first run (to get list of generated files) - file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/gen_java_out") - - execute_process(COMMAND ${PYTHON_EXECUTABLE} "${GEN_JAVA}" "${HDR_PARSER}" ${module} ${module_cheaders} ${module_cppheaders} + # first run (to get list of generated files) + file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/gen_java_out") + execute_process(COMMAND ${PYTHON_EXECUTABLE} "${GEN_JAVA}" "${HDR_PARSER}" ${module} ${module_cheaders} ${module_cppheaders} WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/gen_java_out" OUTPUT_QUIET ERROR_QUIET) - # create list of generated files - file(GLOB_RECURSE generated_java_sources RELATIVE "${CMAKE_CURRENT_BINARY_DIR}/gen_java_out/" "${CMAKE_CURRENT_BINARY_DIR}/gen_java_out/*.java") - file(REMOVE_RECURSE "${CMAKE_CURRENT_BINARY_DIR}/gen_java_out/") + # create list of generated files + file(GLOB_RECURSE generated_java_sources RELATIVE "${CMAKE_CURRENT_BINARY_DIR}/gen_java_out/" "${CMAKE_CURRENT_BINARY_DIR}/gen_java_out/*.java") + file(REMOVE_RECURSE "${CMAKE_CURRENT_BINARY_DIR}/gen_java_out/") - set(${module}_generated_java_sources) - foreach(f ${generated_java_sources}) - list(APPEND ${module}_generated_java_sources "${CMAKE_CURRENT_BINARY_DIR}/${f}") - endforeach() + set(${module}_generated_java_sources) + foreach(f ${generated_java_sources}) + list(APPEND ${module}_generated_java_sources "${CMAKE_CURRENT_BINARY_DIR}/${f}") + endforeach() - # second run - add_custom_command( + # second run + add_custom_command( OUTPUT ${${module}_generated_java_sources} OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${module}.cpp" COMMAND ${PYTHON_EXECUTABLE} "${GEN_JAVA}" "${HDR_PARSER}" ${module} ${module_cheaders} ${module_cppheaders} @@ -76,32 +82,39 @@ foreach(module ${OPENCV_JAVA_MODULES}) ) endforeach() -FILE(GLOB handwrittren_cpp_sources "${CMAKE_CURRENT_SOURCE_DIR}/src/cpp/*.cpp") -FILE(GLOB handwrittren_h_sources "${CMAKE_CURRENT_SOURCE_DIR}/src/cpp/*.h??") -FILE(GLOB handwrittren_java_sources "${CMAKE_CURRENT_SOURCE_DIR}/src/java/*.java") -SET (generated_cpp_sources) -SET (generated_java_sources) -SET (documented_java_files) -SET (undocumented_java_files) +file(GLOB handwrittren_cpp_sources "${CMAKE_CURRENT_SOURCE_DIR}/src/cpp/*.cpp") +file(GLOB handwrittren_h_sources "${CMAKE_CURRENT_SOURCE_DIR}/src/cpp/*.h" "${CMAKE_CURRENT_SOURCE_DIR}/src/cpp/*.hpp") +file(GLOB handwrittren_java_sources "${CMAKE_CURRENT_SOURCE_DIR}/src/java/*.java") +set(generated_cpp_sources) +set(generated_java_sources) +set(documented_java_files) +set(undocumented_java_files) + +foreach(jfile ${handwrittren_java_sources}) + string(REGEX REPLACE "^.*/([^+]+)\\+.*\\.java$" "\\1" jmodname "${jfile}") + if(DEFINED HAVE_opencv_${jmodname} AND NOT HAVE_opencv_${jmodname}) + list(REMOVE_ITEM handwrittren_java_sources "${jfile}") + endif() +endforeach() foreach(module ${OPENCV_JAVA_MODULES}) - LIST(APPEND generated_cpp_sources "${CMAKE_CURRENT_BINARY_DIR}/${module}.cpp") - LIST(APPEND generated_java_sources ${${module}_generated_java_sources}) + list(APPEND generated_cpp_sources "${CMAKE_CURRENT_BINARY_DIR}/${module}.cpp") + list(APPEND generated_java_sources ${${module}_generated_java_sources}) endforeach() # all needed includes foreach(module ${OPENCV_MODULE_${the_module}_DEPS}) - string(REPLACE "opencv_" "" module "${module}") - include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../${module}/include") + string(REPLACE "opencv_" "" module "${module}") + include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../${module}/include") endforeach() # created list of documented files targets foreach(java_file ${handwrittren_java_sources} ${generated_java_sources}) - get_filename_component(java_file_name "${java_file}" NAME_WE) - if (NOT java_file_name MATCHES ".*-jdoc$") - list(APPEND documented_java_files "${CMAKE_CURRENT_BINARY_DIR}/${java_file_name}-jdoc.java") - list(APPEND undocumented_java_files "${java_file}") - endif() + get_filename_component(java_file_name "${java_file}" NAME_WE) + if(NOT java_file_name MATCHES ".*-jdoc$") + list(APPEND documented_java_files "${CMAKE_CURRENT_BINARY_DIR}/${java_file_name}-jdoc.java") + list(APPEND undocumented_java_files "${java_file}") + endif() endforeach() # generate javadoc files @@ -117,31 +130,32 @@ add_custom_command( ) # copy generated java files to the final location -SET(JAVA_OUTPUT_DIR "src/org/opencv") +set(JAVA_OUTPUT_DIR "src/org/opencv") set(java_files) foreach(java_file ${documented_java_files}) - get_filename_component(java_file_name "${java_file}" NAME) - string(REPLACE "-jdoc.java" ".java" java_file_name "${java_file_name}") - string(REPLACE "+" "/" java_file_name "${java_file_name}") + get_filename_component(java_file_name "${java_file}" NAME) + string(REPLACE "-jdoc.java" ".java" java_file_name "${java_file_name}") + string(REPLACE "+" "/" java_file_name "${java_file_name}") - add_custom_command( + add_custom_command( OUTPUT "${CMAKE_BINARY_DIR}/${JAVA_OUTPUT_DIR}/${java_file_name}" COMMAND ${CMAKE_COMMAND} -E copy "${java_file}" "${CMAKE_BINARY_DIR}/${JAVA_OUTPUT_DIR}/${java_file_name}" DEPENDS "${java_file}" COMMENT "Generating ${JAVA_OUTPUT_DIR}/${java_file_name}" ) - list(APPEND java_files "${CMAKE_BINARY_DIR}/${JAVA_OUTPUT_DIR}/${java_file_name}") + list(APPEND java_files "${CMAKE_BINARY_DIR}/${JAVA_OUTPUT_DIR}/${java_file_name}") - if(ANDROID) - get_filename_component(install_subdir "${java_file_name}" PATH) - install(FILES "${CMAKE_BINARY_DIR}/${JAVA_OUTPUT_DIR}/${java_file_name}" DESTINATION ${JAVA_OUTPUT_DIR}/${install_subdir} COMPONENT main) - endif() + if(ANDROID) + get_filename_component(install_subdir "${java_file_name}" PATH) + install(FILES "${CMAKE_BINARY_DIR}/${JAVA_OUTPUT_DIR}/${java_file_name}" DESTINATION ${JAVA_OUTPUT_DIR}/${install_subdir} COMPONENT main) + endif() endforeach() + # custom target for java API set(api_target ${target}_api) -ADD_CUSTOM_TARGET(${api_target} DEPENDS ${java_files}) +add_custom_target(${api_target} DEPENDS ${java_files}) # add opencv_java library @@ -160,78 +174,78 @@ set_target_properties(${target} PROPERTIES install(TARGETS ${target} LIBRARY DESTINATION ${OPENCV_LIB_INSTALL_PATH} COMPONENT main) if(ANDROID) - target_link_libraries(${target} jnigraphics) + target_link_libraries(${target} jnigraphics) - # force strip library after build command - # because samples and tests will make a copy of library before install - ADD_CUSTOM_COMMAND( + # force strip library after build command + # because samples and tests will make a copy of library before install + add_custom_command( TARGET ${target} POST_BUILD COMMAND ${CMAKE_STRIP} "${LIBRARY_OUTPUT_PATH}/lib${target}.so" ) - set(lib_proj_files) - # library project blank - file(GLOB_RECURSE android_lib_project_files "${CMAKE_CURRENT_SOURCE_DIR}/android/*") - foreach(file ${android_lib_project_files}) - if(NOT file MATCHES "\\.svn") - file(RELATIVE_PATH file_rel "${CMAKE_CURRENT_SOURCE_DIR}/android/" "${file}") - add_custom_command( + set(lib_proj_files "") + # library project blank + file(GLOB_RECURSE android_lib_project_files "${CMAKE_CURRENT_SOURCE_DIR}/android/*") + foreach(file ${android_lib_project_files}) + if(NOT file MATCHES "\\.svn") + file(RELATIVE_PATH file_rel "${CMAKE_CURRENT_SOURCE_DIR}/android/" "${file}") + add_custom_command( OUTPUT "${CMAKE_BINARY_DIR}/${file_rel}" COMMAND ${CMAKE_COMMAND} -E copy "${file}" "${CMAKE_BINARY_DIR}/${file_rel}" DEPENDS "${file}" COMMENT "Generating ${file_rel}" ) - list(APPEND lib_proj_files "${CMAKE_BINARY_DIR}/${file_rel}") + list(APPEND lib_proj_files "${CMAKE_BINARY_DIR}/${file_rel}") - if(NOT file_rel MATCHES "jni/.+") - install(FILES "${CMAKE_BINARY_DIR}/${file_rel}" DESTINATION . COMPONENT main) - endif() - endif() - endforeach() + if(NOT file_rel MATCHES "jni/.+") + install(FILES "${CMAKE_BINARY_DIR}/${file_rel}" DESTINATION . COMPONENT main) + endif() + endif() + endforeach() - # library project jni sources - foreach(jni_file ${handwrittren_cpp_sources} ${handwrittren_h_sources} ${generated_cpp_sources}) - get_filename_component(jni_file_name "${jni_file}" NAME) - add_custom_command( + # library project jni sources + foreach(jni_file ${handwrittren_cpp_sources} ${handwrittren_h_sources} ${generated_cpp_sources}) + get_filename_component(jni_file_name "${jni_file}" NAME) + add_custom_command( OUTPUT "${CMAKE_BINARY_DIR}/jni/${jni_file_name}" COMMAND ${CMAKE_COMMAND} -E copy "${jni_file}" "${CMAKE_BINARY_DIR}/jni/${jni_file_name}" COMMAND ${CMAKE_COMMAND} -E touch "${CMAKE_BINARY_DIR}/jni/${jni_file_name}" DEPENDS "${jni_file}" COMMENT "Generating jni/${jni_file_name}" - ) - list(APPEND lib_proj_files "${CMAKE_BINARY_DIR}/jni/${jni_file_name}") - endforeach() + ) + list(APPEND lib_proj_files "${CMAKE_BINARY_DIR}/jni/${jni_file_name}") + endforeach() - # create Android library project in build folder - set(lib_target ${target}_android_library) - ADD_CUSTOM_TARGET(${lib_target} + # create Android library project in build folder + set(lib_target ${target}_android_library) + add_custom_target(${lib_target} COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_BINARY_DIR}/res" COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_BINARY_DIR}/gen" DEPENDS ${lib_proj_files} - ) - if (ANT_EXECUTABLE AND ANDROID_EXECUTABLE AND ANDROID_TOOLS_Pkg_Revision GREATER 13) - add_custom_command( - TARGET ${target} + ) + if(ANT_EXECUTABLE AND ANDROID_EXECUTABLE AND ANDROID_TOOLS_Pkg_Revision GREATER 13) + add_custom_command(TARGET ${target} COMMAND ${ANDROID_EXECUTABLE} update lib-project --target "${ANDROID_SDK_TARGET}" --path "${CMAKE_BINARY_DIR}" COMMAND ${ANT_EXECUTABLE} debug WORKING_DIRECTORY "${CMAKE_BINARY_DIR}" DEPENDS ${lib_target} ) - endif() - - add_dependencies(${lib_target} ${api_target}) - add_dependencies(${target} ${lib_target}) + endif() + add_dependencies(${lib_target} ${api_target}) + add_dependencies(${target} ${lib_target}) endif(ANDROID) #android test project -if(BUILD_TESTS) - add_android_project(opencv_test_java "${CMAKE_CURRENT_SOURCE_DIR}/android_test") +ocv_check_dependencies(${OPENCV_MODULE_${the_module}_OPT_DEPS}) +if(BUILD_TESTS AND OCV_DEPENDENCIES_FOUND) + add_android_project(opencv_test_java "${CMAKE_CURRENT_SOURCE_DIR}/android_test") - add_custom_command( + add_custom_command( TARGET opencv_test_java_android_project POST_BUILD COMMAND ${PYTHON_EXECUTABLE} ${CHECK_TEST_COVERAGE} "${CMAKE_CURRENT_SOURCE_DIR}/android_test/src" "${CMAKE_BINARY_DIR}/src" > "${CMAKE_CURRENT_BINARY_DIR}/tests_coverage.log" ) endif() + diff --git a/modules/java/src/cpp/VideoCapture.cpp b/modules/java/src/cpp/VideoCapture.cpp index 9659ab312..5222bfe54 100644 --- a/modules/java/src/cpp/VideoCapture.cpp +++ b/modules/java/src/cpp/VideoCapture.cpp @@ -1,7 +1,3 @@ -// -// This file is auto-generated, please don't edit! -// - #include #ifdef DEBUG @@ -10,6 +6,9 @@ #define LOGD(...) ((void)__android_log_print(ANDROID_LOG_DEBUG, MODULE_LOG_TAG, __VA_ARGS__)) #endif // DEBUG +#include "opencv2/opencv_modules.hpp" +#ifdef HAVE_OPENCV_HIGHGUI + #include "opencv2/highgui/highgui_c.h" #include "opencv2/highgui/highgui.hpp" using namespace cv; @@ -452,3 +451,4 @@ JNIEXPORT void JNICALL Java_org_opencv_highgui_VideoCapture_n_1delete } // extern "C" +#endif // HAVE_OPENCV_HIGHGUI \ No newline at end of file diff --git a/modules/java/src/cpp/converters.cpp b/modules/java/src/cpp/converters.cpp index 40cdd3bbc..7e1f4cfb7 100644 --- a/modules/java/src/cpp/converters.cpp +++ b/modules/java/src/cpp/converters.cpp @@ -180,7 +180,7 @@ void vector_Point3d_to_Mat(vector& v_point, Mat& mat) mat = Mat(v_point, true); } - +#ifdef HAVE_OPENCV_FEATURES2D //vector_KeyPoint void Mat_to_vector_KeyPoint(Mat& mat, vector& v_kp) { @@ -206,6 +206,7 @@ void vector_KeyPoint_to_Mat(vector& v_kp, Mat& mat) mat.at< Vec >(i, 0) = Vec(kp.pt.x, kp.pt.y, kp.size, kp.angle, kp.response, kp.octave, kp.class_id); } } +#endif //vector_Mat @@ -239,6 +240,7 @@ void vector_Mat_to_Mat(std::vector& v_mat, cv::Mat& mat) } } +#ifdef HAVE_OPENCV_FEATURES2D //vector_DMatch void Mat_to_vector_DMatch(Mat& mat, vector& v_dm) { @@ -264,6 +266,7 @@ void vector_DMatch_to_Mat(vector& v_dm, Mat& mat) mat.at< Vec >(i, 0) = Vec(dm.queryIdx, dm.trainIdx, dm.imgIdx, dm.distance); } } +#endif void Mat_to_vector_vector_Point(Mat& mat, vector< vector< Point > >& vv_pt) { @@ -278,6 +281,7 @@ void Mat_to_vector_vector_Point(Mat& mat, vector< vector< Point > >& vv_pt) } } +#ifdef HAVE_OPENCV_FEATURES2D void Mat_to_vector_vector_KeyPoint(Mat& mat, vector< vector< KeyPoint > >& vv_kp) { vector vm; @@ -329,6 +333,7 @@ void vector_vector_DMatch_to_Mat(vector< vector< DMatch > >& vv_dm, Mat& mat) } vector_Mat_to_Mat(vm, mat); } +#endif void Mat_to_vector_vector_char(Mat& mat, vector< vector< char > >& vv_ch) { diff --git a/modules/java/src/cpp/converters.h b/modules/java/src/cpp/converters.h index 71c016a29..e1118e996 100644 --- a/modules/java/src/cpp/converters.h +++ b/modules/java/src/cpp/converters.h @@ -1,10 +1,9 @@ #include +#include "opencv2/opencv_modules.hpp" #include "opencv2/core/core.hpp" -#include "opencv2/features2d/features2d.hpp" #include "features2d_manual.hpp" - void Mat_to_vector_int(cv::Mat& mat, std::vector& v_int); void vector_int_to_Mat(std::vector& v_int, cv::Mat& mat); @@ -41,12 +40,15 @@ void vector_Point3d_to_Mat(std::vector& v_point, cv::Mat& mat); void vector_Vec4f_to_Mat(std::vector& v_vec, cv::Mat& mat); void vector_Vec6f_to_Mat(std::vector& v_vec, cv::Mat& mat); +#ifdef HAVE_OPENCV_FEATURES2D void Mat_to_vector_KeyPoint(cv::Mat& mat, std::vector& v_kp); void vector_KeyPoint_to_Mat(std::vector& v_kp, cv::Mat& mat); +#endif void Mat_to_vector_Mat(cv::Mat& mat, std::vector& v_mat); void vector_Mat_to_Mat(std::vector& v_mat, cv::Mat& mat); +#ifdef HAVE_OPENCV_FEATURES2D void Mat_to_vector_DMatch(cv::Mat& mat, std::vector& v_dm); void vector_DMatch_to_Mat(std::vector& v_dm, cv::Mat& mat); @@ -55,6 +57,7 @@ void vector_vector_KeyPoint_to_Mat(std::vector< std::vector< cv::KeyPoint > >& v void Mat_to_vector_vector_DMatch(cv::Mat& mat, std::vector< std::vector< cv::DMatch > >& vv_dm); void vector_vector_DMatch_to_Mat(std::vector< std::vector< cv::DMatch > >& vv_dm, cv::Mat& mat); +#endif void Mat_to_vector_vector_char(cv::Mat& mat, std::vector< std::vector< char > >& vv_ch); void vector_vector_char_to_Mat(std::vector< std::vector< char > >& vv_ch, cv::Mat& mat); diff --git a/modules/java/src/cpp/features2d_manual.hpp b/modules/java/src/cpp/features2d_manual.hpp index e0fc609f2..702d311ed 100644 --- a/modules/java/src/cpp/features2d_manual.hpp +++ b/modules/java/src/cpp/features2d_manual.hpp @@ -1,6 +1,9 @@ #ifndef __OPENCV_FEATURES_2D_MANUAL_HPP__ #define __OPENCV_FEATURES_2D_MANUAL_HPP__ +#include "opencv2/opencv_modules.hpp" + +#ifdef HAVE_OPENCV_FEATURES2D #include "opencv2/features2d/features2d.hpp" namespace cv @@ -10,6 +13,7 @@ class CV_EXPORTS_AS(FeatureDetector) javaFeatureDetector : public FeatureDetecto { public: #if 0 + //DO NOT REMOVE! The block is required for sources parser CV_WRAP void detect( const Mat& image, CV_OUT vector& keypoints, const Mat& mask=Mat() ) const; CV_WRAP void detect( const vector& images, CV_OUT vector >& keypoints, const vector& masks=vector() ) const; CV_WRAP virtual bool empty() const; @@ -152,6 +156,7 @@ class CV_EXPORTS_AS(DescriptorMatcher) javaDescriptorMatcher : public Descriptor { public: #if 0 + //DO NOT REMOVE! The block is required for sources parser CV_WRAP virtual bool isMaskSupported() const; CV_WRAP virtual void add( const vector& descriptors ); CV_WRAP const vector& getTrainDescriptors() const; @@ -245,6 +250,7 @@ class CV_EXPORTS_AS(DescriptorExtractor) javaDescriptorExtractor : public Descri { public: #if 0 + //DO NOT REMOVE! The block is required for sources parser CV_WRAP void compute( const Mat& image, vector& keypoints, Mat& descriptors ) const; CV_WRAP void compute( const vector& images, vector >& keypoints, CV_OUT vector& descriptors ) const; CV_WRAP virtual int descriptorSize() const; @@ -326,6 +332,7 @@ class CV_EXPORTS_AS(GenericDescriptorMatcher) javaGenericDescriptorMatcher : pub { public: #if 0 + //DO NOT REMOVE! The block is required for sources parser CV_WRAP virtual void add( const vector& images, vector >& keypoints ); CV_WRAP const vector& getTrainImages() const; @@ -411,6 +418,7 @@ public: }; #if 0 +//DO NOT REMOVE! The block is required for sources parser enum { DRAW_OVER_OUTIMG = 1, // Output image matrix will not be created (Mat::create). @@ -441,4 +449,6 @@ CV_EXPORTS_AS(drawMatches2) void drawMatches( const Mat& img1, const vector