diff options
author | Thomas White <taw@bitwiz.org.uk> | 2012-07-02 09:44:01 +0200 |
---|---|---|
committer | Thomas White <taw@bitwiz.org.uk> | 2012-07-02 09:44:01 +0200 |
commit | 81d0cc926576519536d89af8f74272b00acd4fd5 (patch) | |
tree | 41829ab0e2b7461446d1bad657cef44fad2ebde5 /libcrystfel/src/stream.c | |
parent | a4ffb65ff4da923aabdb107cdaf59fccba30b409 (diff) | |
parent | d7cacb7871a7d49057453b768e420dfb0ab52077 (diff) |
Merge branch 'master' into tom/speed
Conflicts:
libcrystfel/src/peaks.c
src/indexamajig.c
Diffstat (limited to 'libcrystfel/src/stream.c')
-rw-r--r-- | libcrystfel/src/stream.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libcrystfel/src/stream.c b/libcrystfel/src/stream.c index 81f4d722..ce0ee33e 100644 --- a/libcrystfel/src/stream.c +++ b/libcrystfel/src/stream.c @@ -474,6 +474,7 @@ int skip_some_files(FILE *fh, int n) rval = fgets(line, 1023, fh); if ( rval == NULL ) continue; + chomp(line); if ( strcmp(line, CHUNK_END_MARKER) == 0 ) n_patterns++; } while ( rval != NULL ); |