diff options
author | taw27 <taw27@bf6ca9ba-c028-0410-8290-897cf20841d1> | 2007-08-31 16:23:13 +0000 |
---|---|---|
committer | taw27 <taw27@bf6ca9ba-c028-0410-8290-897cf20841d1> | 2007-08-31 16:23:13 +0000 |
commit | 9649fcb9e495eb7943bf939845a36cae192e4f20 (patch) | |
tree | ae4572ef24614066d7ba11221815edd9784c6a12 /src/itrans-zaefferer.c | |
parent | dc0f0355a8d69c5adff079f745fa45a40997b48d (diff) |
Use signed types for image coordinates
git-svn-id: svn://cook.msm.cam.ac.uk:745/diff-tomo/dtr@101 bf6ca9ba-c028-0410-8290-897cf20841d1
Diffstat (limited to 'src/itrans-zaefferer.c')
-rw-r--r-- | src/itrans-zaefferer.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/itrans-zaefferer.c b/src/itrans-zaefferer.c index c6e7b39..490f644 100644 --- a/src/itrans-zaefferer.c +++ b/src/itrans-zaefferer.c @@ -14,6 +14,7 @@ #endif #include <stdint.h> +#include <assert.h> #include "control.h" #include "imagedisplay.h" @@ -28,9 +29,7 @@ unsigned int itrans_peaksearch_zaefferer(ImageRecord imagerecord, ControlContext unsigned int n_reflections; int width, height; uint16_t *image; - double tilt_degrees; - tilt_degrees = imagerecord.tilt; image = imagerecord.image; width = imagerecord.width; height = imagerecord.height; @@ -58,8 +57,8 @@ unsigned int itrans_peaksearch_zaefferer(ImageRecord imagerecord, ControlContext if ( grad > 400 ) { - unsigned int mask_x, mask_y; - unsigned int sx, sy; + int mask_x, mask_y; + int sx, sy; double max; unsigned int did_something = 1; @@ -82,7 +81,11 @@ unsigned int itrans_peaksearch_zaefferer(ImageRecord imagerecord, ControlContext } if ( !did_something ) { - reflection_add_from_dp(ctx, ((double)mask_x-imagerecord.x_centre), ((double)mask_y-imagerecord.y_centre), + assert(mask_x<width); + assert(mask_y<height); + assert(mask_x>=0); + assert(mask_y>=0); + reflection_add_from_dp(ctx, (mask_x-imagerecord.x_centre), (mask_y-imagerecord.y_centre), imagerecord, image[mask_x + width*mask_y]); n_reflections++; } |