diff options
| -rw-r--r-- | src/core.c | 2 | ||||
| -rw-r--r-- | src/match.c | 4 | ||||
| -rw-r--r-- | src/match.h | 4 |
3 files changed, 4 insertions, 6 deletions
| @@ -84,7 +84,7 @@ static void solve(struct mtdev_state *state, const struct mtdev_caps *caps, | |||
| 84 | row[i] = dist2(nx[i] - sx[j], ny[i] - sy[j]); | 84 | row[i] = dist2(nx[i] - sx[j], ny[i] - sy[j]); |
| 85 | } | 85 | } |
| 86 | 86 | ||
| 87 | match_fingers(n2s, A, nn, sn); | 87 | mtdev_match(n2s, A, nn, sn); |
| 88 | 88 | ||
| 89 | /* update matched contacts and create new ones */ | 89 | /* update matched contacts and create new ones */ |
| 90 | foreach_bit(i, touch) { | 90 | foreach_bit(i, touch) { |
diff --git a/src/match.c b/src/match.c index 673e838..3eb582e 100644 --- a/src/match.c +++ b/src/match.c | |||
| @@ -38,8 +38,6 @@ | |||
| 38 | * Based on code released by Markus Buehren (2004) (BSD license) | 38 | * Based on code released by Markus Buehren (2004) (BSD license) |
| 39 | * | 39 | * |
| 40 | * Copyright (C) 2004, Markus Buehren. All rights reserved. | 40 | * Copyright (C) 2004, Markus Buehren. All rights reserved. |
| 41 | * See CREDITS file for full license terms. | ||
| 42 | * | ||
| 43 | */ | 41 | */ |
| 44 | 42 | ||
| 45 | typedef unsigned col_t[1]; | 43 | typedef unsigned col_t[1]; |
| @@ -385,7 +383,7 @@ static void step5(int *ix, int *mdist, mat_t mstar, mat_t nmstar, | |||
| 385 | dmin); | 383 | dmin); |
| 386 | } | 384 | } |
| 387 | 385 | ||
| 388 | void match_fingers(int ix[DIM_FINGER], int A[DIM2_FINGER], int nrow, int ncol) | 386 | void mtdev_match(int ix[DIM_FINGER], int A[DIM2_FINGER], int nrow, int ncol) |
| 389 | { | 387 | { |
| 390 | ixoptimal(ix, A, nrow, ncol); | 388 | ixoptimal(ix, A, nrow, ncol); |
| 391 | } | 389 | } |
diff --git a/src/match.h b/src/match.h index e6d7d73..a83b651 100644 --- a/src/match.h +++ b/src/match.h | |||
| @@ -37,7 +37,7 @@ | |||
| 37 | 37 | ||
| 38 | #include "common.h" | 38 | #include "common.h" |
| 39 | 39 | ||
| 40 | void match_fingers(int index[DIM_FINGER], int A[DIM2_FINGER], | 40 | void mtdev_match(int index[DIM_FINGER], int A[DIM2_FINGER], |
| 41 | int nrow, int ncol); | 41 | int nrow, int ncol); |
| 42 | 42 | ||
| 43 | #endif | 43 | #endif |
