From 6848c6d69abc7041597fd2e94eb93b6ae624d5a1 Mon Sep 17 00:00:00 2001 From: Alexander Mordvintsev Date: Wed, 28 Mar 2012 09:44:54 +0000 Subject: [PATCH] reverted revision 7676 (#1725) --- modules/python/CMakeLists.txt | 8 +++----- modules/python/src2/cv2.cpp | 2 -- modules/python/src2/hdr_parser.py | 3 +-- .../include/opencv2/stitching/detail/seam_finders.hpp | 8 ++++---- 4 files changed, 8 insertions(+), 13 deletions(-) diff --git a/modules/python/CMakeLists.txt b/modules/python/CMakeLists.txt index 76fec1a51..6a9e43310 100644 --- a/modules/python/CMakeLists.txt +++ b/modules/python/CMakeLists.txt @@ -10,7 +10,7 @@ if(ANDROID OR IOS OR NOT PYTHONLIBS_FOUND OR NOT PYTHON_USE_NUMPY) endif() set(the_description "The python bindings") -ocv_add_module(python BINDINGS opencv_core opencv_flann opencv_imgproc opencv_video opencv_ml opencv_features2d opencv_highgui opencv_calib3d opencv_photo opencv_nonfree opencv_objdetect opencv_legacy opencv_contrib opencv_stitching) +ocv_add_module(python BINDINGS opencv_core opencv_flann opencv_imgproc opencv_video opencv_ml opencv_features2d opencv_highgui opencv_calib3d opencv_photo opencv_nonfree opencv_objdetect opencv_legacy opencv_contrib) ocv_include_directories(${PYTHON_INCLUDE_PATH}) ocv_include_directories( @@ -29,7 +29,6 @@ ocv_include_directories( "${OpenCV_SOURCE_DIR}/modules/nonfree/include" "${OpenCV_SOURCE_DIR}/modules/legacy/include" "${OpenCV_SOURCE_DIR}/modules/contrib/include" - "${OpenCV_SOURCE_DIR}/modules/stitching/include" ) include_directories(${CMAKE_CURRENT_BINARY_DIR}) @@ -45,8 +44,7 @@ set(opencv_hdrs "${OpenCV_SOURCE_DIR}/modules/core/include/opencv2/core/core.hpp "${OpenCV_SOURCE_DIR}/modules/features2d/include/opencv2/features2d/features2d.hpp" "${OpenCV_SOURCE_DIR}/modules/nonfree/include/opencv2/nonfree/features2d.hpp" "${OpenCV_SOURCE_DIR}/modules/calib3d/include/opencv2/calib3d/calib3d.hpp" - "${OpenCV_SOURCE_DIR}/modules/objdetect/include/opencv2/objdetect/objdetect.hpp" - "${OpenCV_SOURCE_DIR}/modules/stitching/include/opencv2/stitching/detail/seam_finders.hpp") + "${OpenCV_SOURCE_DIR}/modules/objdetect/include/opencv2/objdetect/objdetect.hpp") if(MSVC) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W3") @@ -77,7 +75,7 @@ add_custom_command( set(cv2_target "opencv_python") add_library(${cv2_target} SHARED src2/cv2.cpp ${CMAKE_CURRENT_BINARY_DIR}/generated0.i ${cv2_generated_hdrs} src2/cv2.cv.hpp) -target_link_libraries(${cv2_target} ${PYTHON_LIBRARIES} opencv_core opencv_flann opencv_imgproc opencv_video opencv_ml opencv_features2d opencv_highgui opencv_calib3d opencv_objdetect opencv_legacy opencv_contrib opencv_photo opencv_stitching) +target_link_libraries(${cv2_target} ${PYTHON_LIBRARIES} opencv_core opencv_flann opencv_imgproc opencv_video opencv_ml opencv_features2d opencv_highgui opencv_calib3d opencv_objdetect opencv_legacy opencv_contrib opencv_photo) set_target_properties(${cv2_target} PROPERTIES PREFIX "") set_target_properties(${cv2_target} PROPERTIES OUTPUT_NAME "cv2") diff --git a/modules/python/src2/cv2.cpp b/modules/python/src2/cv2.cpp index 50d65c981..e928e36ef 100644 --- a/modules/python/src2/cv2.cpp +++ b/modules/python/src2/cv2.cpp @@ -20,11 +20,9 @@ #include "opencv2/photo/photo.hpp" #include "opencv2/nonfree/nonfree.hpp" #include "opencv2/highgui/highgui.hpp" -#include "opencv2/stitching/stitcher.hpp" using cv::flann::IndexParams; using cv::flann::SearchParams; -using cv::detail::GraphCutSeamFinder; static PyObject* opencv_error = 0; diff --git a/modules/python/src2/hdr_parser.py b/modules/python/src2/hdr_parser.py index 21e622d9a..b2ab908af 100755 --- a/modules/python/src2/hdr_parser.py +++ b/modules/python/src2/hdr_parser.py @@ -11,8 +11,7 @@ opencv_hdr_list = [ "../../video/include/opencv2/video/tracking.hpp", "../../video/include/opencv2/video/background_segm.hpp", "../../objdetect/include/opencv2/objdetect/objdetect.hpp", -"../../highgui/include/opencv2/highgui/highgui.hpp", -"../../stitching/include/opencv2/stitching/detail/seam_finders.hpp" +"../../highgui/include/opencv2/highgui/highgui.hpp" ] """ diff --git a/modules/stitching/include/opencv2/stitching/detail/seam_finders.hpp b/modules/stitching/include/opencv2/stitching/detail/seam_finders.hpp index a84fc71ad..acd18f003 100644 --- a/modules/stitching/include/opencv2/stitching/detail/seam_finders.hpp +++ b/modules/stitching/include/opencv2/stitching/detail/seam_finders.hpp @@ -49,11 +49,11 @@ namespace cv { namespace detail { -class CV_EXPORTS_AS(SeamFinder) SeamFinder +class CV_EXPORTS SeamFinder { public: virtual ~SeamFinder() {} - CV_WRAP virtual void find(const std::vector &src, const std::vector &corners, + virtual void find(const std::vector &src, const std::vector &corners, std::vector &masks) = 0; }; @@ -99,10 +99,10 @@ public: }; -class CV_EXPORTS_AS(GraphCutSeamFinder) GraphCutSeamFinder : public SeamFinder, public GraphCutSeamFinderBase +class CV_EXPORTS GraphCutSeamFinder : public GraphCutSeamFinderBase, public SeamFinder { public: - CV_WRAP GraphCutSeamFinder(int cost_type = GraphCutSeamFinder::COST_COLOR_GRAD, float terminal_cost = 10000.f, + GraphCutSeamFinder(int cost_type = COST_COLOR_GRAD, float terminal_cost = 10000.f, float bad_region_penalty = 1000.f); ~GraphCutSeamFinder();