Commit 91676de6 authored by Nick D'Ademo's avatar Nick D'Ademo

Change decimation enum values so they can be used in resolution calculations.

BUGFIX: Fixed bugged when setting PVAPI property CV_CAP_PROP_FRAME_HEIGHT.
parent 2b94bcff
...@@ -210,8 +210,8 @@ enum { CAP_PVAPI_FSTRIGMODE_FREERUN = 0, // Freerun ...@@ -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
......
...@@ -349,7 +349,7 @@ bool CvCaptureCAM_PvAPI::setProperty( int property_id, double value ) ...@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment