diff options
| author | Thomas White <taw@physics.org> | 2012-03-07 17:34:56 +0100 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2012-03-07 17:34:56 +0100 |
| commit | a16291dd7c0826428b4d3d3b2ba3f48540f3c1c7 (patch) | |
| tree | 0bced89a4844c1b278cce9b7c6ee0ed87d290059 | |
| parent | 4d3b0a507dadcf84bb07fdad9b26e3cbe6e03a19 (diff) | |
hdfsee: Update for new format
| -rw-r--r-- | src/dw-hdfsee.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/dw-hdfsee.c b/src/dw-hdfsee.c index ec30f6eb..807a8244 100644 --- a/src/dw-hdfsee.c +++ b/src/dw-hdfsee.c @@ -880,7 +880,7 @@ static void load_features_from_file(struct image *image, const char *filename) do { char line[1024]; - float intensity, sigma, res, fs, ss; + float intensity, sigma, fs, ss; char phs[1024]; int r; int cts; @@ -891,10 +891,9 @@ static void load_features_from_file(struct image *image, const char *filename) chomp(line); /* Try long format (from stream) */ - r = sscanf(line, "%i %i %i %f %s %f %f %i %f %f", - &h, &k, &l, &intensity, phs, &sigma, &res, &cts, - &fs, &ss); - if ( r == 10 ) { + r = sscanf(line, "%i %i %i %f %s %f %i %f %f", + &h, &k, &l, &intensity, phs, &sigma, &cts, &fs, &ss); + if ( r == 9 ) { char name[32]; snprintf(name, 31, "%i %i %i", h, k, l); image_add_feature(image->features, fs, ss, image, 1.0, |