From a94f1c1a38673a37093f6e3bae7e470807046cbd Mon Sep 17 00:00:00 2001 From: Matthias Vogelgesang Date: Wed, 20 Jun 2012 16:46:45 +0200 Subject: Fix LU-12 Some cameras that don't support an extended mode tend to return a smaller extended sensor size than the standard sensor size. This commit fixes the problem by returning the standard sensor size. --- src/cameras/uca-pco-camera.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/cameras/uca-pco-camera.c b/src/cameras/uca-pco-camera.c index 91aee8f..52246ae 100644 --- a/src/cameras/uca-pco-camera.c +++ b/src/cameras/uca-pco-camera.c @@ -865,11 +865,11 @@ static void uca_pco_camera_get_property(GObject *object, guint property_id, GVal break; case PROP_SENSOR_WIDTH_EXTENDED: - g_value_set_uint(value, priv->width_ex); + g_value_set_uint(value, priv->width_ex < priv->width ? priv->width : priv->width_ex); break; case PROP_SENSOR_HEIGHT_EXTENDED: - g_value_set_uint(value, priv->height_ex); + g_value_set_uint(value, priv->height_ex < priv->height ? priv->height : priv->height_ex); break; case PROP_SENSOR_HORIZONTAL_BINNING: -- cgit v1.2.3