summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Vogelgesang <matthias.vogelgesang@kit.edu>2013-10-31 21:12:32 +0100
committerMatthias Vogelgesang <matthias.vogelgesang@kit.edu>2013-10-31 21:12:32 +0100
commit3c7f5aad71b5129f9baf42bc35aad90465a584b0 (patch)
treec76b82bb28f128d71d8fab6aed540450b6674c37
parentb2c2874c59bd9a3565d5fa86a66c0a2f67792114 (diff)
downloaduca-3c7f5aad71b5129f9baf42bc35aad90465a584b0.tar.gz
uca-3c7f5aad71b5129f9baf42bc35aad90465a584b0.tar.bz2
uca-3c7f5aad71b5129f9baf42bc35aad90465a584b0.tar.xz
uca-3c7f5aad71b5129f9baf42bc35aad90465a584b0.zip
Fix bit depth information of pco cameras
-rw-r--r--plugins/pco/CMakeLists.txt2
-rw-r--r--plugins/pco/uca-pco-camera.c12
2 files changed, 12 insertions, 2 deletions
diff --git a/plugins/pco/CMakeLists.txt b/plugins/pco/CMakeLists.txt
index 9aa888e..25f1ca8 100644
--- a/plugins/pco/CMakeLists.txt
+++ b/plugins/pco/CMakeLists.txt
@@ -8,7 +8,7 @@ find_package(ClSerMe4)
if (PCO_FOUND AND CLSERME4_FOUND AND FGLIB5_FOUND)
set(UCA_CAMERA_NAME "pco")
set(PLUGIN_VERSION "1.1.0")
- set(PLUGIN_REVISION "0")
+ set(PLUGIN_REVISION "1")
set(PLUGIN_REQUIRES "libuca >= 1.1.0")
set(PLUGIN_SUMMARY "libpco plugin for libuca")
diff --git a/plugins/pco/uca-pco-camera.c b/plugins/pco/uca-pco-camera.c
index c59c24b..7629972 100644
--- a/plugins/pco/uca-pco-camera.c
+++ b/plugins/pco/uca-pco-camera.c
@@ -866,7 +866,17 @@ uca_pco_camera_get_property(GObject *object, guint property_id, GValue *value, G
break;
case PROP_SENSOR_BITDEPTH:
- g_value_set_uint(value, 16);
+ switch (priv->description->type) {
+ case CAMERATYPE_PCO4000:
+ g_value_set_uint(value, 14);
+ break;
+ case CAMERATYPE_PCO_EDGE:
+ g_value_set_uint(value, 16);
+ break;
+ case CAMERATYPE_PCO_DIMAX_STD:
+ g_value_set_uint(value, 12);
+ break;
+ }
break;
case PROP_SENSOR_TEMPERATURE: