diff options
| author | Henrik Rydberg <rydberg@euromail.se> | 2010-06-22 09:19:50 +0200 |
|---|---|---|
| committer | Henrik Rydberg <rydberg@euromail.se> | 2010-06-22 09:19:50 +0200 |
| commit | 172221f14fc91ebb37aa4c561ad733088cc3c3bf (patch) | |
| tree | e2244d4aedf1513a8990cc6fbdfd7aeefd090c14 | |
| parent | 925ad71be727ec8da3cd71a2c1c965d336ff856f (diff) | |
| download | mtdev-git-172221f14fc91ebb37aa4c561ad733088cc3c3bf.tar.gz | |
match: conform to mtdev namespace
Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
| -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, row[i] = dist2(nx[i] - sx[j], ny[i] - sy[j]); } - match_fingers(n2s, A, nn, sn); + mtdev_match(n2s, A, nn, sn); /* update matched contacts and create new ones */ 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 @@ * Based on code released by Markus Buehren (2004) (BSD license) * * Copyright (C) 2004, Markus Buehren. All rights reserved. - * See CREDITS file for full license terms. - * */ typedef unsigned col_t[1]; @@ -385,7 +383,7 @@ static void step5(int *ix, int *mdist, mat_t mstar, mat_t nmstar, dmin); } -void match_fingers(int ix[DIM_FINGER], int A[DIM2_FINGER], int nrow, int ncol) +void mtdev_match(int ix[DIM_FINGER], int A[DIM2_FINGER], int nrow, int ncol) { ixoptimal(ix, A, nrow, ncol); } 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 @@ #include "common.h" -void match_fingers(int index[DIM_FINGER], int A[DIM2_FINGER], - int nrow, int ncol); +void mtdev_match(int index[DIM_FINGER], int A[DIM2_FINGER], + int nrow, int ncol); #endif |