diff options
| author | Thomas White <taw@bitwiz.org.uk> | 2011-08-20 12:05:22 +0200 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2012-02-22 15:27:36 +0100 |
| commit | 011e2c2b877ec42654243d5a6b2b1841b3c04ce6 (patch) | |
| tree | 96e950966973e6ff2e47b27c7f7a2d0b41145292 | |
| parent | de17e3afdec93e2347f43f0eea7312509af8ef9c (diff) | |
Remove "pixels" stream option
| -rw-r--r-- | src/stream.c | 14 | ||||
| -rw-r--r-- | src/stream.h | 1 |
2 files changed, 2 insertions, 13 deletions
diff --git a/src/stream.c b/src/stream.c index b5ca31bf..bb25686e 100644 --- a/src/stream.c +++ b/src/stream.c @@ -52,18 +52,8 @@ int parse_stream_flags(const char *a) for ( i=0; i<n; i++ ) { - if ( strcmp(flags[i], "pixels") == 0) { - if ( ret & STREAM_INTEGRATED ) { - exclusive("pixels", "integrated"); - return -1; - } - ret |= STREAM_PIXELS; + if ( strcmp(flags[i], "integrated") == 0) { - } else if ( strcmp(flags[i], "integrated") == 0) { - if ( ret & STREAM_PIXELS ) { - exclusive("pixels", "integrated"); - return -1; - } ret |= STREAM_INTEGRATED; } else if ( strcmp(flags[i], "peaks") == 0) { @@ -270,7 +260,7 @@ void write_chunk(FILE *ofh, struct image *i, int f) write_peaks(i, ofh); } - if ( (f & STREAM_PIXELS) || (f & STREAM_INTEGRATED) ) { + if ( f & STREAM_INTEGRATED ) { fprintf(ofh, "\n"); diff --git a/src/stream.h b/src/stream.h index e4e71728..3c77cfef 100644 --- a/src/stream.h +++ b/src/stream.h @@ -24,7 +24,6 @@ enum { STREAM_NONE = 0, STREAM_INTEGRATED = 1<<0, - STREAM_PIXELS = 1<<1, STREAM_PEAKS = 1<<2, STREAM_PEAKS_IF_INDEXED = 1<<3, STREAM_PEAKS_IF_NOT_INDEXED = 1<<4, |