diff --git a/modules/bioinspired/src/retina.cpp b/modules/bioinspired/src/retina.cpp index f856683bc..11c8e7624 100644 --- a/modules/bioinspired/src/retina.cpp +++ b/modules/bioinspired/src/retina.cpp @@ -562,7 +562,7 @@ bool RetinaImpl::ocl_run(InputArray inputMatToConvert) void RetinaImpl::run(InputArray inputMatToConvert) { - CV_OCL_RUN((_ocl_retina != 0 && inputMatToConvert.isUMat()), ocl_run(inputMatToConvert)); + CV_OCL_RUN((_ocl_retina && inputMatToConvert.isUMat()), ocl_run(inputMatToConvert)); _wasOCLRunCalled = false; // first convert input image to the compatible format : std::valarray @@ -830,7 +830,7 @@ bool RetinaImpl::_convertCvMat2ValarrayBuffer(InputArray inputMat, std::valarray void RetinaImpl::clearBuffers() { #ifdef HAVE_OPENCL - if (_ocl_retina != 0) + if (_ocl_retina) _ocl_retina->clearBuffers(); #endif diff --git a/modules/rgbd/src/odometry.cpp b/modules/rgbd/src/odometry.cpp index ac9d80cf2..e95e225e6 100755 --- a/modules/rgbd/src/odometry.cpp +++ b/modules/rgbd/src/odometry.cpp @@ -1055,8 +1055,8 @@ bool Odometry::compute(Ptr& srcFrame, Ptr& dstFram Size Odometry::prepareFrameCache(Ptr &frame, int /*cacheType*/) const { - if(frame == 0) - CV_Error(Error::StsBadArg, "Null frame pointer.\n"); + if (!frame) + CV_Error(Error::StsBadArg, "Null frame pointer."); return Size(); } diff --git a/modules/text/src/erfilter.cpp b/modules/text/src/erfilter.cpp index 529aced13..0f6ed1e78 100644 --- a/modules/text/src/erfilter.cpp +++ b/modules/text/src/erfilter.cpp @@ -665,12 +665,12 @@ void ERFilterNM::er_merge(ERStat *parent, ERStat *child) child->level = child->level*thresholdDelta; // before saving calculate P(child|character) and filter if possible - if (classifier != NULL) + if (classifier) { child->probability = classifier->eval(*child); } - if ( (((classifier!=NULL)?(child->probability >= minProbability):true)||(nonMaxSuppression)) && + if ( (((classifier)?(child->probability >= minProbability):true)||(nonMaxSuppression)) && ((child->area >= (minArea*region_mask.rows*region_mask.cols)) && (child->area <= (maxArea*region_mask.rows*region_mask.cols)) && (child->rect.width > 2) && (child->rect.height > 2)) ) @@ -858,12 +858,12 @@ ERStat* ERFilterNM::er_tree_filter ( InputArray image, ERStat * stat, ERStat *pa // calculate P(child|character) and filter if possible - if ( (classifier != NULL) && (stat->parent != NULL) ) + if (classifier && (stat->parent != NULL)) { stat->probability = classifier->eval(*stat); } - if ( ( ((classifier != NULL)?(stat->probability >= minProbability):true) && + if ( ( ((classifier)?(stat->probability >= minProbability):true) && ((stat->area >= minArea*region_mask.rows*region_mask.cols) && (stat->area <= maxArea*region_mask.rows*region_mask.cols)) ) || (stat->parent == NULL) ) diff --git a/modules/tracking/samples/tracker.cpp b/modules/tracking/samples/tracker.cpp index 5191da216..ab862554b 100644 --- a/modules/tracking/samples/tracker.cpp +++ b/modules/tracking/samples/tracker.cpp @@ -93,7 +93,7 @@ int main( int argc, char** argv ){ //instantiates the specific Tracker Ptr tracker = createTrackerByName(tracker_algorithm); - if( tracker == NULL ) + if (!tracker) { cout << "***Error in the instantiation of the tracker...***\n"; return -1; diff --git a/modules/tracking/samples/tracker_dataset.cpp b/modules/tracking/samples/tracker_dataset.cpp index 24d3dfc13..1dbeb4c84 100644 --- a/modules/tracking/samples/tracker_dataset.cpp +++ b/modules/tracking/samples/tracker_dataset.cpp @@ -145,7 +145,7 @@ int main(int argc, char *argv[]) //Create Tracker Ptr tracker = createTrackerByName(tracker_algorithm); - if (tracker == NULL) + if (!tracker) { cout << "***Error in the instantiation of the tracker...***\n"; getchar(); diff --git a/modules/tracking/src/multiTracker.cpp b/modules/tracking/src/multiTracker.cpp index 04e1c0c00..45ca19ccd 100644 --- a/modules/tracking/src/multiTracker.cpp +++ b/modules/tracking/src/multiTracker.cpp @@ -47,7 +47,7 @@ namespace cv bool MultiTracker_Alt::addTarget(InputArray image, const Rect2d& boundingBox, Ptr tracker_algorithm) { Ptr tracker = tracker_algorithm; - if (tracker == NULL) + if (!tracker) return false; if (!tracker->init(image, boundingBox)) diff --git a/modules/tracking/src/tracker.cpp b/modules/tracking/src/tracker.cpp index ad4765d82..f692b5d62 100644 --- a/modules/tracking/src/tracker.cpp +++ b/modules/tracking/src/tracker.cpp @@ -70,7 +70,7 @@ bool Tracker::init( InputArray image, const Rect2d& boundingBox ) bool initTracker = initImpl( image.getMat(), boundingBox ); //check if the model component is initialized - if( model == 0 ) + if (!model) { CV_Error( -1, "The model is not initialized" ); } diff --git a/modules/tracking/src/trackerFeatureSet.cpp b/modules/tracking/src/trackerFeatureSet.cpp index 99ec4944b..9896f0ffa 100644 --- a/modules/tracking/src/trackerFeatureSet.cpp +++ b/modules/tracking/src/trackerFeatureSet.cpp @@ -101,7 +101,7 @@ bool TrackerFeatureSet::addTrackerFeature( String trackerFeatureType ) } Ptr feature = TrackerFeature::create( trackerFeatureType ); - if( feature == 0 ) + if (!feature) { return false; } diff --git a/modules/tracking/src/trackerModel.cpp b/modules/tracking/src/trackerModel.cpp index bfee5bf9e..023b3b67d 100644 --- a/modules/tracking/src/trackerModel.cpp +++ b/modules/tracking/src/trackerModel.cpp @@ -61,7 +61,7 @@ TrackerModel::~TrackerModel() bool TrackerModel::setTrackerStateEstimator( Ptr trackerStateEstimator ) { - if( stateEstimator != 0 ) + if (stateEstimator.get()) { return false; } @@ -109,12 +109,12 @@ void TrackerModel::modelUpdate() bool TrackerModel::runStateEstimator() { - if( stateEstimator == 0 ) + if (!stateEstimator) { CV_Error( -1, "Tracker state estimator is not setted" ); } Ptr targetState = stateEstimator->estimate( confidenceMaps ); - if( targetState == 0 ) + if (!targetState) return false; setLastTargetState( targetState ); diff --git a/modules/tracking/src/trackerSampler.cpp b/modules/tracking/src/trackerSampler.cpp index 2a0b591ff..38ea52317 100644 --- a/modules/tracking/src/trackerSampler.cpp +++ b/modules/tracking/src/trackerSampler.cpp @@ -96,7 +96,7 @@ bool TrackerSampler::addTrackerSamplerAlgorithm( String trackerSamplerAlgorithmT } Ptr sampler = TrackerSamplerAlgorithm::create( trackerSamplerAlgorithmType ); - if( sampler == 0 ) + if (!sampler) { return false; } @@ -113,7 +113,7 @@ bool TrackerSampler::addTrackerSamplerAlgorithm( Ptr& s return false; } - if( sampler == 0 ) + if (!sampler) { return false; } diff --git a/modules/xfeatures2d/test/test_features2d.cpp b/modules/xfeatures2d/test/test_features2d.cpp index d923147c7..cb3e11712 100644 --- a/modules/xfeatures2d/test/test_features2d.cpp +++ b/modules/xfeatures2d/test/test_features2d.cpp @@ -262,14 +262,14 @@ TEST(Features2d_BruteForceDescriptorMatcher_knnMatch, regression) const int k = 3; Ptr ext = SURF::create(); - ASSERT_TRUE(ext != NULL); + ASSERT_TRUE(ext); Ptr det = SURF::create(); //"%YAML:1.0\nhessianThreshold: 8000.\noctaves: 3\noctaveLayers: 4\nupright: 0\n" - ASSERT_TRUE(det != NULL); + ASSERT_TRUE(det); Ptr matcher = DescriptorMatcher::create("BruteForce"); - ASSERT_TRUE(matcher != NULL); + ASSERT_TRUE(matcher); Mat imgT(256, 256, CV_8U, Scalar(255)); line(imgT, Point(20, sz/2), Point(sz-21, sz/2), Scalar(100), 2);