summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMatthias Vogelgesang <matthias.vogelgesang@kit.edu>2015-06-18 08:42:43 +0200
committerMatthias Vogelgesang <matthias.vogelgesang@kit.edu>2015-06-18 08:43:58 +0200
commit0c7f86b1fa01faab960093ab6b7841acd5b06345 (patch)
treeb50a7bab571d58ac646ab63e215bf41f521f4780 /src
parentc6cef92cffb103cafecc54c06a9fdd1aba37e2f1 (diff)
downloaduca-0c7f86b1fa01faab960093ab6b7841acd5b06345.tar.gz
uca-0c7f86b1fa01faab960093ab6b7841acd5b06345.tar.bz2
uca-0c7f86b1fa01faab960093ab6b7841acd5b06345.tar.xz
uca-0c7f86b1fa01faab960093ab6b7841acd5b06345.zip
Fix ufo-kit/concert#373: same unit for ROI and mult
Diffstat (limited to 'src')
-rw-r--r--src/uca-camera.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/uca-camera.c b/src/uca-camera.c
index 788471c..1cc414a 100644
--- a/src/uca-camera.c
+++ b/src/uca-camera.c
@@ -611,8 +611,8 @@ uca_camera_init (UcaCamera *camera)
uca_camera_set_property_unit (camera_properties[PROP_ROI_Y], UCA_UNIT_PIXEL);
uca_camera_set_property_unit (camera_properties[PROP_ROI_WIDTH], UCA_UNIT_PIXEL);
uca_camera_set_property_unit (camera_properties[PROP_ROI_HEIGHT], UCA_UNIT_PIXEL);
- uca_camera_set_property_unit (camera_properties[PROP_ROI_WIDTH_MULTIPLIER], UCA_UNIT_COUNT);
- uca_camera_set_property_unit (camera_properties[PROP_ROI_HEIGHT_MULTIPLIER], UCA_UNIT_COUNT);
+ uca_camera_set_property_unit (camera_properties[PROP_ROI_WIDTH_MULTIPLIER], UCA_UNIT_PIXEL);
+ uca_camera_set_property_unit (camera_properties[PROP_ROI_HEIGHT_MULTIPLIER], UCA_UNIT_PIXEL);
uca_camera_set_property_unit (camera_properties[PROP_RECORDED_FRAMES], UCA_UNIT_COUNT);
#ifdef WITH_PYTHON_MULTITHREADING