Merge pull request #2336 from czgdp1807:issue-2333

* corrected scope of CV_Error() * removed the return statement

Merge pull request #2336 from czgdp1807:issue-2333
* corrected scope of CV_Error() * removed the return statement
61cbb445 · Gagandeep Singh · Alexander Alekhin · 3146e4a4 · 61cbb445
Commit 61cbb445 authored Nov 10, 2019 by Gagandeep Singh Committed by Alexander Alekhin Nov 10, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 3 deletions

nvidiaOpticalFlow.cpp modules/cudaoptflow/src/nvidiaOpticalFlow.cpp +5 -3

No files found.
--- a/modules/cudaoptflow/src/nvidiaOpticalFlow.cpp
+++ b/modules/cudaoptflow/src/nvidiaOpticalFlow.cpp
@@ -12,7 +12,10 @@ Ptr<NvidiaOpticalFlow_1_0> cv::cuda::NvidiaOpticalFlow_1_0::create(int, int, int

 #elif !defined HAVE_NVIDIA_OPTFLOW

-CV_Error(cv::Error::HeaderIsNull, "Nvidia Optical Flow headers not found. Make sure cmake downloads it properly");
+Ptr<NvidiaOpticalFlow_1_0> cv::cuda::NvidiaOpticalFlow_1_0::create(int, int, int, NVIDIA_OF_PERF_LEVEL, bool, bool)
+{
+    CV_Error(cv::Error::HeaderIsNull, "OpenCV was build without NVIDIA OpticalFlow support");
+}

 #else

@@ -653,4 +656,4 @@ Ptr<cv::cuda::NvidiaOpticalFlow_1_0> cv::cuda::NvidiaOpticalFlow_1_0::create(
        bEnableCostBuffer,
        gpuId);
 }
-#endif
\ No newline at end of file
+#endif