diff options
| author | Thomas White <taw@physics.org> | 2011-03-14 17:22:03 +0100 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2012-02-22 15:27:19 +0100 |
| commit | dbb76151b8d3656223a42661869c60cc5e4d809e (patch) | |
| tree | a432c3b85d414f660d674cca60d178935f2fa287 /src/image.c | |
| parent | 5bc39aff3711410f15107e4d5f47e607aa018fd7 (diff) | |
More of s/x/fs/, s/y/ss/
Diffstat (limited to 'src/image.c')
| -rw-r--r-- | src/image.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/image.c b/src/image.c index 81c56414..6acf2c46 100644 --- a/src/image.c +++ b/src/image.c @@ -68,7 +68,7 @@ ImageList *image_list_new() } -void image_add_feature(ImageFeatureList *flist, double x, double y, +void image_add_feature(ImageFeatureList *flist, double fs, double ss, struct image *parent, double intensity, const char *name) { if ( flist->features ) { @@ -80,8 +80,8 @@ void image_add_feature(ImageFeatureList *flist, double x, double y, flist->features = malloc(sizeof(struct imagefeature)); } - flist->features[flist->n_features].x = x; - flist->features[flist->n_features].y = y; + flist->features[flist->n_features].fs = fs; + flist->features[flist->n_features].ss = ss; flist->features[flist->n_features].intensity = intensity; flist->features[flist->n_features].parent = parent; flist->features[flist->n_features].name = name; @@ -115,7 +115,7 @@ void image_feature_list_free(ImageFeatureList *flist) struct imagefeature *image_feature_closest(ImageFeatureList *flist, - double x, double y, + double fs, double ss, double *d, int *idx) { int i; @@ -126,7 +126,8 @@ struct imagefeature *image_feature_closest(ImageFeatureList *flist, double ds; - ds = distance(flist->features[i].x, flist->features[i].y, x, y); + ds = distance(flist->features[i].fs, flist->features[i].ss, + fs, ss); if ( ds < dmin ) { dmin = ds; |