diff options
| author | Thomas White <taw@physics.org> | 2014-12-14 15:14:29 +0100 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2014-12-14 15:14:29 +0100 |
| commit | 96dba6ec96dc90bd5795b9ca0517c82fa5aad2c6 (patch) | |
| tree | 28e2a549e7861e1f932de27690f7bcbb7aabcbce /libcrystfel/src | |
| parent | 4da7505a8e4dc37cf1d981a73f5b056dc6f418d5 (diff) | |
Fussiness
Diffstat (limited to 'libcrystfel/src')
| -rw-r--r-- | libcrystfel/src/events.c | 5 | ||||
| -rw-r--r-- | libcrystfel/src/hdf5-file.c | 9 |
2 files changed, 6 insertions, 8 deletions
diff --git a/libcrystfel/src/events.c b/libcrystfel/src/events.c index 03562fb5..d431a851 100644 --- a/libcrystfel/src/events.c +++ b/libcrystfel/src/events.c @@ -83,7 +83,6 @@ struct filename_plus_event *initialize_filename_plus_event() int event_cmp(struct event *ev1, struct event *ev2) { - int pi; int di; @@ -112,7 +111,6 @@ int event_cmp(struct event *ev1, struct event *ev2) int add_non_existing_event_to_event_list(struct event_list *ev_list, struct event *ev) { - int evi; int found = 0; @@ -133,7 +131,6 @@ int add_non_existing_event_to_event_list(struct event_list *ev_list, int append_event_to_event_list(struct event_list *ev_list, struct event *ev) { - struct event **new_el; new_el = realloc(ev_list->events, @@ -151,7 +148,6 @@ int append_event_to_event_list(struct event_list *ev_list, struct event *ev) struct event *copy_event(struct event *ev) { - struct event *new_ev; int pi, di; @@ -543,7 +539,6 @@ char *event_path_placeholder_subst(const char *entry, char *retrieve_full_path(struct event *ev, const char *data) { - int ei ; char *return_value; diff --git a/libcrystfel/src/hdf5-file.c b/libcrystfel/src/hdf5-file.c index 0d041e01..aad71c31 100644 --- a/libcrystfel/src/hdf5-file.c +++ b/libcrystfel/src/hdf5-file.c @@ -486,11 +486,13 @@ int get_peaks(struct image *image, struct hdfile *f, const char *p, if ( p == NULL ) continue; if ( p->no_index ) continue; - /* Convert coordinates to match rearranged panels in memory */ + /* Convert coordinates to match rearranged + * panels in memory */ fs = fs - p->orig_min_fs + p->min_fs; ss = ss - p->orig_min_ss + p->min_ss; - image_add_feature(image->features, fs, ss, image, val, NULL); + image_add_feature(image->features, fs, ss, image, + val, NULL); } @@ -547,7 +549,8 @@ int get_peaks(struct image *image, struct hdfile *f, const char *p, ERROR("Couldn't reserve memory for the peak list.\n"); return 1; } - r = H5Dread(dh, H5T_NATIVE_FLOAT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf); + r = H5Dread(dh, H5T_NATIVE_FLOAT, H5S_ALL, H5S_ALL, + H5P_DEFAULT, buf); if ( r < 0 ) { ERROR("Couldn't read peak list.\n"); free(buf); |