From df8b057b443c9feecc22b32141363ae7d1838030 Mon Sep 17 00:00:00 2001 From: Alexander Alekhin Date: Sat, 8 Sep 2018 16:49:11 +0000 Subject: [PATCH] avoid `Ptr<> == NULL` checks --- modules/core/src/lut.cpp | 17 +++++------------ modules/core/src/persistence_cpp.cpp | 2 +- modules/core/test/test_io.cpp | 6 +++--- .../src/ocl4dnn/src/ocl4dnn_conv_spatial.cpp | 2 +- modules/ml/test/test_mltests2.cpp | 4 ++-- samples/cpp/detect_blob.cpp | 2 +- samples/cpp/detect_mser.cpp | 2 +- 7 files changed, 14 insertions(+), 21 deletions(-) diff --git a/modules/core/src/lut.cpp b/modules/core/src/lut.cpp index 3e91bd9fcb..8f3381be4d 100644 --- a/modules/core/src/lut.cpp +++ b/modules/core/src/lut.cpp @@ -384,21 +384,14 @@ void cv::LUT( InputArray _src, InputArray _lut, OutputArray _dst ) if (_src.dims() <= 2) { bool ok = false; - Ptr body; - - if (body == NULL || ok == false) - { - ok = false; - ParallelLoopBody* p = new LUTParallelBody(src, lut, dst, &ok); - body.reset(p); - } - if (body != NULL && ok) + LUTParallelBody body(src, lut, dst, &ok); + if (ok) { Range all(0, dst.rows); - if (dst.total()>>18) - parallel_for_(all, *body, (double)std::max((size_t)1, dst.total()>>16)); + if (dst.total() >= (size_t)(1<<18)) + parallel_for_(all, body, (double)std::max((size_t)1, dst.total()>>16)); else - (*body)(all); + body(all); if (ok) return; } diff --git a/modules/core/src/persistence_cpp.cpp b/modules/core/src/persistence_cpp.cpp index 7e4ae71946..bcdee94f60 100644 --- a/modules/core/src/persistence_cpp.cpp +++ b/modules/core/src/persistence_cpp.cpp @@ -537,7 +537,7 @@ void read( const FileNode& node, SparseMat& mat, const SparseMat& default_mat ) return; } Ptr m((CvSparseMat*)cvRead((CvFileStorage*)node.fs, (CvFileNode*)*node)); - CV_Assert(CV_IS_SPARSE_MAT(m)); + CV_Assert(CV_IS_SPARSE_MAT(m.get())); m->copyToSparseMat(mat); } diff --git a/modules/core/test/test_io.cpp b/modules/core/test/test_io.cpp index c7473b9ded..33583b4d1b 100644 --- a/modules/core/test/test_io.cpp +++ b/modules/core/test/test_io.cpp @@ -288,9 +288,9 @@ protected: fs["test_sparse_mat"] >> m_s2; Ptr _m_s2(cvCreateSparseMat(m_s2)); - if( !m_s || !CV_IS_SPARSE_MAT(m_s) || - !cvTsCheckSparse(m_s, _test_sparse, 0) || - !cvTsCheckSparse(_m_s2, _test_sparse, 0)) + if( !m_s || !CV_IS_SPARSE_MAT(m_s.get()) || + !cvTsCheckSparse(m_s.get(), _test_sparse.get(), 0) || + !cvTsCheckSparse(_m_s2.get(), _test_sparse.get(), 0)) { ts->printf( cvtest::TS::LOG, "the read sparse matrix is not correct\n" ); ts->set_failed_test_info( cvtest::TS::FAIL_INVALID_OUTPUT ); diff --git a/modules/dnn/src/ocl4dnn/src/ocl4dnn_conv_spatial.cpp b/modules/dnn/src/ocl4dnn/src/ocl4dnn_conv_spatial.cpp index a3a0936bd4..68e89d5694 100644 --- a/modules/dnn/src/ocl4dnn/src/ocl4dnn_conv_spatial.cpp +++ b/modules/dnn/src/ocl4dnn/src/ocl4dnn_conv_spatial.cpp @@ -1820,7 +1820,7 @@ void OCL4DNNConvSpatial::prepareKernel(const UMat &bottom, UMat &top, std::string previous_key = key_; generateKey(); - if (key_.compare(previous_key) == 0 && bestKernelConfig != NULL) + if (key_.compare(previous_key) == 0 && bestKernelConfig) return; if (bestKernelConfig) diff --git a/modules/ml/test/test_mltests2.cpp b/modules/ml/test/test_mltests2.cpp index 1b1c21cfeb..44d5aeb992 100644 --- a/modules/ml/test/test_mltests2.cpp +++ b/modules/ml/test/test_mltests2.cpp @@ -237,7 +237,7 @@ TEST(ML_ANN, ActivationFunction) x->save(dataname + activationName[i] + ".yml"); #else Ptr y = Algorithm::load(dataname + activationName[i] + ".yml"); - ASSERT_TRUE(y != NULL) << "Could not load " << dataname + activationName[i] + ".yml"; + ASSERT_TRUE(y) << "Could not load " << dataname + activationName[i] + ".yml"; Mat testSamples = tdata->getTestSamples(); Mat rx, ry, dst; x->predict(testSamples, rx); @@ -330,7 +330,7 @@ TEST_P(ML_ANN_METHOD, Test) #endif ASSERT_FALSE(r_gold.empty()); Ptr y = Algorithm::load(filename); - ASSERT_TRUE(y != NULL) << "Could not load " << filename; + ASSERT_TRUE(y) << "Could not load " << filename; Mat rx, ry; for (int j = 0; j < 4; j++) { diff --git a/samples/cpp/detect_blob.cpp b/samples/cpp/detect_blob.cpp index 3acb8fa1fb..db86a07ee2 100644 --- a/samples/cpp/detect_blob.cpp +++ b/samples/cpp/detect_blob.cpp @@ -178,7 +178,7 @@ int main(int argc, char *argv[]) vector zone; vector > region; Mat desc, result(img.rows, img.cols, CV_8UC3); - if (b.dynamicCast() != NULL) + if (b.dynamicCast().get()) { Ptr sbd = b.dynamicCast(); sbd->detect(img, keyImg, Mat()); diff --git a/samples/cpp/detect_mser.cpp b/samples/cpp/detect_mser.cpp index 8d62b2b7e4..7c2833fea4 100644 --- a/samples/cpp/detect_mser.cpp +++ b/samples/cpp/detect_mser.cpp @@ -500,7 +500,7 @@ int main(int argc, char *argv[]) vector > region; Mat desc; - if (b.dynamicCast() != NULL) + if (b.dynamicCast().get()) { Ptr sbd = b.dynamicCast(); sbd->detectRegions(img, region, zone);