potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-30 07:43:03 +04:00
Code Packages 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
parent 3cd7941098 91676de638
commit 30111a786a
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/videoio/include/opencv2/videoio.hpp
+2 -2
View File
@@ -210,8 +210,8 @@ enum { CAP_PVAPI_FSTRIGMODE_FREERUN = 0, // Freerun
// PVAPI: DecimationHorizontal, DecimationVertical
enum { CAP_PVAPI_DECIMATION_OFF = 1, // Off
CAP_PVAPI_DECIMATION_2OUTOF4 = 2, // 2 out of 4 decimation
CAP_PVAPI_DECIMATION_2OUTOF8 = 3, // 2 out of 8 decimation
CAP_PVAPI_DECIMATION_2OUTOF16 = 5 // 2 out of 16 decimation
CAP_PVAPI_DECIMATION_2OUTOF8 = 4, // 2 out of 8 decimation
CAP_PVAPI_DECIMATION_2OUTOF16 = 8 // 2 out of 16 decimation
};
// Properties of cameras available through XIMEA SDK interface
modules/videoio/src/cap_pvapi.cpp
+1 -1
View File
@@ -349,7 +349,7 @@ bool CvCaptureCAM_PvAPI::setProperty( int property_id, double value )
stopCapture();
// Reallocate Frames
if (!resizeCaptureFrame(value, currWidth))
if (!resizeCaptureFrame(currWidth, value))
{
startCapture();
return false;