diff options
| author | Thomas White <taw@physics.org> | 2014-11-10 19:09:49 +0100 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2014-11-10 19:09:49 +0100 |
| commit | 35ab2f314a551568ca2db485bba1199bb67148f5 (patch) | |
| tree | eb466c8a46935307a15bcbd1ca3fd065a7bb3357 /src | |
| parent | e3135a2154b1aa1c137664030972a09e50b7f1d8 (diff) | |
Fussiness
Diffstat (limited to 'src')
| -rw-r--r-- | src/dw-hdfsee.c | 10 | ||||
| -rw-r--r-- | src/dw-hdfsee.h | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/dw-hdfsee.c b/src/dw-hdfsee.c index e9b6ee86..4bb60b8d 100644 --- a/src/dw-hdfsee.c +++ b/src/dw-hdfsee.c @@ -1176,7 +1176,7 @@ static gint displaywindow_about(GtkWidget *widget, DisplayWindow *dw) static int save_geometry_file(DisplayWindow *dw) { GtkWidget *d; - gchar * output_filename; + gchar *output_filename; int w; d = gtk_file_chooser_dialog_new("Save Detector Geometry", @@ -1186,10 +1186,10 @@ static int save_geometry_file(DisplayWindow *dw) GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, NULL); - gtk_dialog_run (GTK_DIALOG (d)); + gtk_dialog_run(GTK_DIALOG(d)); output_filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER (d)); w = write_detector_geometry(dw->geom_filename, output_filename, - dw->image->det); + dw->image->det); gtk_widget_destroy(d); g_free(output_filename); return w; @@ -2538,7 +2538,6 @@ DisplayWindow *displaywindow_open(char *filename, char *geom_filename, } if ( check ) { ERROR("Couldn't load file\n"); - free(dw->geom_filename); hdfile_close(dw->hdfile); free(dw->geom_filename); return NULL; @@ -2626,7 +2625,8 @@ DisplayWindow *displaywindow_open(char *filename, char *geom_filename, displaywindow_update_menus(dw, element); } else { if ( dw->multi_event != 0 ) { - displaywindow_update_event_menu(dw, dw->ev_list, dw->curr_event); + displaywindow_update_event_menu(dw, dw->ev_list, + dw->curr_event); } } diff --git a/src/dw-hdfsee.h b/src/dw-hdfsee.h index 14c17287..b7a49462 100644 --- a/src/dw-hdfsee.h +++ b/src/dw-hdfsee.h @@ -3,12 +3,12 @@ * * Quick yet non-crappy HDF viewer * - * Copyright © 2012 Deutsches Elektronen-Synchrotron DESY, - * a research centre of the Helmholtz Association. + * Copyright © 2012-2014 Deutsches Elektronen-Synchrotron DESY, + * a research centre of the Helmholtz Association. * Copyright © 2012 Richard Kirian * * Authors: - * 2009-2012 Thomas White <taw@physics.org> + * 2009-2014 Thomas White <taw@physics.org> * 2014 Valerio Mariani * 2014 Takanori Nakane <nakane.t@gmail.com> * 2012 Richard Kirian @@ -90,7 +90,7 @@ typedef struct { int not_ready_yet; - struct detector* simple_geom; + struct detector *simple_geom; struct hdfile *hdfile; struct image *image; |