Merge pull request #11375 from alalek:warnings_unreachable_code

modules/core/include/opencv2/core/private.cuda.hpp

@@ -104,13 +104,13 @@ namespace cv { namespace cuda {
 
 #ifndef HAVE_CUDA
 
-static inline void throw_no_cuda() { CV_Error(cv::Error::GpuNotSupported, "The library is compiled without CUDA support"); }
+static inline CV_NORETURN void throw_no_cuda() { CV_Error(cv::Error::GpuNotSupported, "The library is compiled without CUDA support"); }
 
 #else // HAVE_CUDA
 
 #define nppSafeSetStream(oldStream, newStream) { if(oldStream != newStream) { cudaStreamSynchronize(oldStream); nppSetStream(newStream); } }
 
-static inline void throw_no_cuda() { CV_Error(cv::Error::StsNotImplemented, "The called functionality is disabled for current build or platform"); }
+static inline CV_NORETURN void throw_no_cuda() { CV_Error(cv::Error::StsNotImplemented, "The called functionality is disabled for current build or platform"); }
 
 namespace cv { namespace cuda
 {

modules/core/src/cuda_gpu_mat.cpp

@@ -488,7 +488,6 @@ GpuMat& cv::cuda::GpuMat::setTo(Scalar s, Stream& _stream)
     (void) s;
     (void) _stream;
     throw_no_cuda();
-    return *this;
 }
 
 GpuMat& cv::cuda::GpuMat::setTo(Scalar s, InputArray _mask, Stream& _stream)
@@ -497,7 +496,6 @@ GpuMat& cv::cuda::GpuMat::setTo(Scalar s, InputArray _mask, Stream& _stream)
     (void) _mask;
     (void) _stream;
     throw_no_cuda();
-    return *this;
 }
 
 void cv::cuda::GpuMat::convertTo(OutputArray _dst, int rtype, Stream& _stream) const

modules/core/src/cuda_host_mem.cpp

@@ -138,7 +138,6 @@ MatAllocator* cv::cuda::HostMem::getAllocator(AllocType alloc_type)
 #ifndef HAVE_CUDA
     (void) alloc_type;
     throw_no_cuda();
-    return NULL;
 #else
     static std::map<unsigned int, Ptr<MatAllocator> > allocators;
 
@@ -302,7 +301,6 @@ GpuMat cv::cuda::HostMem::createGpuMatHeader() const
 {
 #ifndef HAVE_CUDA
     throw_no_cuda();
-    return GpuMat();
 #else
     CV_Assert( alloc_type == SHARED );
 

modules/core/src/cuda_stream.cpp

@@ -450,7 +450,6 @@ bool cv::cuda::Stream::queryIfComplete() const
 {
 #ifndef HAVE_CUDA
     throw_no_cuda();
-    return false;
 #else
     cudaError_t err = cudaStreamQuery(impl_->stream);
 
@@ -526,8 +525,6 @@ Stream& cv::cuda::Stream::Null()
 {
 #ifndef HAVE_CUDA
     throw_no_cuda();
-    static Stream stream;
-    return stream;
 #else
     const int deviceId = getDevice();
     return initializer.getNullStream(deviceId);
@@ -716,7 +713,6 @@ GpuMat cv::cuda::BufferPool::getBuffer(int rows, int cols, int type)
     (void) cols;
     (void) type;
     throw_no_cuda();
-    return GpuMat();
 #else
     GpuMat buf(allocator_);
     buf.create(rows, cols, type);
@@ -806,7 +802,6 @@ bool cv::cuda::Event::queryIfComplete() const
 {
 #ifndef HAVE_CUDA
     throw_no_cuda();
-    return false;
 #else
     cudaError_t err = cudaEventQuery(impl_->event);
 
@@ -833,7 +828,6 @@ float cv::cuda::Event::elapsedTime(const Event& start, const Event& end)
     (void) start;
     (void) end;
     throw_no_cuda();
-    return 0.0f;
 #else
     float ms;
     cudaSafeCall( cudaEventElapsedTime(&ms, start.impl_->event, end.impl_->event) );

modules/core/src/gl_core_3_1.cpp

@@ -146,7 +146,6 @@
     static void* IntGetProcAddress(const char*)
     {
         CV_Error(cv::Error::OpenGlNotSupported, "The library is compiled without OpenGL support");
-        return 0;
     }
 #endif
 

modules/core/src/opengl.cpp

@@ -57,7 +57,7 @@ using namespace cv::cuda;
 namespace
 {
 #ifndef HAVE_OPENGL
-inline static void throw_no_ogl() { CV_Error(cv::Error::OpenGlNotSupported, "The library is compiled without OpenGL support"); }
+inline static CV_NORETURN void throw_no_ogl() { CV_Error(cv::Error::OpenGlNotSupported, "The library is compiled without OpenGL support"); }
 #elif defined _DEBUG
 inline static bool checkError(const char* file, const int line, const char* func = 0)
 {
@@ -82,8 +82,7 @@ inline static bool checkError(const char* file, const int line, const char* func
         default:
             msg = "Unknown error";
         };
-        cvError(CV_OpenGlApiCallError, func, msg, file, line);
-        return false;
+        cv::errorNoReturn(Error::OpenGlApiCallError, func, msg, file, line);
     }
     return true;
 }
@@ -697,7 +696,6 @@ cv::ogl::Buffer cv::ogl::Buffer::clone(Target target, bool autoRelease) const
     (void) target;
     (void) autoRelease;
     throw_no_ogl();
-    return cv::ogl::Buffer();
 #else
     ogl::Buffer buf;
     buf.copyFrom(*this, target, autoRelease);
@@ -731,7 +729,6 @@ Mat cv::ogl::Buffer::mapHost(Access access)
 #ifndef HAVE_OPENGL
     (void) access;
     throw_no_ogl();
-    return Mat();
 #else
     return Mat(rows_, cols_, type_, impl_->mapHost(access));
 #endif
@@ -750,11 +747,9 @@ GpuMat cv::ogl::Buffer::mapDevice()
 {
 #ifndef HAVE_OPENGL
     throw_no_ogl();
-    return GpuMat();
 #else
     #ifndef HAVE_CUDA
         throw_no_cuda();
-        return GpuMat();
     #else
         return GpuMat(rows_, cols_, type_, impl_->mapDevice());
     #endif
@@ -779,12 +774,10 @@ cuda::GpuMat cv::ogl::Buffer::mapDevice(cuda::Stream& stream)
 #ifndef HAVE_OPENGL
     (void) stream;
     throw_no_ogl();
-    return GpuMat();
 #else
     #ifndef HAVE_CUDA
         (void) stream;
         throw_no_cuda();
-        return GpuMat();
     #else
         return GpuMat(rows_, cols_, type_, impl_->mapDevice(cuda::StreamAccessor::getStream(stream)));
     #endif
@@ -810,7 +803,6 @@ unsigned int cv::ogl::Buffer::bufId() const
 {
 #ifndef HAVE_OPENGL
     throw_no_ogl();
-    return 0;
 #else
     return impl_->bufId();
 #endif
@@ -1216,7 +1208,6 @@ unsigned int cv::ogl::Texture2D::texId() const
 {
 #ifndef HAVE_OPENGL
     throw_no_ogl();
-    return 0;
 #else
     return impl_->texId();
 #endif

modules/stitching/src/blenders.cpp

@@ -74,7 +74,6 @@ Ptr<Blender> Blender::createDefault(int type, bool try_gpu)
     if (type == MULTI_BAND)
         return makePtr<MultiBandBlender>(try_gpu);
     CV_Error(Error::StsBadArg, "unsupported blending method");
-    return Ptr<Blender>();
 }
 
 

modules/stitching/src/timelapsers.cpp

@@ -53,7 +53,6 @@ Ptr<Timelapser> Timelapser::createDefault(int type)
     if (type == CROP)
         return makePtr<TimelapserCrop>();
     CV_Error(Error::StsBadArg, "unsupported timelapsing method");
-    return Ptr<Timelapser>();
 }
 
 

modules/stitching/src/warpers_cuda.cpp

@@ -163,7 +163,6 @@ Rect cv::detail::PlaneWarperGpu::buildMaps(Size src_size, InputArray K, InputArr
     (void)xmap;
     (void)ymap;
     throw_no_cuda();
-    return Rect();
 #else
     projector_.setCameraParams(K, R, T);
 
@@ -198,7 +197,6 @@ Point cv::detail::PlaneWarperGpu::warp(const cuda::GpuMat & src, InputArray K, I
     (void)border_mode;
     (void)dst;
     throw_no_cuda();
-    return Point();
 #else
     Rect dst_roi = buildMaps(src.size(), K, R, T, d_xmap_, d_ymap_);
     dst.create(dst_roi.height + 1, dst_roi.width + 1, src.type());
@@ -216,7 +214,6 @@ Rect cv::detail::SphericalWarperGpu::buildMaps(Size src_size, InputArray K, Inpu
     (void)xmap;
     (void)ymap;
     throw_no_cuda();
-    return Rect();
 #else
     projector_.setCameraParams(K, R);
 
@@ -242,7 +239,6 @@ Point cv::detail::SphericalWarperGpu::warp(const cuda::GpuMat & src, InputArray
     (void)border_mode;
     (void)dst;
     throw_no_cuda();
-    return Point();
 #else
     Rect dst_roi = buildMaps(src.size(), K, R, d_xmap_, d_ymap_);
     dst.create(dst_roi.height + 1, dst_roi.width + 1, src.type());
@@ -262,7 +258,6 @@ Rect cv::detail::CylindricalWarperGpu::buildMaps(Size src_size, InputArray K, In
     (void)xmap;
     (void)ymap;
     throw_no_cuda();
-    return Rect();
 #else
     projector_.setCameraParams(K, R);
 
@@ -288,7 +283,6 @@ Point cv::detail::CylindricalWarperGpu::warp(const cuda::GpuMat & src, InputArra
     (void)border_mode;
     (void)dst;
     throw_no_cuda();
-    return Point();
 #else
     Rect dst_roi = buildMaps(src.size(), K, R, d_xmap_, d_ymap_);
     dst.create(dst_roi.height + 1, dst_roi.width + 1, src.type());

modules/superres/src/btv_l1_cuda.cpp

@@ -55,7 +55,6 @@ using namespace cv::superres::detail;
 Ptr<SuperResolution> cv::superres::createSuperResolution_BTVL1_CUDA()
 {
     CV_Error(Error::StsNotImplemented, "The called functionality is disabled for current build or platform");
-    return Ptr<SuperResolution>();
 }
 
 #else // HAVE_CUDA

modules/superres/src/frame_source.cpp

@@ -196,9 +196,8 @@ Ptr<FrameSource> cv::superres::createFrameSource_Camera(int deviceId)
 
 Ptr<FrameSource> cv::superres::createFrameSource_Video_CUDA(const String& fileName)
 {
-    (void) fileName;
+    CV_UNUSED(fileName);
     CV_Error(cv::Error::StsNotImplemented, "The called functionality is disabled for current build or platform");
-    return Ptr<FrameSource>();
 }
 
 #else // HAVE_OPENCV_CUDACODEC

modules/superres/src/optical_flow.cpp

@@ -411,25 +411,21 @@ Ptr<cv::superres::DualTVL1OpticalFlow> cv::superres::createOptFlow_DualTVL1()
 Ptr<cv::superres::FarnebackOpticalFlow> cv::superres::createOptFlow_Farneback_CUDA()
 {
     CV_Error(cv::Error::StsNotImplemented, "The called functionality is disabled for current build or platform");
-    return Ptr<cv::superres::FarnebackOpticalFlow>();
 }
 
 Ptr<cv::superres::DualTVL1OpticalFlow> cv::superres::createOptFlow_DualTVL1_CUDA()
 {
     CV_Error(cv::Error::StsNotImplemented, "The called functionality is disabled for current build or platform");
-    return Ptr<cv::superres::DualTVL1OpticalFlow>();
 }
 
 Ptr<cv::superres::BroxOpticalFlow> cv::superres::createOptFlow_Brox_CUDA()
 {
     CV_Error(cv::Error::StsNotImplemented, "The called functionality is disabled for current build or platform");
-    return Ptr<cv::superres::BroxOpticalFlow>();
 }
 
 Ptr<cv::superres::PyrLKOpticalFlow> cv::superres::createOptFlow_PyrLK_CUDA()
 {
     CV_Error(cv::Error::StsNotImplemented, "The called functionality is disabled for current build or platform");
-    return Ptr<cv::superres::PyrLKOpticalFlow>();
 }
 
 #else // HAVE_OPENCV_CUDAOPTFLOW

modules/videostab/src/global_motion.cpp

@@ -546,9 +546,8 @@ Mat MotionEstimatorL1::estimate(InputArray points0, InputArray points1, bool *ok
 
 #ifndef HAVE_CLP
 
+    CV_UNUSED(ok);
     CV_Error(Error::StsError, "The library is built without Clp support");
-    if (ok) *ok = false;
-    return Mat::eye(3, 3, CV_32F);
 
 #else
 

modules/videostab/src/inpainting.cpp

@@ -329,12 +329,12 @@ MotionInpainter::MotionInpainter()
 {
 #ifdef HAVE_OPENCV_CUDAOPTFLOW
     setOptFlowEstimator(makePtr<DensePyrLkOptFlowEstimatorGpu>());
-#else
-    CV_Error(Error::StsNotImplemented, "Current implementation of MotionInpainter requires CUDA");
-#endif
     setFlowErrorThreshold(1e-4f);
     setDistThreshold(5.f);
     setBorderMode(BORDER_REPLICATE);
+#else
+    CV_Error(Error::StsNotImplemented, "Current implementation of MotionInpainter requires CUDA");
+#endif
 }