Merge pull request #2296 from apavlenko:fix_coverity_scan

pull/2295/merge
Roman Donchenko 11 years ago committed by OpenCV Buildbot
commit 8b16b8b657
  1. 1
      modules/core/src/ocl.cpp
  2. 1
      modules/nonfree/src/surf.hpp
  3. 4
      modules/objdetect/include/opencv2/objdetect.hpp

@ -2545,7 +2545,6 @@ struct Queue::Impl
IMPLEMENT_REFCOUNTABLE();
cl_command_queue handle;
bool initialized;
};
Queue::Queue()

@ -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;

@ -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)

Loading…
Cancel
Save