diff options
| author | Thomas White <taw@physics.org> | 2017-07-06 17:22:11 +0200 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2017-07-06 17:24:59 +0200 |
| commit | 5292f57d4434c7267e8d945871513d742ff42427 (patch) | |
| tree | d460aa5cef5a501516876850ef243cfc27313d5a /libcrystfel/src/dirax.c | |
| parent | 48d4a6b8e82cce81222ec58fdfb488ed79ce0bcf (diff) | |
| parent | dc3395900fc3ce0d3961757628ff83ad6456be19 (diff) | |
Merge branch 'master' into taketwo
Diffstat (limited to 'libcrystfel/src/dirax.c')
| -rw-r--r-- | libcrystfel/src/dirax.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libcrystfel/src/dirax.c b/libcrystfel/src/dirax.c index 19f35696..e9466a24 100644 --- a/libcrystfel/src/dirax.c +++ b/libcrystfel/src/dirax.c @@ -3,11 +3,11 @@ * * Invoke the DirAx auto-indexing program * - * Copyright © 2012-2014 Deutsches Elektronen-Synchrotron DESY, + * Copyright © 2012-2017 Deutsches Elektronen-Synchrotron DESY, * a research centre of the Helmholtz Association. * * Authors: - * 2010-2014 Thomas White <taw@physics.org> + * 2010-2014,2017 Thomas White <taw@physics.org> * * This file is part of CrystFEL. * @@ -532,7 +532,7 @@ static void write_drx(struct image *image) } -int run_dirax(struct image *image, IndexingPrivate *ipriv) +int run_dirax(struct image *image, void *ipriv) { unsigned int opts; int status; @@ -638,8 +638,8 @@ int run_dirax(struct image *image, IndexingPrivate *ipriv) } -IndexingPrivate *dirax_prepare(IndexingMethod *indm, UnitCell *cell, - struct detector *det, float *ltl) +void *dirax_prepare(IndexingMethod *indm, UnitCell *cell, + struct detector *det, float *ltl) { struct dirax_private *dp; int need_cell = 0; @@ -670,7 +670,7 @@ IndexingPrivate *dirax_prepare(IndexingMethod *indm, UnitCell *cell, } -void dirax_cleanup(IndexingPrivate *pp) +void dirax_cleanup(void *pp) { struct dirax_private *p; p = (struct dirax_private *)pp; |