mirror of
https://github.com/opencv/opencv.git
synced 2024-11-25 11:40:44 +08:00
Modified resetCvImage() in cap_ximea.cpp, so that the IplImage* frame is also updated after the resolution has changed via set(CV_CAP_PROP_FRAME_WIDTH, value)/set(CV_CAP_PROP_XI_DOWNSAMPLING, value)
Conflicts: modules/highgui/src/cap_ximea.cpp
This commit is contained in:
parent
07e07655d4
commit
f39d351d04
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user