Revert "Merge pull request #836 from jet47:gpu-modules"

This reverts commit fba72cb60d, reversing
changes made to 02131ffb62.

samples/gpu/CMakeLists.txt

@@ -1,10 +1,7 @@
 SET(OPENCV_GPU_SAMPLES_REQUIRED_DEPS opencv_core opencv_flann opencv_imgproc opencv_highgui
                                      opencv_ml opencv_video opencv_objdetect opencv_features2d
                                      opencv_calib3d opencv_legacy opencv_contrib opencv_gpu
-                                     opencv_nonfree opencv_softcascade opencv_superres
-                                     opencv_gpuarithm opencv_gpufilters opencv_gpuwarping opencv_gpuimgproc
-                                     opencv_gpufeatures2d opencv_gpuoptflow opencv_gpubgsegm
-                                     opencv_gpustereo opencv_gpulegacy)
+                                     opencv_nonfree opencv_softcascade opencv_superres)
 
 ocv_check_dependencies(${OPENCV_GPU_SAMPLES_REQUIRED_DEPS})
 
@@ -24,10 +21,6 @@ if(BUILD_EXAMPLES AND OCV_DEPENDENCIES_FOUND)
     ocv_include_directories("${OpenCV_SOURCE_DIR}/modules/nonfree/include")
   endif()
 
-  if(HAVE_opencv_gpucodec)
-    ocv_include_directories("${OpenCV_SOURCE_DIR}/modules/gpucodec/include")
-  endif()
-
   if(HAVE_CUDA)
     ocv_include_directories(${CUDA_INCLUDE_DIRS})
   endif()
@@ -47,9 +40,6 @@ if(BUILD_EXAMPLES AND OCV_DEPENDENCIES_FOUND)
     if(HAVE_opencv_nonfree)
       target_link_libraries(${the_target} opencv_nonfree)
     endif()
-    if(HAVE_opencv_gpucodec)
-      target_link_libraries(${the_target} opencv_gpucodec)
-    endif()
 
     set_target_properties(${the_target} PROPERTIES
       OUTPUT_NAME "${project}-example-${name}"

samples/gpu/bgfg_segm.cpp

@@ -6,12 +6,6 @@
 #include "opencv2/gpu.hpp"
 #include "opencv2/highgui.hpp"
 
-#include "opencv2/opencv_modules.hpp"
-
-#ifdef HAVE_OPENCV_NONFREE
-#  include "opencv2/nonfree/gpu.hpp"
-#endif
-
 using namespace std;
 using namespace cv;
 using namespace cv::gpu;

samples/gpu/cascadeclassifier_nvidia_api.cpp

@@ -8,11 +8,10 @@
 #include <cstdio>
 #include "opencv2/gpu/gpu.hpp"
 #include "opencv2/highgui/highgui.hpp"
-#include "opencv2/objdetect/objdetect.hpp"
 #include "opencv2/objdetect/objdetect_c.h"
 
 #ifdef HAVE_CUDA
-#include "opencv2/gpulegacy.hpp"
+#include "NCVHaarObjectDetection.hpp"
 #endif
 
 using namespace std;

samples/gpu/hog.cpp

@@ -7,7 +7,6 @@
 #include <opencv2/core/utility.hpp>
 #include "opencv2/gpu.hpp"
 #include "opencv2/highgui.hpp"
-#include "opencv2/objdetect.hpp"
 
 using namespace std;
 using namespace cv;

samples/gpu/opticalflow_nvidia_api.cpp

@@ -16,7 +16,8 @@
 #include "opencv2/highgui/highgui_c.h"
 
 #ifdef HAVE_CUDA
-#include "opencv2/gpulegacy.hpp"
+#include "NPP_staging/NPP_staging.hpp"
+#include "NCVBroxOpticalFlow.hpp"
 #endif
 
 #if !defined(HAVE_CUDA)

samples/gpu/video_reader.cpp

@@ -1,19 +1,14 @@
 #include <iostream>
-
-#include "opencv2/opencv_modules.hpp"
-
-#if defined(HAVE_OPENCV_GPUCODEC)
-
 #include <string>
 #include <vector>
 #include <algorithm>
 #include <numeric>
 
-#include <opencv2/core.hpp>
+#include <opencv2/core/core.hpp>
 #include <opencv2/core/opengl.hpp>
-#include <opencv2/gpucodec.hpp>
-#include <opencv2/highgui.hpp>
-#include <opencv2/contrib.hpp>
+#include <opencv2/gpu/gpu.hpp>
+#include <opencv2/highgui/highgui.hpp>
+#include <opencv2/contrib/contrib.hpp>
 
 int main(int argc, const char* argv[])
 {
@@ -74,13 +69,3 @@ int main(int argc, const char* argv[])
 
     return 0;
 }
-
-#else
-
-int main()
-{
-    std::cout << "OpenCV was built without GPU Video decoding support\n" << std::endl;
-    return 0;
-}
-
-#endif

samples/gpu/video_writer.cpp

@@ -1,16 +1,11 @@
 #include <iostream>
-
-#include "opencv2/opencv_modules.hpp"
-
-#if defined(HAVE_OPENCV_GPUCODEC) && defined(WIN32)
-
 #include <vector>
 #include <numeric>
 
-#include "opencv2/core.hpp"
-#include "opencv2/gpucodec.hpp"
-#include "opencv2/highgui.hpp"
-#include "opencv2/contrib.hpp"
+#include "opencv2/core/core.hpp"
+#include "opencv2/gpu/gpu.hpp"
+#include "opencv2/highgui/highgui.hpp"
+#include "opencv2/contrib/contrib.hpp"
 
 int main(int argc, const char* argv[])
 {
@@ -99,13 +94,3 @@ int main(int argc, const char* argv[])
 
     return 0;
 }
-
-#else
-
-int main()
-{
-    std::cout << "OpenCV was built without GPU Video encoding support\n" << std::endl;
-    return 0;
-}
-
-#endif