depau/libfprint
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
libfprint/libfprint/nbis/lfs.h.patch

60 lines
1.7 KiB
Diff
Raw Normal View History

cleanup: Don't make nbis depend on libfprint built-sources Now that nbis is a static library it should be possible to compile it without any fprint-built dependency, although since it included fp_internal there was a compile-time dependency on the fp-enums that can be generated at later times. So: - Move nbis-helpers to nbis includes (and remove inclusion in fp_internal) - Move the Minutiae definitions inside a standalone fpi-minutiae header - Include fpi-minutiae.h in fp_internal.h - Include nbis-hepers.h and fpi-minutiae.h in nbis' lfs.h - Adapt missing definitions in libfprint
2019-12-04 14:08:12 +00:00
--- include/lfs.h
+++ include/lfs.h
@@ -66,7 +66,8 @@ of the software.
nbis: Add script to update NBIS and apply changes NBIS is pretty complicated to update, seeing as we've made quite a few changes to get it to compile as a library. With those scripts, we can easily trim headers to remove functions we don't use, rename global variables, and do any sort of fixups that are necessary right now. In the future, removing unused NBIS functions might be as easy as updating that script, re-running it, and pushing the changes. Note that remove-function.lua is a very crude parser that only supports NBIS' style of declaration, with the return type on the same line as the function name. I wouldn't recommend trying to use it in another project. Callcatcher (https://github.com/caolanm/callcatcher) was also used to remove additional unused functions.
2018-08-24 17:43:22 +00:00
#include <math.h>
#include <stdio.h>
-#include <an2k.h> /* Needed by to_type9.c */
cleanup: Don't make nbis depend on libfprint built-sources Now that nbis is a static library it should be possible to compile it without any fprint-built dependency, although since it included fp_internal there was a compile-time dependency on the fp-enums that can be generated at later times. So: - Move nbis-helpers to nbis includes (and remove inclusion in fp_internal) - Move the Minutiae definitions inside a standalone fpi-minutiae header - Include fpi-minutiae.h in fp_internal.h - Include nbis-hepers.h and fpi-minutiae.h in nbis' lfs.h - Adapt missing definitions in libfprint
2019-12-04 14:08:12 +00:00
+#include <nbis-helpers.h>
+#include <fpi-minutiae.h>
nbis: Add script to update NBIS and apply changes NBIS is pretty complicated to update, seeing as we've made quite a few changes to get it to compile as a library. With those scripts, we can easily trim headers to remove functions we don't use, rename global variables, and do any sort of fixups that are necessary right now. In the future, removing unused NBIS functions might be as easy as updating that script, re-running it, and pushing the changes. Note that remove-function.lua is a very crude parser that only supports NBIS' style of declaration, with the return type on the same line as the function name. I wouldn't recommend trying to use it in another project. Callcatcher (https://github.com/caolanm/callcatcher) was also used to remove additional unused functions.
2018-08-24 17:43:22 +00:00
/*************************************************************************/
/* OUTPUT FILE EXTENSIONS */
cleanup: Don't make nbis depend on libfprint built-sources Now that nbis is a static library it should be possible to compile it without any fprint-built dependency, although since it included fp_internal there was a compile-time dependency on the fp-enums that can be generated at later times. So: - Move nbis-helpers to nbis includes (and remove inclusion in fp_internal) - Move the Minutiae definitions inside a standalone fpi-minutiae header - Include fpi-minutiae.h in fp_internal.h - Include nbis-hepers.h and fpi-minutiae.h in nbis' lfs.h - Adapt missing definitions in libfprint
2019-12-04 14:08:12 +00:00
@@ -154,26 +155,8 @@ typedef struct rotgrids{
nbis: Add script to update NBIS and apply changes NBIS is pretty complicated to update, seeing as we've made quite a few changes to get it to compile as a library. With those scripts, we can easily trim headers to remove functions we don't use, rename global variables, and do any sort of fixups that are necessary right now. In the future, removing unused NBIS functions might be as easy as updating that script, re-running it, and pushing the changes. Note that remove-function.lua is a very crude parser that only supports NBIS' style of declaration, with the return type on the same line as the function name. I wouldn't recommend trying to use it in another project. Callcatcher (https://github.com/caolanm/callcatcher) was also used to remove additional unused functions.
2018-08-24 17:43:22 +00:00
#define DISAPPEARING 0
#define APPEARING 1
-typedef struct minutia{
- int x;
- int y;
- int ex;
- int ey;
- int direction;
- double reliability;
- int type;
- int appearing;
- int feature_id;
- int *nbrs;
- int *ridge_counts;
- int num_nbrs;
-} MINUTIA;
-
-typedef struct minutiae{
- int alloc;
- int num;
- MINUTIA **list;
-} MINUTIAE;
+typedef struct fp_minutia MINUTIA;
+typedef struct fp_minutiae MINUTIAE;
typedef struct feature_pattern{
int type;
cleanup: Don't make nbis depend on libfprint built-sources Now that nbis is a static library it should be possible to compile it without any fprint-built dependency, although since it included fp_internal there was a compile-time dependency on the fp-enums that can be generated at later times. So: - Move nbis-helpers to nbis includes (and remove inclusion in fp_internal) - Move the Minutiae definitions inside a standalone fpi-minutiae header - Include fpi-minutiae.h in fp_internal.h - Include nbis-hepers.h and fpi-minutiae.h in nbis' lfs.h - Adapt missing definitions in libfprint
2019-12-04 14:08:12 +00:00
@@ -1203,17 +1186,6 @@ extern void bubble_sort_double_inc_2(double *, int *, const int);
nbis: Add script to update NBIS and apply changes NBIS is pretty complicated to update, seeing as we've made quite a few changes to get it to compile as a library. With those scripts, we can easily trim headers to remove functions we don't use, rename global variables, and do any sort of fixups that are necessary right now. In the future, removing unused NBIS functions might be as easy as updating that script, re-running it, and pushing the changes. Note that remove-function.lua is a very crude parser that only supports NBIS' style of declaration, with the return type on the same line as the function name. I wouldn't recommend trying to use it in another project. Callcatcher (https://github.com/caolanm/callcatcher) was also used to remove additional unused functions.
2018-08-24 17:43:22 +00:00
extern void bubble_sort_double_dec_2(double *, int *, const int);
extern void bubble_sort_int_inc(int *, const int);
-/* to_type9.c */
-extern int minutiae2type_9(RECORD **, const int, MINUTIAE *, const int,
- const int, const double);
-extern int mintiae2field_12(FIELD **, MINUTIAE *, const int, const int,
- const double);
-
-/* update.c */
-extern int update_ANSI_NIST_lfs_results(ANSI_NIST *, MINUTIAE *,
- unsigned char *, const int, const int,
- const int, const double, const int, const int);
-
/* util.c */
extern int maxv(const int *, const int);
extern int minv(const int *, const int);
Reference in a new issue Copy permalink