Merge pull request #2964 from vbystricky:highgui_split

samples/android/CMakeLists.txt

@@ -19,9 +19,9 @@ add_subdirectory(native-activity)
 
 # hello-android sample
 if(HAVE_opencv_highgui)
-  ocv_include_modules_recurse(opencv_imgcodecs opencv_highgui opencv_core)
+  ocv_include_modules_recurse(opencv_imgcodecs opencv_videoio opencv_highgui opencv_core)
   add_executable(hello-android hello-android/main.cpp)
-  target_link_libraries(hello-android ${OPENCV_LINKER_LIBS} opencv_imgcodecs opencv_highgui opencv_core)
+  target_link_libraries(hello-android ${OPENCV_LINKER_LIBS} opencv_imgcodecs opencv_videoio opencv_highgui opencv_core)
   set_target_properties(hello-android PROPERTIES OUTPUT_NAME hello-android RUNTIME_OUTPUT_DIRECTORY "${EXECUTABLE_OUTPUT_PATH}")
   add_dependencies(opencv_android_examples hello-android)
 endif()

samples/cpp/CMakeLists.txt

@@ -4,8 +4,9 @@
 # ----------------------------------------------------------------------------
 
 SET(OPENCV_CPP_SAMPLES_REQUIRED_DEPS opencv_core opencv_imgproc opencv_flann
-    opencv_imgcodecs opencv_highgui opencv_ml opencv_video opencv_objdetect opencv_photo opencv_nonfree
-    opencv_features2d opencv_calib3d opencv_stitching opencv_videostab opencv_shape)
+    opencv_imgcodecs opencv_videoio opencv_highgui opencv_ml opencv_video
+    opencv_objdetect opencv_photo opencv_nonfree opencv_features2d opencv_calib3d
+    opencv_stitching opencv_videostab opencv_shape)
 
 ocv_check_dependencies(${OPENCV_CPP_SAMPLES_REQUIRED_DEPS})
 

samples/cpp/bgfg_gmg.cpp

@@ -6,6 +6,7 @@
  */
 
 #include "opencv2/video.hpp"
+#include "opencv2/videoio.hpp"
 #include "opencv2/highgui.hpp"
 #include <opencv2/core/utility.hpp>
 #include <iostream>

samples/cpp/bgfg_segm.cpp

@@ -2,6 +2,7 @@
 #include <opencv2/core/utility.hpp>
 #include "opencv2/imgproc.hpp"
 #include "opencv2/video/background_segm.hpp"
+#include "opencv2/videoio.hpp"
 #include "opencv2/highgui.hpp"
 #include <stdio.h>
 

samples/cpp/calibration.cpp

@@ -3,6 +3,7 @@
 #include "opencv2/imgproc.hpp"
 #include "opencv2/calib3d.hpp"
 #include "opencv2/imgcodecs.hpp"
+#include "opencv2/videoio.hpp"
 #include "opencv2/highgui.hpp"
 
 #include <cctype>

samples/cpp/camshiftdemo.cpp

@@ -1,6 +1,7 @@
 #include <opencv2/core/utility.hpp>
 #include "opencv2/video/tracking.hpp"
 #include "opencv2/imgproc.hpp"
+#include "opencv2/videoio.hpp"
 #include "opencv2/highgui.hpp"
 
 #include <iostream>

samples/cpp/dbt_face_detection.cpp

@@ -2,6 +2,7 @@
 
 #include <opencv2/imgproc/imgproc.hpp>  // Gaussian Blur
 #include <opencv2/core/core.hpp>        // Basic OpenCV structures (cv::Mat, Scalar)
+#include <opencv2/videoio/videoio.hpp>
 #include <opencv2/highgui/highgui.hpp>  // OpenCV window I/O
 #include <opencv2/features2d/features2d.hpp>
 #include <opencv2/objdetect/objdetect.hpp>

samples/cpp/facedetect.cpp

@@ -1,9 +1,11 @@
 #include "opencv2/objdetect.hpp"
 #include "opencv2/imgcodecs.hpp"
+#include "opencv2/videoio.hpp"
 #include "opencv2/highgui.hpp"
 #include "opencv2/imgproc.hpp"
 #include "opencv2/core/utility.hpp"
 
+#include "opencv2/videoio/videoio_c.h"
 #include "opencv2/highgui/highgui_c.h"
 
 #include <cctype>

samples/cpp/fback.cpp

@@ -1,5 +1,6 @@
 #include "opencv2/video/tracking.hpp"
 #include "opencv2/imgproc/imgproc.hpp"
+#include "opencv2/videoio/videoio.hpp"
 #include "opencv2/highgui/highgui.hpp"
 
 #include <iostream>

samples/cpp/ffilldemo.cpp

@@ -1,5 +1,6 @@
 #include "opencv2/imgproc/imgproc.hpp"
 #include "opencv2/imgcodecs.hpp"
+#include "opencv2/videoio/videoio.hpp"
 #include "opencv2/highgui/highgui.hpp"
 
 #include <iostream>

samples/cpp/image_sequence.cpp

@@ -1,4 +1,5 @@
 #include <opencv2/core/core.hpp>
+#include <opencv2/videoio/videoio.hpp>
 #include <opencv2/highgui/highgui.hpp>
 
 #include <iostream>

samples/cpp/intelperc_capture.cpp

@@ -1,6 +1,7 @@
 // testOpenCVCam.cpp : Defines the entry point for the console application.
 //
 
+#include "opencv2/videoio/videoio.hpp"
 #include "opencv2/highgui/highgui.hpp"
 
 #include <iostream>

samples/cpp/laplace.cpp

@@ -1,3 +1,4 @@
+#include "opencv2/videoio/videoio.hpp"
 #include "opencv2/highgui/highgui.hpp"
 #include "opencv2/imgproc/imgproc.hpp"
 

samples/cpp/linemod.cpp

@@ -3,6 +3,7 @@
 #include <opencv2/imgproc/imgproc_c.h> // cvFindContours
 #include <opencv2/imgproc.hpp>
 #include <opencv2/objdetect.hpp>
+#include <opencv2/videoio.hpp>
 #include <opencv2/highgui.hpp>
 #include <iterator>
 #include <set>

samples/cpp/lkdemo.cpp

@@ -1,5 +1,6 @@
 #include "opencv2/video/tracking.hpp"
 #include "opencv2/imgproc/imgproc.hpp"
+#include "opencv2/videoio/videoio.hpp"
 #include "opencv2/highgui/highgui.hpp"
 
 #include <iostream>

samples/cpp/motempl.cpp

@@ -1,5 +1,6 @@
 #include "opencv2/video/tracking_c.h"
 #include "opencv2/imgproc/imgproc_c.h"
+#include "opencv2/videoio/videoio_c.h"
 #include "opencv2/highgui/highgui_c.h"
 #include <time.h>
 #include <stdio.h>

samples/cpp/openni_capture.cpp

@@ -1,3 +1,4 @@
+#include "opencv2/videoio/videoio.hpp"
 #include "opencv2/highgui/highgui.hpp"
 #include "opencv2/imgproc/imgproc.hpp"
 

samples/cpp/phase_corr.cpp

@@ -1,4 +1,5 @@
 #include "opencv2/core/core.hpp"
+#include "opencv2/videoio/videoio.hpp"
 #include "opencv2/highgui/highgui.hpp"
 #include "opencv2/imgproc/imgproc.hpp"
 

samples/cpp/polar_transforms.cpp

@@ -1,4 +1,5 @@
 #include "opencv2/imgproc/imgproc_c.h"
+#include "opencv2/videoio/videoio_c.h"
 #include "opencv2/highgui/highgui_c.h"
 
 #include <ctype.h>

samples/cpp/segment_objects.cpp

@@ -1,4 +1,5 @@
 #include "opencv2/imgproc/imgproc.hpp"
+#include "opencv2/videoio/videoio.hpp"
 #include "opencv2/highgui/highgui.hpp"
 #include "opencv2/video/background_segm.hpp"
 #include <stdio.h>

samples/cpp/select3dobj.cpp

@@ -13,6 +13,7 @@
 #include "opencv2/imgproc.hpp"
 #include "opencv2/calib3d.hpp"
 #include "opencv2/imgcodecs.hpp"
+#include "opencv2/videoio.hpp"
 #include "opencv2/highgui.hpp"
 
 #include <ctype.h>

samples/cpp/smiledetect.cpp

@@ -3,6 +3,7 @@
 #include "opencv2/imgproc.hpp"
 #include "opencv2/core/utility.hpp"
 
+#include "opencv2/videoio/videoio_c.h"
 #include "opencv2/highgui/highgui_c.h"
 
 #include <cctype>

samples/cpp/starter_video.cpp

@@ -12,6 +12,7 @@
 */
 
 #include <opencv2/imgcodecs.hpp>
+#include <opencv2/videoio/videoio.hpp>
 #include <opencv2/highgui/highgui.hpp>
 
 #include <iostream>

samples/cpp/tutorial_code/HighGUI/video-input-psnr-ssim/video-input-psnr-ssim.cpp

@@ -5,6 +5,7 @@
 
 #include <opencv2/core/core.hpp>        // Basic OpenCV structures (cv::Mat, Scalar)
 #include <opencv2/imgproc/imgproc.hpp>  // Gaussian Blur
+#include <opencv2/videoio/videoio.hpp>
 #include <opencv2/highgui/highgui.hpp>  // OpenCV window I/O
 
 using namespace std;

samples/cpp/tutorial_code/HighGUI/video-write/video-write.cpp

@@ -2,7 +2,7 @@
 #include <string>   // for strings
 
 #include <opencv2/core/core.hpp>        // Basic OpenCV structures (cv::Mat)
-#include <opencv2/highgui/highgui.hpp>  // Video write
+#include <opencv2/videoio/videoio.hpp>  // Video write
 
 using namespace std;
 using namespace cv;

samples/cpp/tutorial_code/calib3d/camera_calibration/camera_calibration.cpp

@@ -7,7 +7,8 @@
 #include <opencv2/core/utility.hpp>
 #include <opencv2/imgproc.hpp>
 #include <opencv2/calib3d.hpp>
-#include "opencv2/imgcodecs.hpp"
+#include <opencv2/imgcodecs.hpp>
+#include <opencv2/videoio.hpp>
 #include <opencv2/highgui.hpp>
 
 #ifndef _CRT_SECURE_NO_WARNINGS

samples/cpp/tutorial_code/objectDetection/objectDetection.cpp

@@ -1,4 +1,5 @@
 #include "opencv2/objdetect.hpp"
+#include "opencv2/videoio.hpp"
 #include "opencv2/highgui.hpp"
 #include "opencv2/imgproc.hpp"
 

samples/cpp/tutorial_code/objectDetection/objectDetection2.cpp

@@ -4,6 +4,7 @@
  * @brief A simplified version of facedetect.cpp, show how to load a cascade classifier and how to find objects (Face + eyes) in a video stream - Using LBP here
  */
 #include "opencv2/objdetect.hpp"
+#include "opencv2/videoio.hpp"
 #include "opencv2/highgui.hpp"
 #include "opencv2/imgproc.hpp"
 

samples/cpp/tutorial_code/video/bg_sub.cpp

@@ -6,6 +6,7 @@
 
 //opencv
 #include "opencv2/imgcodecs.hpp"
+#include "opencv2/videoio.hpp"
 #include <opencv2/highgui/highgui.hpp>
 #include <opencv2/video/background_segm.hpp>
 //C

samples/cpp/ufacedetect.cpp

@@ -1,5 +1,6 @@
 #include "opencv2/objdetect.hpp"
 #include "opencv2/imgcodecs.hpp"
+#include "opencv2/videoio.hpp"
 #include "opencv2/highgui.hpp"
 #include "opencv2/imgproc.hpp"
 #include "opencv2/core/utility.hpp"

samples/cpp/video_homography.cpp

@@ -6,6 +6,7 @@
 */
 
 #include "opencv2/calib3d/calib3d.hpp"
+#include "opencv2/videoio/videoio.hpp"
 #include "opencv2/highgui/highgui.hpp"
 #include "opencv2/imgproc/imgproc.hpp"
 #include "opencv2/features2d/features2d.hpp"

samples/cpp/videostab.cpp

@@ -7,6 +7,7 @@
 #include <opencv2/core/utility.hpp>
 #include "opencv2/video.hpp"
 #include "opencv2/imgproc.hpp"
+#include "opencv2/videoio.hpp"
 #include "opencv2/highgui.hpp"
 #include "opencv2/videostab.hpp"
 #include "opencv2/opencv_modules.hpp"

samples/java/clojure/simple-sample/src/simple_sample/core.clj

@@ -4,13 +4,13 @@
 
 (ns simple-sample.core
   (:import [org.opencv.core Point Rect Mat CvType Size Scalar]
-           org.opencv.highgui.Highgui
+           org.opencv.imgcodecs.Imgcodecs
            org.opencv.imgproc.Imgproc))
 
 (defn -main [& args]
-  (let [lena (Highgui/imread "resources/images/lena.png")
+  (let [lena (Imgcodecs/imread "resources/images/lena.png")
         blurred (Mat. 512 512 CvType/CV_8UC3)]
     (print "Blurring...")
     (Imgproc/GaussianBlur lena blurred (Size. 5 5) 3 3)
-    (Highgui/imwrite "resources/images/blurred.png" blurred)
+    (Imgcodecs/imwrite "resources/images/blurred.png" blurred)
     (println "done!")))

samples/java/sbt/src/main/java/DetectFaceDemo.java

@@ -4,7 +4,7 @@ import org.opencv.core.MatOfRect;
 import org.opencv.core.Point;
 import org.opencv.core.Rect;
 import org.opencv.core.Scalar;
-import org.opencv.highgui.Highgui;
+import org.opencv.imgcodecs.Imgcodecs;
 import org.opencv.objdetect.CascadeClassifier;
 
 /*
@@ -19,7 +19,7 @@ public class DetectFaceDemo {
         // directory.
         CascadeClassifier faceDetector = new CascadeClassifier(getClass()
                 .getResource("/lbpcascade_frontalface.xml").getPath());
-        Mat image = Highgui.imread(getClass().getResource(
+        Mat image = Imgcodecs.imread(getClass().getResource(
                 "/AverageMaleFace.jpg").getPath());
 
         // Detect faces in the image.
@@ -39,6 +39,6 @@ public class DetectFaceDemo {
         // Save the visualized detection.
         String filename = "faceDetection.png";
         System.out.println(String.format("Writing %s", filename));
-        Highgui.imwrite(filename, image);
+        Imgcodecs.imwrite(filename, image);
     }
 }

samples/java/sbt/src/main/scala/ScalaCorrespondenceMatchingDemo.scala

@@ -1,4 +1,4 @@
-import org.opencv.highgui.Highgui
+import org.opencv.imgcodecs.Imgcodecs
 import org.opencv.features2d.DescriptorExtractor
 import org.opencv.features2d.Features2d
 import org.opencv.core.MatOfKeyPoint
@@ -45,8 +45,8 @@ object ScalaCorrespondenceMatchingDemo {
     }
 
     // Load the images from the |resources| directory.
-    val leftImage = Highgui.imread(getClass.getResource("/img1.png").getPath)
-    val rightImage = Highgui.imread(getClass.getResource("/img2.png").getPath)
+    val leftImage = Imgcodecs.imread(getClass.getResource("/img1.png").getPath)
+    val rightImage = Imgcodecs.imread(getClass.getResource("/img2.png").getPath)
 
     // Detect KeyPoints and extract descriptors.
     val (leftKeyPoints, leftDescriptors) = detectAndExtract(leftImage)
@@ -64,6 +64,6 @@ object ScalaCorrespondenceMatchingDemo {
     Features2d.drawMatches(leftImage, leftKeyPoints, rightImage, rightKeyPoints, dmatches, correspondenceImage)
     val filename = "scalaCorrespondences.png"
     println(s"Writing ${filename}")
-    assert(Highgui.imwrite(filename, correspondenceImage))
+    assert(Imgcodecs.imwrite(filename, correspondenceImage))
   }
 }

samples/java/sbt/src/main/scala/ScalaDetectFaceDemo.scala

@@ -2,7 +2,7 @@ import org.opencv.core.Core
 import org.opencv.core.MatOfRect
 import org.opencv.core.Point
 import org.opencv.core.Scalar
-import org.opencv.highgui.Highgui
+import org.opencv.imgcodecs.Imgcodecs
 import org.opencv.objdetect.CascadeClassifier
 import reflect._
 
@@ -16,7 +16,7 @@ object ScalaDetectFaceDemo {
 
     // Create a face detector from the cascade file in the resources directory.
     val faceDetector = new CascadeClassifier(getClass.getResource("/lbpcascade_frontalface.xml").getPath)
-    val image = Highgui.imread(getClass.getResource("/AverageMaleFace.jpg").getPath)
+    val image = Imgcodecs.imread(getClass.getResource("/AverageMaleFace.jpg").getPath)
 
     // Detect faces in the image.
     // MatOfRect is a special container class for Rect.
@@ -38,6 +38,6 @@ object ScalaDetectFaceDemo {
     // Save the visualized detection.
     val filename = "scalaFaceDetection.png"
     println(s"Writing ${filename}")
-    assert(Highgui.imwrite(filename, image))
+    assert(Imgcodecs.imwrite(filename, image))
   }
 }

samples/tapi/CMakeLists.txt

@@ -1,4 +1,4 @@
-SET(OPENCV_TAPI_SAMPLES_REQUIRED_DEPS opencv_core opencv_imgproc opencv_video opencv_imgcodecs opencv_highgui opencv_objdetect opencv_features2d opencv_calib3d opencv_nonfree opencv_flann)
+SET(OPENCV_TAPI_SAMPLES_REQUIRED_DEPS opencv_core opencv_imgproc opencv_video opencv_imgcodecs opencv_videoio opencv_highgui opencv_objdetect opencv_features2d opencv_calib3d opencv_nonfree opencv_flann)
 
 ocv_check_dependencies(${OPENCV_TAPI_SAMPLES_REQUIRED_DEPS})
 

samples/tapi/bgfg_segm.cpp

@@ -4,6 +4,7 @@
 #include "opencv2/core.hpp"
 #include "opencv2/core/ocl.hpp"
 #include "opencv2/core/utility.hpp"
+#include "opencv2/videoio.hpp"
 #include "opencv2/highgui.hpp"
 #include "opencv2/video.hpp"
 

samples/tapi/camshift.cpp

@@ -2,6 +2,7 @@
 #include "opencv2/core/ocl.hpp"
 #include "opencv2/video/tracking.hpp"
 #include "opencv2/imgproc/imgproc.hpp"
+#include "opencv2/videoio/videoio.hpp"
 #include "opencv2/highgui/highgui.hpp"
 
 #include <iostream>

samples/tapi/clahe.cpp

@@ -4,6 +4,7 @@
 #include "opencv2/core/utility.hpp"
 #include "opencv2/imgproc/imgproc.hpp"
 #include "opencv2/imgcodecs.hpp"
+#include "opencv2/videoio.hpp"
 #include "opencv2/highgui/highgui.hpp"
 
 using namespace cv;

samples/tapi/hog.cpp

@@ -7,6 +7,8 @@
 #include <opencv2/core/ocl.hpp>
 #include <opencv2/core/utility.hpp>
 #include "opencv2/imgcodecs.hpp"
+#include <opencv2/video.hpp>
+#include <opencv2/videoio.hpp>
 #include <opencv2/highgui.hpp>
 #include <opencv2/objdetect.hpp>
 #include <opencv2/imgproc.hpp>

samples/tapi/pyrlk_optical_flow.cpp

@@ -4,7 +4,8 @@
 
 #include "opencv2/core/utility.hpp"
 #include "opencv2/imgcodecs.hpp"
-#include "opencv2/highgui/highgui.hpp"
+#include "opencv2/videoio.hpp"
+#include "opencv2/highgui.hpp"
 #include "opencv2/core/ocl.hpp"
 #include "opencv2/video/video.hpp"
 

samples/tapi/tvl1_optical_flow.cpp

@@ -5,6 +5,7 @@
 #include "opencv2/core/ocl.hpp"
 #include "opencv2/core/utility.hpp"
 #include "opencv2/imgcodecs.hpp"
+#include "opencv2/videoio.hpp"
 #include "opencv2/highgui/highgui.hpp"
 #include "opencv2/video/video.hpp"