From: Alexander Alekhin Date: Tue, 24 Apr 2018 10:48:21 +0000 (+0300) Subject: build: unreachable code after CV_Error() (part 2) X-Git-Tag: accepted/tizen/6.0/unified/20201030.111113~1^2~631^2~1^2~2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6b581c4e51672814e7511ed7ec73525c92319851;p=platform%2Fupstream%2Fopencv.git build: unreachable code after CV_Error() (part 2) --- diff --git a/modules/calib3d/src/circlesgrid.cpp b/modules/calib3d/src/circlesgrid.cpp index 694644b..25da6be 100644 --- a/modules/calib3d/src/circlesgrid.cpp +++ b/modules/calib3d/src/circlesgrid.cpp @@ -759,12 +759,8 @@ bool CirclesGridFinder::isDetectionCorrect() } return (vertices.size() == largeHeight * largeWidth + smallHeight * smallWidth); } - - default: - CV_Error(0, "Unknown pattern type"); } - - return false; + CV_Error(Error::StsBadArg, "Unknown pattern type"); } void CirclesGridFinder::findMCS(const std::vector &basis, std::vector &basisGraphs) diff --git a/modules/core/src/alloc.cpp b/modules/core/src/alloc.cpp index 8be7254..531af25 100644 --- a/modules/core/src/alloc.cpp +++ b/modules/core/src/alloc.cpp @@ -53,7 +53,6 @@ namespace cv { static void* OutOfMemoryError(size_t size) { CV_Error_(CV_StsNoMem, ("Failed to allocate %llu bytes", (unsigned long long)size)); - return 0; } diff --git a/modules/core/src/command_line_parser.cpp b/modules/core/src/command_line_parser.cpp index 7d5c6cc..766835f 100644 --- a/modules/core/src/command_line_parser.cpp +++ b/modules/core/src/command_line_parser.cpp @@ -1,3 +1,6 @@ +// This file is part of OpenCV project. +// 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. #include "precomp.hpp" #include @@ -364,7 +367,6 @@ bool CommandLineParser::has(const String& name) const } CV_Error_(Error::StsBadArg, ("undeclared key '%s' requested", name.c_str())); - return false; } bool CommandLineParser::check() const diff --git a/modules/core/src/gl_core_3_1.cpp b/modules/core/src/gl_core_3_1.cpp index 60d7f6f..eabb36f 100644 --- a/modules/core/src/gl_core_3_1.cpp +++ b/modules/core/src/gl_core_3_1.cpp @@ -143,6 +143,9 @@ return func; } #else +#if defined(_MSC_VER) + #pragma warning(disable : 4702) // unreachable code +#endif static void* IntGetProcAddress(const char*) { CV_Error(cv::Error::OpenGlNotSupported, "The library is compiled without OpenGL support"); diff --git a/modules/core/src/matrix.cpp b/modules/core/src/matrix.cpp index f9c4044..d9d7ebe 100644 --- a/modules/core/src/matrix.cpp +++ b/modules/core/src/matrix.cpp @@ -912,7 +912,6 @@ Mat Mat::reshape(int _cn, int _newndims, const int* _newsz) const CV_Error(CV_StsNotImplemented, "Reshaping of n-dimensional non-continuous matrices is not supported yet"); // TBD - return Mat(); } Mat Mat::reshape(int _cn, const std::vector& _newshape) const diff --git a/modules/core/src/matrix_c.cpp b/modules/core/src/matrix_c.cpp index 8b9d29e..28583cd 100644 --- a/modules/core/src/matrix_c.cpp +++ b/modules/core/src/matrix_c.cpp @@ -179,7 +179,6 @@ Mat cvarrToMat(const CvArr* arr, bool copyData, return buf; } CV_Error(CV_StsBadArg, "Unknown array type"); - return Mat(); } void extractImageCOI(const CvArr* arr, OutputArray _ch, int coi) diff --git a/modules/core/src/matrix_wrap.cpp b/modules/core/src/matrix_wrap.cpp index 3fead37..bea5c67 100644 --- a/modules/core/src/matrix_wrap.cpp +++ b/modules/core/src/matrix_wrap.cpp @@ -110,14 +110,12 @@ Mat _InputArray::getMat_(int i) const { CV_Assert( i < 0 ); CV_Error(cv::Error::StsNotImplemented, "You should explicitly call mapHost/unmapHost methods for ogl::Buffer object"); - return Mat(); } if( k == CUDA_GPU_MAT ) { CV_Assert( i < 0 ); CV_Error(cv::Error::StsNotImplemented, "You should explicitly call download method for cuda::GpuMat object"); - return Mat(); } if( k == CUDA_HOST_MEM ) @@ -130,7 +128,6 @@ Mat _InputArray::getMat_(int i) const } CV_Error(Error::StsNotImplemented, "Unknown/unsupported array type"); - return Mat(); } UMat _InputArray::getUMat(int i) const @@ -354,14 +351,12 @@ cuda::GpuMat _InputArray::getGpuMat() const if (k == OPENGL_BUFFER) { CV_Error(cv::Error::StsNotImplemented, "You should explicitly call mapDevice/unmapDevice methods for ogl::Buffer object"); - return cuda::GpuMat(); } if (k == NONE) return cuda::GpuMat(); CV_Error(cv::Error::StsNotImplemented, "getGpuMat is available only for cuda::GpuMat and cuda::HostMem"); - return cuda::GpuMat(); } void _InputArray::getGpuMatVector(std::vector& gpumv) const { @@ -516,7 +511,6 @@ Size _InputArray::size(int i) const } CV_Error(Error::StsNotImplemented, "Unknown/unsupported array type"); - return Size(); } int _InputArray::sizend(int* arrsz, int i) const @@ -716,7 +710,6 @@ int _InputArray::dims(int i) const } CV_Error(Error::StsNotImplemented, "Unknown/unsupported array type"); - return 0; } size_t _InputArray::total(int i) const @@ -845,7 +838,6 @@ int _InputArray::type(int i) const return ((const cuda::HostMem*)obj)->type(); CV_Error(Error::StsNotImplemented, "Unknown/unsupported array type"); - return 0; } int _InputArray::depth(int i) const @@ -928,7 +920,6 @@ bool _InputArray::empty() const return ((const cuda::HostMem*)obj)->empty(); CV_Error(Error::StsNotImplemented, "Unknown/unsupported array type"); - return true; } bool _InputArray::isContinuous(int i) const @@ -970,7 +961,6 @@ bool _InputArray::isContinuous(int i) const return i < 0 ? ((const cuda::GpuMat*)obj)->isContinuous() : true; CV_Error(CV_StsNotImplemented, "Unknown/unsupported array type"); - return false; } bool _InputArray::isSubmatrix(int i) const @@ -1009,7 +999,6 @@ bool _InputArray::isSubmatrix(int i) const } CV_Error(CV_StsNotImplemented, ""); - return false; } size_t _InputArray::offset(int i) const @@ -1074,7 +1063,6 @@ size_t _InputArray::offset(int i) const } CV_Error(Error::StsNotImplemented, ""); - return 0; } size_t _InputArray::step(int i) const @@ -1135,7 +1123,6 @@ size_t _InputArray::step(int i) const } CV_Error(Error::StsNotImplemented, ""); - return 0; } void _InputArray::copyTo(const _OutputArray& arr) const @@ -1459,7 +1446,6 @@ void _OutputArray::create(int d, const int* sizes, int mtype, int i, if( k == NONE ) { CV_Error(CV_StsNullPtr, "create() called for the missing output array" ); - return; } if( k == STD_VECTOR_MAT ) diff --git a/modules/core/src/opengl.cpp b/modules/core/src/opengl.cpp index 2241087..08cfb4e 100644 --- a/modules/core/src/opengl.cpp +++ b/modules/core/src/opengl.cpp @@ -1304,10 +1304,15 @@ void cv::ogl::Arrays::release() void cv::ogl::Arrays::setAutoRelease(bool flag) { +#ifndef HAVE_OPENGL + CV_UNUSED(flag); + throw_no_ogl(); +#else vertex_.setAutoRelease(flag); color_.setAutoRelease(flag); normal_.setAutoRelease(flag); texCoord_.setAutoRelease(flag); +#endif } void cv::ogl::Arrays::bind() const diff --git a/modules/core/src/umatrix.cpp b/modules/core/src/umatrix.cpp index 2fd0ab9..303b6be 100644 --- a/modules/core/src/umatrix.cpp +++ b/modules/core/src/umatrix.cpp @@ -837,8 +837,6 @@ UMat UMat::reshape(int _cn, int _newndims, const int* _newsz) const } CV_Error(CV_StsNotImplemented, "Reshaping of n-dimensional non-continuous matrices is not supported yet"); - // TBD - return UMat(); } Mat UMat::getMat(int accessFlags) const diff --git a/modules/core/test/test_eigen.cpp b/modules/core/test/test_eigen.cpp index 8a90c6e..b2f09ea 100644 --- a/modules/core/test/test_eigen.cpp +++ b/modules/core/test/test_eigen.cpp @@ -174,7 +174,6 @@ bool Core_EigenTest::check_pair_count(const cv::Mat& src, const cv::Mat& evalues std::cout << "Number of rows: " << evalues.rows << " Number of cols: " << evalues.cols << endl; std::cout << "Size of src symmetric matrix: " << src.rows << " * " << src.cols << endl; std::cout << endl; CV_Error(CORE_EIGEN_ERROR_COUNT, MESSAGE_ERROR_COUNT); - return false; } return true; } @@ -190,7 +189,6 @@ bool Core_EigenTest::check_pair_count(const cv::Mat& src, const cv::Mat& evalues std::cout << "Number of rows: " << evectors.rows << " Number of cols: " << evectors.cols << endl; std:: cout << "Size of src symmetric matrix: " << src.rows << " * " << src.cols << endl; std::cout << endl; CV_Error (CORE_EIGEN_ERROR_SIZE, MESSAGE_ERROR_SIZE); - return false; } if (!(evalues.rows == right_eigen_pair_count && evalues.cols == 1)) @@ -199,7 +197,6 @@ bool Core_EigenTest::check_pair_count(const cv::Mat& src, const cv::Mat& evalues std::cout << "Number of rows: " << evalues.rows << " Number of cols: " << evalues.cols << endl; std:: cout << "Size of src symmetric matrix: " << src.rows << " * " << src.cols << endl; std::cout << endl; CV_Error (CORE_EIGEN_ERROR_COUNT, MESSAGE_ERROR_COUNT); - return false; } return true; @@ -237,7 +234,6 @@ bool Core_EigenTest::check_orthogonality(const cv::Mat& U) std::cout << endl; std::cout << "Checking orthogonality of matrix " << U << ": "; print_information(i, U, diff, eps_vec); CV_Error(CORE_EIGEN_ERROR_ORTHO, MESSAGE_ERROR_ORTHO); - return false; } } @@ -257,7 +253,6 @@ bool Core_EigenTest::check_pairs_order(const cv::Mat& eigen_values) std::cout << "Pair of indexes with non descending of eigen values: (" << i << ", " << i+1 << ")." << endl; std::cout << endl; CV_Error(CORE_EIGEN_ERROR_ORDER, MESSAGE_ERROR_ORDER); - return false; } break; @@ -272,7 +267,6 @@ bool Core_EigenTest::check_pairs_order(const cv::Mat& eigen_values) std::cout << "Pair of indexes with non descending of eigen values: (" << i << ", " << i+1 << ")." << endl; std::cout << endl; CV_Error(CORE_EIGEN_ERROR_ORDER, "Eigen values are not sorted in descending order."); - return false; } break; @@ -331,7 +325,6 @@ bool Core_EigenTest::test_pairs(const cv::Mat& src) std::cout << endl; std::cout << "Checking accuracy of eigen vectors computing for matrix " << src << ": "; print_information(i, src, diff, eps_vec); CV_Error(CORE_EIGEN_ERROR_DIFF, MESSAGE_ERROR_DIFF_2); - return false; } } @@ -360,7 +353,6 @@ bool Core_EigenTest::test_values(const cv::Mat& src) std::cout << endl; std::cout << "Checking accuracy of eigen values computing for matrix " << src << ": "; print_information(i, src, diff, eps_val); CV_Error(CORE_EIGEN_ERROR_DIFF, MESSAGE_ERROR_DIFF_1); - return false; } } diff --git a/modules/dnn/include/opencv2/dnn/dnn.inl.hpp b/modules/dnn/include/opencv2/dnn/dnn.inl.hpp index be2e1c4..4231896 100644 --- a/modules/dnn/include/opencv2/dnn/dnn.inl.hpp +++ b/modules/dnn/include/opencv2/dnn/dnn.inl.hpp @@ -269,17 +269,16 @@ inline int DictValue::size() const { case Param::INT: return (int)pi->size(); - break; case Param::STRING: return (int)ps->size(); - break; case Param::REAL: return (int)pd->size(); - break; - default: - CV_Error(Error::StsInternal, ""); - return -1; } +#ifdef __OPENCV_BUILD + CV_Error(Error::StsInternal, ""); +#else + CV_ErrorNoReturn(Error::StsInternal, ""); +#endif } inline std::ostream &operator<<(std::ostream &stream, const DictValue &dictv) diff --git a/modules/features2d/src/matchers.cpp b/modules/features2d/src/matchers.cpp index 6cb7670..486b1b9 100644 --- a/modules/features2d/src/matchers.cpp +++ b/modules/features2d/src/matchers.cpp @@ -1360,11 +1360,13 @@ Ptr FlannBasedMatcher::clone( bool emptyTrainData ) const { CV_Error( Error::StsNotImplemented, "deep clone functionality is not implemented, because " "Flann::Index has not copy constructor or clone method "); +#if 0 //matcher->flannIndex; matcher->addedDescCount = addedDescCount; matcher->mergedDescriptors = DescriptorCollection( mergedDescriptors ); std::transform( trainDescCollection.begin(), trainDescCollection.end(), matcher->trainDescCollection.begin(), clone_op ); +#endif } return matcher; } diff --git a/modules/highgui/src/window.cpp b/modules/highgui/src/window.cpp index 251d1d3..663b445 100644 --- a/modules/highgui/src/window.cpp +++ b/modules/highgui/src/window.cpp @@ -530,7 +530,6 @@ static const char* NO_QT_ERR_MSG = "The library is compiled without QT support"; cv::QtFont cv::fontQt(const String&, int, Scalar, int, int, int) { CV_Error(CV_StsNotImplemented, NO_QT_ERR_MSG); - return QtFont(); } void cv::addText( const Mat&, const String&, Point, const QtFont&) @@ -556,7 +555,6 @@ void cv::displayOverlay(const String&, const String&, int ) int cv::startLoop(int (*)(int argc, char *argv[]), int , char**) { CV_Error(CV_StsNotImplemented, NO_QT_ERR_MSG); - return 0; } void cv::stopLoop() @@ -577,7 +575,6 @@ void cv::loadWindowParameters(const String&) int cv::createButton(const String&, ButtonCallback, void*, int , bool ) { CV_Error(CV_StsNotImplemented, NO_QT_ERR_MSG); - return 0; } #endif @@ -606,17 +603,16 @@ void cv::setWindowTitle(const String&, const String&) } #define CV_NO_GUI_ERROR(funcname) \ - cvError( CV_StsError, funcname, \ + cv::errorNoReturn(cv::Error::StsError, \ "The function is not implemented. " \ "Rebuild the library with Windows, GTK+ 2.x or Carbon support. "\ "If you are on Ubuntu or Debian, install libgtk2.0-dev and pkg-config, then re-run cmake or configure script", \ - __FILE__, __LINE__ ) + funcname, __FILE__, __LINE__) CV_IMPL int cvNamedWindow( const char*, int ) { CV_NO_GUI_ERROR("cvNamedWindow"); - return -1; } CV_IMPL void cvDestroyWindow( const char* ) @@ -651,7 +647,6 @@ cvCreateTrackbar( const char*, const char*, int*, int, CvTrackbarCallback ) { CV_NO_GUI_ERROR( "cvCreateTrackbar" ); - return -1; } CV_IMPL int @@ -660,7 +655,6 @@ cvCreateTrackbar2( const char* /*trackbar_name*/, const char* /*window_name*/, void* /*userdata*/ ) { CV_NO_GUI_ERROR( "cvCreateTrackbar2" ); - return -1; } CV_IMPL void @@ -672,7 +666,6 @@ cvSetMouseCallback( const char*, CvMouseCallback, void* ) CV_IMPL int cvGetTrackbarPos( const char*, const char* ) { CV_NO_GUI_ERROR( "cvGetTrackbarPos" ); - return -1; } CV_IMPL void cvSetTrackbarPos( const char*, const char*, int ) @@ -693,33 +686,28 @@ CV_IMPL void cvSetTrackbarMin(const char*, const char*, int) CV_IMPL void* cvGetWindowHandle( const char* ) { CV_NO_GUI_ERROR( "cvGetWindowHandle" ); - return 0; } CV_IMPL const char* cvGetWindowName( void* ) { CV_NO_GUI_ERROR( "cvGetWindowName" ); - return 0; } CV_IMPL int cvWaitKey( int ) { CV_NO_GUI_ERROR( "cvWaitKey" ); - return -1; } CV_IMPL int cvInitSystem( int , char** ) { CV_NO_GUI_ERROR( "cvInitSystem" ); - return -1; } CV_IMPL int cvStartWindowThread() { CV_NO_GUI_ERROR( "cvStartWindowThread" ); - return -1; } //-------- Qt --------- @@ -742,7 +730,6 @@ CV_IMPL int cvStartLoop(int (*)(int argc, char *argv[]), int , char* argv[]) { (void)argv; CV_NO_GUI_ERROR("cvStartLoop"); - return -1; } CV_IMPL void cvStopLoop() @@ -763,7 +750,6 @@ CV_IMPL void cvSaveWindowParameters(const char* ) CV_IMPL int cvCreateButton(const char*, void (*)(int, void*), void*, int, int) { CV_NO_GUI_ERROR("cvCreateButton"); - return -1; } diff --git a/modules/imgcodecs/src/rgbe.cpp b/modules/imgcodecs/src/rgbe.cpp index fd95732..5152795 100644 --- a/modules/imgcodecs/src/rgbe.cpp +++ b/modules/imgcodecs/src/rgbe.cpp @@ -99,7 +99,6 @@ static int rgbe_error(int rgbe_error_code, const char *msg) CV_Error(cv::Error::StsError, cv::String("RGBE error: \n") + cv::String(msg)); } - return RGBE_RETURN_FAILURE; } /* standard conversion from float pixels to rgbe pixels */ diff --git a/modules/imgproc/src/colormap.cpp b/modules/imgproc/src/colormap.cpp index 3e5068d..83e4878 100644 --- a/modules/imgproc/src/colormap.cpp +++ b/modules/imgproc/src/colormap.cpp @@ -126,9 +126,8 @@ static Mat interp1(InputArray _x, InputArray _Y, InputArray _xi) case CV_32SC1: return interp1_(x,Y,xi); break; case CV_32FC1: return interp1_(x,Y,xi); break; case CV_64FC1: return interp1_(x,Y,xi); break; - default: CV_Error(Error::StsUnsupportedFormat, ""); break; } - return Mat(); + CV_Error(Error::StsUnsupportedFormat, ""); } namespace colormap diff --git a/modules/imgproc/src/connectedcomponents.cpp b/modules/imgproc/src/connectedcomponents.cpp index f428cf3..bbc27dc 100644 --- a/modules/imgproc/src/connectedcomponents.cpp +++ b/modules/imgproc/src/connectedcomponents.cpp @@ -3980,7 +3980,6 @@ namespace cv{ } CV_Error(CV_StsUnsupportedFormat, "unsupported label/image type"); - return -1; } } @@ -4003,7 +4002,6 @@ int cv::connectedComponents(InputArray img_, OutputArray _labels, int connectivi } else{ CV_Error(CV_StsUnsupportedFormat, "the type of labels must be 16u or 32s"); - return 0; } } diff --git a/modules/imgproc/src/filter.cpp b/modules/imgproc/src/filter.cpp index 5cbaf3f..194040f 100644 --- a/modules/imgproc/src/filter.cpp +++ b/modules/imgproc/src/filter.cpp @@ -3642,8 +3642,6 @@ cv::Ptr cv::getLinearRowFilter( int srcType, int bufType, CV_Error_( CV_StsNotImplemented, ("Unsupported combination of source format (=%d), and buffer format (=%d)", srcType, bufType)); - - return Ptr(); } @@ -3739,8 +3737,6 @@ cv::Ptr cv::getLinearColumnFilter( int bufType, int dstTyp CV_Error_( CV_StsNotImplemented, ("Unsupported combination of buffer format (=%d), and destination format (=%d)", bufType, dstType)); - - return Ptr(); } @@ -4491,8 +4487,6 @@ cv::Ptr cv::getLinearFilter(int srcType, int dstType, CV_Error_( CV_StsNotImplemented, ("Unsupported combination of source format (=%d), and destination format (=%d)", srcType, dstType)); - - return Ptr(); } diff --git a/modules/imgproc/src/morph.cpp b/modules/imgproc/src/morph.cpp index ca92da3..0c3a1e4 100644 --- a/modules/imgproc/src/morph.cpp +++ b/modules/imgproc/src/morph.cpp @@ -888,7 +888,6 @@ cv::Ptr cv::getMorphologyRowFilter(int op, int type, int ksiz } CV_Error_( CV_StsNotImplemented, ("Unsupported data type (=%d)", type)); - return Ptr(); } cv::Ptr cv::getMorphologyColumnFilter(int op, int type, int ksize, int anchor) @@ -935,7 +934,6 @@ cv::Ptr cv::getMorphologyColumnFilter(int op, int type, in } CV_Error_( CV_StsNotImplemented, ("Unsupported data type (=%d)", type)); - return Ptr(); } @@ -973,7 +971,6 @@ cv::Ptr cv::getMorphologyFilter(int op, int type, InputArray _ke } CV_Error_( CV_StsNotImplemented, ("Unsupported data type (=%d)", type)); - return Ptr(); } diff --git a/modules/imgproc/src/precomp.hpp b/modules/imgproc/src/precomp.hpp index 55241d9..400b7cc 100644 --- a/modules/imgproc/src/precomp.hpp +++ b/modules/imgproc/src/precomp.hpp @@ -117,9 +117,7 @@ inline bool isStorageOrMat(void * arr) return true; else if (CV_IS_MAT( arr )) return false; - else - CV_Error( CV_StsBadArg, "Destination is not CvMemStorage* nor CvMat*" ); - return false; + CV_Error( CV_StsBadArg, "Destination is not CvMemStorage* nor CvMat*" ); } #endif /*__OPENCV_CV_INTERNAL_H_*/ diff --git a/modules/imgproc/src/smooth.cpp b/modules/imgproc/src/smooth.cpp index 78c85d7..9ac01b7 100644 --- a/modules/imgproc/src/smooth.cpp +++ b/modules/imgproc/src/smooth.cpp @@ -1332,8 +1332,6 @@ cv::Ptr cv::getRowSumFilter(int srcType, int sumType, int ksi CV_Error_( CV_StsNotImplemented, ("Unsupported combination of source format (=%d), and buffer format (=%d)", srcType, sumType)); - - return Ptr(); } @@ -1374,8 +1372,6 @@ cv::Ptr cv::getColumnSumFilter(int sumType, int dstType, i CV_Error_( CV_StsNotImplemented, ("Unsupported combination of sum format (=%d), and destination format (=%d)", sumType, dstType)); - - return Ptr(); } @@ -1656,8 +1652,6 @@ static Ptr getSqrRowSumFilter(int srcType, int sumType, int ksize CV_Error_( CV_StsNotImplemented, ("Unsupported combination of source format (=%d), and buffer format (=%d)", srcType, sumType)); - - return Ptr(); } } diff --git a/modules/imgproc/src/undistort.cpp b/modules/imgproc/src/undistort.cpp index a10561d..d083ceb 100644 --- a/modules/imgproc/src/undistort.cpp +++ b/modules/imgproc/src/undistort.cpp @@ -613,7 +613,6 @@ static Point2f mapPointSpherical(const Point2f& p, float alpha, Vec4d* J, int pr return Point2f((float)asin(x1), (float)asin(y1)); } CV_Error(CV_StsBadArg, "Unknown projection type"); - return Point2f(); } diff --git a/modules/imgproc/test/test_boundingrect.cpp b/modules/imgproc/test/test_boundingrect.cpp index 332c593..52a84e5 100644 --- a/modules/imgproc/test/test_boundingrect.cpp +++ b/modules/imgproc/test/test_boundingrect.cpp @@ -125,7 +125,6 @@ template bool CV_BoundingRectTest::checking_function_work(vector

ExposureCompensator::createDefault(int type) if (type == GAIN_BLOCKS) return makePtr(); CV_Error(Error::StsBadArg, "unsupported exposure compensation method"); - return Ptr(); } diff --git a/modules/videoio/src/cap_mjpeg_encoder.cpp b/modules/videoio/src/cap_mjpeg_encoder.cpp index a518404..b564f60 100644 --- a/modules/videoio/src/cap_mjpeg_encoder.cpp +++ b/modules/videoio/src/cap_mjpeg_encoder.cpp @@ -96,7 +96,6 @@ static bool createEncodeHuffmanTable( const int* src, unsigned* table, int max_s if( size > max_size ) { CV_Error(CV_StsOutOfRange, "too big maximum Huffman code size"); - return false; } memset( table, 0, size*sizeof(table[0]));