generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #3971 from Dikay900:2_4_to_master_3

Browse Source
This commit is contained in:
Vadim Pisarevsky 2015-05-17 00:28:30 +00:00
commit 8b791477df
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/objdetect/src/hog.cpp
View File

@ -1459,6 +1459,7 @@ void HOGDescriptor::detect(const Mat& img,
Size winStride, Size padding, const std::vector<Point>& locations) const Size winStride, Size padding, const std::vector<Point>& locations) const
{ {
hits.clear(); hits.clear();
weights.clear();
if( svmDetector.empty() ) if( svmDetector.empty() )
return; return;

2
modules/videoio/src/cap_ximea.cpp
View File

@ -221,7 +221,7 @@ void CvCaptureCAM_XIMEA::resetCvImage()
xiGetParamInt( hmv, XI_PRM_HEIGHT, &height); xiGetParamInt( hmv, XI_PRM_HEIGHT, &height);
xiGetParamInt( hmv, XI_PRM_IMAGE_DATA_FORMAT, &format); xiGetParamInt( hmv, XI_PRM_IMAGE_DATA_FORMAT, &format);
if( (int)image.width != width || (int)image.height != height || image.frm != (XI_IMG_FORMAT)format) if( (int)image.width != frame->width || (int)image.height != frame->height || image.frm != (XI_IMG_FORMAT)format)
{ {
if(frame) cvReleaseImage(&frame); if(frame) cvReleaseImage(&frame);
frame = NULL; frame = NULL;