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

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)

Browse Source 
Conflicts:
	modules/highgui/src/cap_ximea.cpp
This commit is contained in:
AfterEight 2015-02-02 14:59:52 +01:00 committed by Dikay900
parent 07e07655d4
commit f39d351d04
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/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;