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

lib: Remove home-grown min() implementation

Browse source 
And use GLib's.
This commit is contained in:
Bastien Nocera 2018-09-27 09:11:45 +02:00
parent 49ba59369a
commit b817b46494
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libfprint/assembling.c
View file

@ -350,8 +350,6 @@ static void interpolate_lines(struct fpi_line_asmbl_ctx *ctx,
} }
} }
static int min(int a, int b) {return (a < b) ? a : b; }
/* Rescale image to account for variable swiping speed */ /* Rescale image to account for variable swiping speed */
struct fp_img *fpi_assemble_lines(struct fpi_line_asmbl_ctx *ctx, struct fp_img *fpi_assemble_lines(struct fpi_line_asmbl_ctx *ctx,
GSList *lines, size_t lines_len) GSList *lines, size_t lines_len)
@ -377,7 +375,7 @@ struct fp_img *fpi_assemble_lines(struct fpi_line_asmbl_ctx *ctx,
int j, firstrow, lastrow; int j, firstrow, lastrow;
firstrow = i + 1; firstrow = i + 1;
lastrow = min(i + ctx->max_search_offset, lines_len - 1); lastrow = MIN(i + ctx->max_search_offset, lines_len - 1);
row2 = g_slist_next(row1); row2 = g_slist_next(row1);
for (j = firstrow; j <= lastrow; j++) { for (j = firstrow; j <= lastrow; j++) {