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

Merge pull request #3667 from AfterEight:cap_ximea_setResolution_bugfix

Browse Source
This commit is contained in:
Vadim Pisarevsky 2015-02-05 07:48:43 +00:00
commit cd1ca7b08b
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -204,7 +204,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;