aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorThomas White <taw@physics.org>2014-03-03 16:37:32 +0100
committerThomas White <taw@physics.org>2014-03-03 16:37:32 +0100
commitbe6df1aaf9df81f836118e426aae5d0f699bd493 (patch)
treebacc842269d845fba3ac6955417e62ea5a89cb07 /src
parentfe5bde1c898298b72873874b8b2843303b37bff6 (diff)
hdfsee: Read old and new stream formats (for peaks)
Diffstat (limited to 'src')
-rw-r--r--src/dw-hdfsee.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/dw-hdfsee.c b/src/dw-hdfsee.c
index 387db45c..5c4a71de 100644
--- a/src/dw-hdfsee.c
+++ b/src/dw-hdfsee.c
@@ -885,7 +885,7 @@ static void load_features_from_file(struct image *image, const char *filename)
float intensity, sigma, fs, ss;
char phs[1024];
int r;
- int cts;
+ float cts;
signed int h, k, l;
rval = fgets(line, 1023, fh);
@@ -893,7 +893,7 @@ 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 %i %f %f",
+ r = sscanf(line, "%i %i %i %f %s %f %f %f %f",
&h, &k, &l, &intensity, phs, &sigma, &cts, &fs, &ss);
if ( r == 9 ) {
char name[32];