diff options
| author | Thomas White <taw@physics.org> | 2022-09-21 16:32:20 +0200 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2022-09-21 16:32:20 +0200 |
| commit | 7c42f8e2b675e017ab1144ca38c9e74c24d68266 (patch) | |
| tree | 2d8c969184e56a4a1260503a541446d687976f89 /libcrystfel/src/image.c | |
| parent | ef7157ef517cf66dfc5b2c2cfc6602e30a31d060 (diff) | |
create_detgeom: Return detgeom structure rather than altering image argument
Diffstat (limited to 'libcrystfel/src/image.c')
| -rw-r--r-- | libcrystfel/src/image.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libcrystfel/src/image.c b/libcrystfel/src/image.c index 3ce8914e..45b61bec 100644 --- a/libcrystfel/src/image.c +++ b/libcrystfel/src/image.c @@ -1074,7 +1074,8 @@ struct image *image_create_for_simulation(const DataTemplate *dtempl) return NULL; } - if ( create_detgeom(image, dtempl) ) { + image->detgeom = create_detgeom(image, dtempl); + if ( image->detgeom == NULL ) { image_free(image); return NULL; } @@ -1125,9 +1126,9 @@ static int do_image_read(struct image *image, const DataTemplate *dtempl, } profile_start("create-detgeom"); - r = create_detgeom(image, dtempl); + image->detgeom = create_detgeom(image, dtempl); profile_end("create-detgeom"); - if ( r ) { + if ( image->detgeom == NULL ) { ERROR("Failed to read geometry information\n"); return 1; } |