Merge pull request #3667 from AfterEight:cap_ximea_setResolution_bugfix

cd1ca7b0 · Vadim Pisarevsky · 98f9a013 · e938563d · cd1ca7b0
Commit cd1ca7b0 authored Feb 05, 2015 by Vadim Pisarevsky
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

cap_ximea.cpp modules/highgui/src/cap_ximea.cpp +1 -1

No files found.
--- a/modules/highgui/src/cap_ximea.cpp
+++ b/modules/highgui/src/cap_ximea.cpp
@@ -204,7 +204,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;