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

Merge pull request #3085 from nickdademo:pvapi_fix_decimation_enum

Browse Source
This commit is contained in:
Vadim Pisarevsky 2014-08-13 10:51:46 +00:00
commit 30111a786a
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/videoio/include/opencv2/videoio.hpp
View File

@ -210,8 +210,8 @@ enum { CAP_PVAPI_FSTRIGMODE_FREERUN = 0, // Freerun
// PVAPI: DecimationHorizontal, DecimationVertical // PVAPI: DecimationHorizontal, DecimationVertical
enum { CAP_PVAPI_DECIMATION_OFF = 1, // Off enum { CAP_PVAPI_DECIMATION_OFF = 1, // Off
CAP_PVAPI_DECIMATION_2OUTOF4 = 2, // 2 out of 4 decimation CAP_PVAPI_DECIMATION_2OUTOF4 = 2, // 2 out of 4 decimation
CAP_PVAPI_DECIMATION_2OUTOF8 = 3, // 2 out of 8 decimation CAP_PVAPI_DECIMATION_2OUTOF8 = 4, // 2 out of 8 decimation
CAP_PVAPI_DECIMATION_2OUTOF16 = 5 // 2 out of 16 decimation CAP_PVAPI_DECIMATION_2OUTOF16 = 8 // 2 out of 16 decimation
}; };
// Properties of cameras available through XIMEA SDK interface // Properties of cameras available through XIMEA SDK interface

2
modules/videoio/src/cap_pvapi.cpp
View File

@ -349,7 +349,7 @@ bool CvCaptureCAM_PvAPI::setProperty( int property_id, double value )
stopCapture(); stopCapture();
// Reallocate Frames // Reallocate Frames
if (!resizeCaptureFrame(value, currWidth)) if (!resizeCaptureFrame(currWidth, value))
{ {
startCapture(); startCapture();
return false; return false;