diff options
| author | Thomas White <taw@physics.org> | 2020-07-30 10:16:37 +0200 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2020-07-30 10:17:12 +0200 |
| commit | e14e413957b0c1e357167f43f129a6ef39ef5051 (patch) | |
| tree | c26d0a6235091010138a9313bf2cfb8924903610 /libcrystfel/src/image.c | |
| parent | f9a6d5ea442e074d1e61585b572837f80e2ddac9 (diff) | |
Eliminate duplicate symbols
This makes searching easier, and also permits Meson's unity build mode.
Diffstat (limited to 'libcrystfel/src/image.c')
| -rw-r--r-- | libcrystfel/src/image.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/libcrystfel/src/image.c b/libcrystfel/src/image.c index 1780526b..68234a33 100644 --- a/libcrystfel/src/image.c +++ b/libcrystfel/src/image.c @@ -340,8 +340,8 @@ static char *get_value_and_units(struct image *image, const char *from, } -static double get_length(struct image *image, const char *from, - double default_scale) +static double im_get_length(struct image *image, const char *from, + double default_scale) { char *units; double value; @@ -445,7 +445,9 @@ void create_detgeom(struct image *image, const DataTemplate *dtempl) /* NB cnx,cny are in pixels, cnz is in m */ detgeom->panels[i].cnx = dtempl->panels[i].cnx; detgeom->panels[i].cny = dtempl->panels[i].cny; - detgeom->panels[i].cnz = get_length(image, dtempl->panels[i].cnz_from, 1e-3); + detgeom->panels[i].cnz = im_get_length(image, + dtempl->panels[i].cnz_from, + 1e-3); /* Apply offset (in m) and then convert cnz from * m to pixels */ @@ -453,8 +455,8 @@ void create_detgeom(struct image *image, const DataTemplate *dtempl) detgeom->panels[i].cnz /= detgeom->panels[i].pixel_pitch; /* Apply overall shift (already in m) */ - shift_x = get_length(image, dtempl->shift_x_from, 1.0); - shift_y = get_length(image, dtempl->shift_y_from, 1.0); + shift_x = im_get_length(image, dtempl->shift_x_from, 1.0); + shift_y = im_get_length(image, dtempl->shift_y_from, 1.0); if ( !isnan(shift_x) ) { detgeom->panels[i].cnx += shift_x; |