Merge pull request #3971 from Dikay900:2_4_to_master_3

10 years ago · 8b791477df
parent e0136e39f4 b73894b271
commit 8b791477df
2 changed files with 2 additions and 1 deletions
--- a/modules/objdetect/src/hog.cpp
+++ b/modules/objdetect/src/hog.cpp
@ -1459,6 +1459,7 @@ void HOGDescriptor::detect(const Mat& img,
    Size winStride, Size padding, const std::vector<Point>& locations) const
 {
    hits.clear();
+    weights.clear();
    if( svmDetector.empty() )
        return;

--- a/modules/videoio/src/cap_ximea.cpp
+++ b/modules/videoio/src/cap_ximea.cpp
@ -221,7 +221,7 @@ void CvCaptureCAM_XIMEA::resetCvImage()
    xiGetParamInt( hmv, XI_PRM_HEIGHT, &height);
    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);
        frame = NULL;