From 38f46eb3b45e0a05511ce0d90dba2546777bc640 Mon Sep 17 00:00:00 2001 From: Andrey Pavlenko Date: Thu, 6 Feb 2014 21:33:44 +0400 Subject: [PATCH] fixing issues from coverity scan 1167937, 1167938, 1167939, 1127248 (http://scan.coverity.com/projects/169?tab=Overview) --- modules/core/src/ocl.cpp | 1 - modules/nonfree/src/surf.hpp | 1 - modules/objdetect/include/opencv2/objdetect.hpp | 4 ++-- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/modules/core/src/ocl.cpp b/modules/core/src/ocl.cpp index ce4dc1735..a78381106 100644 --- a/modules/core/src/ocl.cpp +++ b/modules/core/src/ocl.cpp @@ -2545,7 +2545,6 @@ struct Queue::Impl IMPLEMENT_REFCOUNTABLE(); cl_command_queue handle; - bool initialized; }; Queue::Queue() diff --git a/modules/nonfree/src/surf.hpp b/modules/nonfree/src/surf.hpp index 7c43f1efe..ee56fb66c 100644 --- a/modules/nonfree/src/surf.hpp +++ b/modules/nonfree/src/surf.hpp @@ -69,7 +69,6 @@ protected: bool detectKeypoints(UMat &keypoints); const SURF* params; - int refcount; //! max keypoints = min(keypointsRatio * img.size().area(), 65535) UMat sum, intBuffer; diff --git a/modules/objdetect/include/opencv2/objdetect.hpp b/modules/objdetect/include/opencv2/objdetect.hpp index ff665738a..5f2a62772 100644 --- a/modules/objdetect/include/opencv2/objdetect.hpp +++ b/modules/objdetect/include/opencv2/objdetect.hpp @@ -246,7 +246,7 @@ public: CV_WRAP HOGDescriptor() : winSize(64,128), blockSize(16,16), blockStride(8,8), cellSize(8,8), nbins(9), derivAperture(1), winSigma(-1), histogramNormType(HOGDescriptor::L2Hys), L2HysThreshold(0.2), gammaCorrection(true), - nlevels(HOGDescriptor::DEFAULT_NLEVELS) + free_coef(-1.f), nlevels(HOGDescriptor::DEFAULT_NLEVELS) {} CV_WRAP HOGDescriptor(Size _winSize, Size _blockSize, Size _blockStride, @@ -257,7 +257,7 @@ public: : winSize(_winSize), blockSize(_blockSize), blockStride(_blockStride), cellSize(_cellSize), nbins(_nbins), derivAperture(_derivAperture), winSigma(_winSigma), histogramNormType(_histogramNormType), L2HysThreshold(_L2HysThreshold), - gammaCorrection(_gammaCorrection), nlevels(_nlevels) + gammaCorrection(_gammaCorrection), free_coef(-1.f), nlevels(_nlevels) {} CV_WRAP HOGDescriptor(const String& filename)