summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMihael Koep <koep@schneide.com>2013-03-27 16:41:23 +0100
committerMatthias Vogelgesang <matthias.vogelgesang@kit.edu>2013-11-06 14:43:09 +0100
commit35522c2f2606a51605356d9edfa9635442b22c3a (patch)
tree1843e20fd0f035ea68dba054bfc3b4b3b72f93e6
parent60827d7d3639f289794d834a8d926c5930ce9527 (diff)
downloaduca-35522c2f2606a51605356d9edfa9635442b22c3a.tar.gz
uca-35522c2f2606a51605356d9edfa9635442b22c3a.tar.bz2
uca-35522c2f2606a51605356d9edfa9635442b22c3a.tar.xz
uca-35522c2f2606a51605356d9edfa9635442b22c3a.zip
Return current width and height as roi.
-rw-r--r--plugins/dexela/CMakeLists.txt2
-rw-r--r--plugins/dexela/changelog.txt2
-rw-r--r--plugins/dexela/uca-dexela-camera.c6
3 files changed, 5 insertions, 5 deletions
diff --git a/plugins/dexela/CMakeLists.txt b/plugins/dexela/CMakeLists.txt
index 794b811..65d8ed0 100644
--- a/plugins/dexela/CMakeLists.txt
+++ b/plugins/dexela/CMakeLists.txt
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 2.6)
project(ucadexela C)
-set(VERSION "1.0.1")
+set(VERSION "1.0.2")
find_package(DEXELA)
diff --git a/plugins/dexela/changelog.txt b/plugins/dexela/changelog.txt
index 2998374..0ad6d1d 100644
--- a/plugins/dexela/changelog.txt
+++ b/plugins/dexela/changelog.txt
@@ -1,3 +1,5 @@
+* Wed Mar 27 2013 Mihael Koep <mihael.koep@softwareschneiderei.de> 1.0.2-1
+- return current width and height as rois
* Thu Mar 14 2013 Mihael Koep <mihael.koep@softwareschneiderei.de> 1.0.0-3
- improve package metadata and build scripts
* Thu Mar 7 2013 Mihael Koep <mihael.koep@softwareschneiderei.de> 1.0.0-2
diff --git a/plugins/dexela/uca-dexela-camera.c b/plugins/dexela/uca-dexela-camera.c
index 37832b2..0003f22 100644
--- a/plugins/dexela/uca-dexela-camera.c
+++ b/plugins/dexela/uca-dexela-camera.c
@@ -200,14 +200,12 @@ static void uca_dexela_camera_get_property(GObject *object, guint property_id, G
}
case PROP_ROI_WIDTH:
{
- // use full frame for now
- g_value_set_uint(value, priv->width);
+ g_value_set_uint(value, dexela_get_width());
break;
}
case PROP_ROI_HEIGHT:
{
- // use full frame for now
- g_value_set_uint(value, priv->height);
+ g_value_set_uint(value, dexela_get_height());
break;
}
case PROP_SENSOR_HORIZONTAL_BINNING: