diff --git a/modules/saliency/CMakeLists.txt b/modules/saliency/CMakeLists.txt index f9bbffc9177..77e1c0ebcd2 100644 --- a/modules/saliency/CMakeLists.txt +++ b/modules/saliency/CMakeLists.txt @@ -4,6 +4,6 @@ endif() set(the_description "Saliency API") -ocv_define_module(saliency opencv_imgproc opencv_features2d WRAP python) +ocv_define_module(saliency opencv_imgproc opencv_features2d WRAP python java) ocv_warnings_disable(CMAKE_CXX_FLAGS -Woverloaded-virtual) diff --git a/modules/saliency/include/opencv2/saliency/saliencySpecializedClasses.hpp b/modules/saliency/include/opencv2/saliency/saliencySpecializedClasses.hpp index 580f6f3840e..2a80026f1d3 100644 --- a/modules/saliency/include/opencv2/saliency/saliencySpecializedClasses.hpp +++ b/modules/saliency/include/opencv2/saliency/saliencySpecializedClasses.hpp @@ -87,7 +87,7 @@ class CV_EXPORTS_W StaticSaliencySpectralResidual : public StaticSaliency } CV_WRAP void read( const FileNode& fn ) CV_OVERRIDE; - void write( FileStorage& fs ) const CV_OVERRIDE; + CV_WRAP void write( FileStorage& fs ) const CV_OVERRIDE; CV_WRAP int getImageWidth() const { @@ -308,9 +308,6 @@ class CV_EXPORTS_W ObjectnessBING : public Objectness return computeSaliencyImpl( image, saliencyMap ); } - CV_WRAP void read(); - CV_WRAP void write() const; - /** @brief Return the list of the rectangles' objectness value, in the same order as the *vector\ objectnessBoundingBox* returned by the algorithm (in diff --git a/modules/saliency/src/BING/objectnessBING.cpp b/modules/saliency/src/BING/objectnessBING.cpp index 9820f02b512..6890ea0fce3 100644 --- a/modules/saliency/src/BING/objectnessBING.cpp +++ b/modules/saliency/src/BING/objectnessBING.cpp @@ -448,21 +448,12 @@ bool ObjectnessBING::matRead( const std::string& filename, Mat& _M ) M.copyTo( _M ); return true; } + std::vector ObjectnessBING::getobjectnessValues() { return objectnessValues; } -void ObjectnessBING::read() -{ - -} - -void ObjectnessBING::write() const -{ - -} - bool ObjectnessBING::computeSaliencyImpl( InputArray image, OutputArray objectnessBoundingBox ) { ValStructVec finalBoxes;