aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas White <taw@physics.org>2017-07-06 17:15:10 +0200
committerThomas White <taw@physics.org>2017-07-06 17:15:10 +0200
commit548be7934456e116c5a8832c6e8e2f82f165c516 (patch)
tree2376488e8e1402999bbf7a2ebb97b74f003dfdf8
parent12641fdf021f45fe7a4b19a384b80f3cfe8f9277 (diff)
Use void pointers for indexing engine private stuff
-rw-r--r--libcrystfel/src/taketwo.c8
-rw-r--r--libcrystfel/src/taketwo.h6
2 files changed, 7 insertions, 7 deletions
diff --git a/libcrystfel/src/taketwo.c b/libcrystfel/src/taketwo.c
index c1011a96..434c5b0d 100644
--- a/libcrystfel/src/taketwo.c
+++ b/libcrystfel/src/taketwo.c
@@ -1523,7 +1523,7 @@ static UnitCell *run_taketwo(UnitCell *cell, struct rvec *rlps, int rlp_count)
/* CrystFEL interface hooks */
-int taketwo_index(struct image *image, IndexingPrivate *ipriv)
+int taketwo_index(struct image *image, void *priv)
{
Crystal *cr;
UnitCell *cell;
@@ -1575,8 +1575,8 @@ int taketwo_index(struct image *image, IndexingPrivate *ipriv)
}
-IndexingPrivate *taketwo_prepare(IndexingMethod *indm, UnitCell *cell,
- struct detector *det, float *ltl)
+void *taketwo_prepare(IndexingMethod *indm, UnitCell *cell,
+ struct detector *det, float *ltl)
{
struct taketwo_private *tp;
@@ -1624,7 +1624,7 @@ IndexingPrivate *taketwo_prepare(IndexingMethod *indm, UnitCell *cell,
tp->cell = cell;
tp->indm = *indm;
- return (IndexingPrivate *)tp;
+ return tp;
}
diff --git a/libcrystfel/src/taketwo.h b/libcrystfel/src/taketwo.h
index 35f7cbe3..4c06e334 100644
--- a/libcrystfel/src/taketwo.h
+++ b/libcrystfel/src/taketwo.h
@@ -33,9 +33,9 @@
#include "cell.h"
-extern IndexingPrivate *taketwo_prepare(IndexingMethod *indm, UnitCell *cell,
- struct detector *det, float *ltl);
-extern int taketwo_index(struct image *image, IndexingPrivate *ipriv);
+extern void *taketwo_prepare(IndexingMethod *indm, UnitCell *cell,
+ struct detector *det, float *ltl);
+extern int taketwo_index(struct image *image, void *priv);
extern void taketwo_cleanup(IndexingPrivate *pp);
#endif /* TAKETWO_H */