Merge pull request #29012 from asmorkalov:as/int_scissors

Moved IntelligentScissors to photo module.

modules/imgproc/include/opencv2/imgproc.hpp

@@ -5222,8 +5222,4 @@ Point LineIterator::pos() const
 
 } // cv
 
-
-#include "./imgproc/segmentation.hpp"
-
-
 #endif

modules/imgproc/misc/js/gen_dict.json

@@ -102,17 +102,6 @@
             "watershed"
         ],
         "CLAHE": ["apply", "collectGarbage", "getClipLimit", "getTilesGridSize", "setClipLimit", "setTilesGridSize"],
-        "FontFace": ["set", "getName", "setInstance", "getInstance", "getBuiltinFontData"],
-        "segmentation_IntelligentScissorsMB": [
-            "IntelligentScissorsMB",
-            "setWeights",
-            "setGradientMagnitudeMaxLimit",
-            "setEdgeFeatureZeroCrossingParameters",
-            "setEdgeFeatureCannyParameters",
-            "applyImage",
-            "applyImageFeatures",
-            "buildMap",
-            "getContour"
-        ]
+        "FontFace": ["set", "getName", "setInstance", "getInstance", "getBuiltinFontData"]
     }
 }

modules/photo/include/opencv2/photo.hpp

@@ -962,4 +962,6 @@ CV_EXPORTS_W void loadChromaticAberrationParams(
 
 } // cv
 
+#include "./photo/segmentation.hpp"
+
 #endif

modules/photo/include/opencv2/photo/segmentation.hpp

@@ -2,16 +2,16 @@
 // It is subject to the license terms in the LICENSE file found in the top-level directory
 // of this distribution and at http://opencv.org/license.html.
 
-#ifndef OPENCV_IMGPROC_SEGMENTATION_HPP
-#define OPENCV_IMGPROC_SEGMENTATION_HPP
+#ifndef OPENCV_PHOTO_SEGMENTATION_HPP
+#define OPENCV_PHOTO_SEGMENTATION_HPP
 
-#include "opencv2/imgproc.hpp"
+#include "opencv2/photo.hpp"
 
 namespace cv {
 
 namespace segmentation {
 
-//! @addtogroup imgproc_segmentation
+//! @addtogroup photo_segmentation
 //! @{
 
 
@@ -21,7 +21,7 @@ namespace segmentation {
  * which can be used for image segmentation.
  *
  * Usage example:
- * @snippet snippets/imgproc_segmentation.cpp usage_example_intelligent_scissors
+ * @snippet snippets/photo_segmentation.cpp usage_example_intelligent_scissors
  *
  * Reference: <a href="http://citeseerx.ist.psu.edu/viewdoc/download?doi=10.1.1.138.3811&rep=rep1&type=pdf">"Intelligent Scissors for Image Composition"</a>
  * algorithm designed by Eric N. Mortensen and William A. Barrett, Brigham Young University
@@ -138,4 +138,4 @@ protected:
 }  // namespace segmentation
 }  // namespace cv
 
-#endif // OPENCV_IMGPROC_SEGMENTATION_HPP
+#endif // OPENCV_PHOTO_SEGMENTATION_HPP

modules/photo/misc/js/gen_dict.json

@@ -21,6 +21,17 @@
                                 "getSigmaColor", "setSigmaColor", "getSigmaSpace","setSigmaSpace"],
             "TonemapMantiuk" : ["getScale", "setScale", "getSaturation", "setSaturation"],
             "TonemapReinhard" : ["getIntensity", "setIntensity", "getLightAdaptation", "setLightAdaptation",
-                                    "getColorAdaptation", "setColorAdaptation"]
+                                    "getColorAdaptation", "setColorAdaptation"],
+        "segmentation_IntelligentScissorsMB": [
+            "IntelligentScissorsMB",
+            "setWeights",
+            "setGradientMagnitudeMaxLimit",
+            "setEdgeFeatureZeroCrossingParameters",
+            "setEdgeFeatureCannyParameters",
+            "applyImage",
+            "applyImageFeatures",
+            "buildMap",
+            "getContour"
+        ]
     }
 }

samples/cpp/CMakeLists.txt

@@ -24,8 +24,8 @@ if(NOT BUILD_EXAMPLES OR NOT OCV_DEPENDENCIES_FOUND)
   return()
 endif()
 
-set(DEPS_example_snippet_imgproc_segmentation opencv_core opencv_imgproc)
-set(DEPS_example_cpp_intelligent_scissors opencv_core opencv_imgproc opencv_imgcodecs opencv_highgui)
+set(DEPS_example_snippet_imgproc_segmentation opencv_core opencv_photo)
+set(DEPS_example_cpp_intelligent_scissors opencv_core opencv_photo opencv_imgcodecs opencv_highgui)
 
 project(cpp_samples)
 ocv_include_modules_recurse(${OPENCV_CPP_SAMPLES_REQUIRED_DEPS})

samples/cpp/tutorial_code/snippets/photo_segmentation.cpp

@@ -1,5 +1,5 @@
-#include "opencv2/imgproc.hpp"
-#include "opencv2/imgproc/segmentation.hpp"
+#include "opencv2/photo.hpp"
+#include "opencv2/photo/segmentation.hpp"
 
 using namespace cv;