diff options
Diffstat (limited to 'src/cameras/uca-pylon-camera.c')
| -rw-r--r-- | src/cameras/uca-pylon-camera.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/cameras/uca-pylon-camera.c b/src/cameras/uca-pylon-camera.c index 6fef112..373f713 100644 --- a/src/cameras/uca-pylon-camera.c +++ b/src/cameras/uca-pylon-camera.c @@ -30,7 +30,7 @@ "libpylon error %i", err); \ return; \ }*/ - + #define UCA_PYLON_CAMERA_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), UCA_TYPE_PYLON_CAMERA, UcaPylonCameraPrivate)) G_DEFINE_TYPE(UcaPylonCamera, uca_pylon_camera, UCA_TYPE_CAMERA) @@ -53,7 +53,7 @@ enum { PROP_ROI_WIDTH_DEFAULT = N_BASE_PROPERTIES, PROP_ROI_HEIGHT_DEFAULT, PROP_GAIN, - N_PROPERTIES + N_PROPERTIES }; static gint base_overrideables[] = { @@ -148,7 +148,7 @@ static void uca_pylon_camera_grab(UcaCamera *camera, gpointer *data, GError **er UcaPylonCameraPrivate *priv = UCA_PYLON_CAMERA_GET_PRIVATE(camera); if (*data == NULL) { - *data = g_malloc0(priv->width * priv->height * priv->num_bytes); + *data = g_malloc0(priv->width * priv->height * priv->num_bytes); } pylon_camera_grab(data, error); } @@ -216,14 +216,14 @@ static void uca_pylon_camera_get_property(GObject *object, guint property_id, GV GError* error = NULL; switch (property_id) { - - case PROP_SENSOR_WIDTH: + + case PROP_SENSOR_WIDTH: pylon_camera_get_sensor_size(&priv->width, &priv->height, &error); g_value_set_uint(value, priv->width); g_print("pylon_get_property sensor width %d\n", priv->width); break; - case PROP_SENSOR_HEIGHT: + case PROP_SENSOR_HEIGHT: pylon_camera_get_sensor_size(&priv->width, &priv->height, &error); g_value_set_uint(value, priv->height); g_print("pylon_get_property sensor height %d\n", priv->height); @@ -329,7 +329,7 @@ static void uca_pylon_camera_get_property(GObject *object, guint property_id, GV } break; - case PROP_NAME: + case PROP_NAME: { //char *name = NULL; //pylon_get_name(priv->pylon, &name); @@ -385,7 +385,7 @@ static void uca_pylon_camera_class_init(UcaPylonCameraClass *klass) for (guint i = 0; base_overrideables[i] != 0; i++) g_object_class_override_property(gobject_class, base_overrideables[i], uca_camera_props[base_overrideables[i]]); - pylon_properties[PROP_NAME] = + pylon_properties[PROP_NAME] = g_param_spec_string("name", "Name of the camera", "Name of the camera", @@ -458,4 +458,3 @@ static void uca_pylon_camera_init(UcaPylonCamera *self) self->priv->binnings = g_value_array_new(1); g_value_array_append(self->priv->binnings, &val); } - |