depau/libfprint
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

image-device: Fix reading default values from the class

Browse source 
We cannot copy information from the class in the _init routine, instead,
this needs to be done in _constructed. Move the relevant code into a new
_constructed function to fix importing the bz3_threshold override from
drivers.

Fixes: #206
This commit is contained in:
Benjamin Berg 2020-01-02 18:46:00 +01:00
parent 87dee93633
commit 6c6df626c8
1 changed files with 18 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
libfprint/fp-image-device.c
View file

@ -245,6 +245,23 @@ fp_image_device_get_property (GObject *object,
} }
} }
static void
fp_image_device_constructed (GObject *obj)
{
FpImageDevice *self = FP_IMAGE_DEVICE (obj);
FpImageDevicePrivate *priv = fp_image_device_get_instance_private (self);
FpImageDeviceClass *cls = FP_IMAGE_DEVICE_GET_CLASS (self);
/* Set default values. */
fpi_device_set_nr_enroll_stages (FP_DEVICE (self), IMG_ENROLL_STAGES);
priv->bz3_threshold = BOZORTH3_DEFAULT_THRESHOLD;
if (cls->bz3_threshold > 0)
priv->bz3_threshold = cls->bz3_threshold;
G_OBJECT_CLASS (fp_image_device_parent_class)->constructed (obj);
}
static void static void
fp_image_device_class_init (FpImageDeviceClass *klass) fp_image_device_class_init (FpImageDeviceClass *klass)
{ {
@ -253,6 +270,7 @@ fp_image_device_class_init (FpImageDeviceClass *klass)
object_class->finalize = fp_image_device_finalize; object_class->finalize = fp_image_device_finalize;
object_class->get_property = fp_image_device_get_property; object_class->get_property = fp_image_device_get_property;
object_class->constructed = fp_image_device_constructed;
fp_device_class->open = fp_image_device_open; fp_device_class->open = fp_image_device_open;
fp_device_class->close = fp_image_device_close; fp_device_class->close = fp_image_device_close;
@ -305,13 +323,4 @@ fp_image_device_class_init (FpImageDeviceClass *klass)
static void static void
fp_image_device_init (FpImageDevice *self) fp_image_device_init (FpImageDevice *self)
{ {
FpImageDevicePrivate *priv = fp_image_device_get_instance_private (self);
FpImageDeviceClass *cls = FP_IMAGE_DEVICE_GET_CLASS (self);
/* Set default values. */
fpi_device_set_nr_enroll_stages (FP_DEVICE (self), IMG_ENROLL_STAGES);
priv->bz3_threshold = BOZORTH3_DEFAULT_THRESHOLD;
if (cls->bz3_threshold > 0)
priv->bz3_threshold = cls->bz3_threshold;
} }