From 19f4c07642150f4b0ccf7ba564e670e6bac118cc Mon Sep 17 00:00:00 2001 From: vhinger Date: Tue, 29 Oct 2024 17:32:21 +0100 Subject: [PATCH] Datatype change long long int also for multiThreadedInterpolatingDetector; note that this change could have further impact on local code --- slsDetectorCalibration/multiThreadedInterpolatingDetector.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/slsDetectorCalibration/multiThreadedInterpolatingDetector.h b/slsDetectorCalibration/multiThreadedInterpolatingDetector.h index fd6cd0643..502400965 100644 --- a/slsDetectorCalibration/multiThreadedInterpolatingDetector.h +++ b/slsDetectorCalibration/multiThreadedInterpolatingDetector.h @@ -66,7 +66,7 @@ class multiThreadedInterpolatingDetector return (dets[0])->getInterpolation(); }; - virtual int *getImage(int &nnx, int &nny, int &nsx, int &nsy) { + virtual long long int *getImage(int &nnx, int &nny, int &nsx, int &nsy) { if (getInterpolation() == NULL) return multiThreadedAnalogDetector::getImage(nnx, nny, nsx, nsy); // if one interpolates, the whole image is stored in detector 0; @@ -78,10 +78,10 @@ class multiThreadedInterpolatingDetector delete image; image = NULL; } - image = new int[nn]; + image = new long long int[nn]; img = dets[0]->getImage(); for (int i = 0; i < nn; i++) { - image[i] = img[i]; + image[i] = static_cast(img[i]); } return image; };