58 lines
2.2 KiB
Diff
58 lines
2.2 KiB
Diff
From b7a62c3e2558abb69a8cad0983e30daf511f00d0 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
|
|
Date: Tue, 26 Nov 2019 20:38:16 +0100
|
|
Subject: [PATCH 043/181] fp-device: Use an autopointer and steal the print
|
|
when passed
|
|
|
|
Make it clearer that we're stealing the print when passing it away, instead
|
|
of just doing this silently.
|
|
---
|
|
libfprint/fp-image-device.c | 9 +++++----
|
|
1 file changed, 5 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/libfprint/fp-image-device.c b/libfprint/fp-image-device.c
|
|
index 692727b..e45b6a9 100644
|
|
--- a/libfprint/fp-image-device.c
|
|
+++ b/libfprint/fp-image-device.c
|
|
@@ -389,8 +389,8 @@ static void
|
|
fpi_image_device_minutiae_detected (GObject *source_object, GAsyncResult *res, gpointer user_data)
|
|
{
|
|
g_autoptr(FpImage) image = FP_IMAGE (source_object);
|
|
+ g_autoptr(FpPrint) print = NULL;
|
|
GError *error = NULL;
|
|
- FpPrint *print = NULL;
|
|
FpDevice *device = FP_DEVICE (user_data);
|
|
FpImageDevicePrivate *priv;
|
|
FpDeviceAction action;
|
|
@@ -443,7 +443,8 @@ fpi_image_device_minutiae_detected (GObject *source_object, GAsyncResult *res, g
|
|
priv->enroll_stage += 1;
|
|
}
|
|
|
|
- fpi_device_enroll_progress (device, priv->enroll_stage, print, error);
|
|
+ fpi_device_enroll_progress (device, priv->enroll_stage,
|
|
+ g_steal_pointer (&print), error);
|
|
|
|
if (priv->enroll_stage == IMG_ENROLL_STAGES)
|
|
{
|
|
@@ -462,7 +463,7 @@ fpi_image_device_minutiae_detected (GObject *source_object, GAsyncResult *res, g
|
|
else
|
|
result = FPI_MATCH_ERROR;
|
|
|
|
- fpi_device_verify_complete (device, result, print, error);
|
|
+ fpi_device_verify_complete (device, result, g_steal_pointer (&print), error);
|
|
fp_image_device_deactivate (device);
|
|
}
|
|
else if (action == FP_DEVICE_ACTION_IDENTIFY)
|
|
@@ -483,7 +484,7 @@ fpi_image_device_minutiae_detected (GObject *source_object, GAsyncResult *res, g
|
|
}
|
|
}
|
|
|
|
- fpi_device_identify_complete (device, result, print, error);
|
|
+ fpi_device_identify_complete (device, result, g_steal_pointer (&print), error);
|
|
fp_image_device_deactivate (device);
|
|
}
|
|
else
|
|
--
|
|
2.24.1
|
|
|