diff options
| author | Matthias Vogelgesang <matthias.vogelgesang@gmail.com> | 2012-06-20 16:46:45 +0200 |
|---|---|---|
| committer | Matthias Vogelgesang <matthias.vogelgesang@gmail.com> | 2012-06-20 16:59:56 +0200 |
| commit | a94f1c1a38673a37093f6e3bae7e470807046cbd (patch) | |
| tree | 7a62d9da6f91a5f5071a38dbfb8ac5cf1a55ca44 | |
| parent | ab5b0e81eac0dbe8e608646b5658df79b3ad6942 (diff) | |
| download | uca-a94f1c1a38673a37093f6e3bae7e470807046cbd.tar.gz uca-a94f1c1a38673a37093f6e3bae7e470807046cbd.tar.bz2 uca-a94f1c1a38673a37093f6e3bae7e470807046cbd.tar.xz uca-a94f1c1a38673a37093f6e3bae7e470807046cbd.zip | |
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.
| -rw-r--r-- | src/cameras/uca-pco-camera.c | 4 |
1 files 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: |