From 2fc0768ad1006dc549db548b8d55f85ee44350f8 Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Mon, 21 Sep 2020 17:57:31 +0200 Subject: [PATCH] minor warning fix --- slsDetectorSoftware/src/DetectorImpl.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/slsDetectorSoftware/src/DetectorImpl.cpp b/slsDetectorSoftware/src/DetectorImpl.cpp index 2d701598a..a209891d5 100644 --- a/slsDetectorSoftware/src/DetectorImpl.cpp +++ b/slsDetectorSoftware/src/DetectorImpl.cpp @@ -623,13 +623,13 @@ void DetectorImpl::readFrameFromReceiver() { // send data to callback if (data) { - char *image = multiframe; + char *callbackImage = multiframe; int imagesize = multisize; if (gapPixels) { int n = InsertGapPixels(multiframe, multigappixels, quadEnable, dynamicRange, nDetPixelsX, nDetPixelsY); - image = multigappixels; + callbackImage = multigappixels; imagesize = n; } LOG(logDEBUG) << "Image Info:" @@ -640,8 +640,8 @@ void DetectorImpl::readFrameFromReceiver() { thisData = new detectorData(currentProgress, currentFileName, nDetPixelsX, - nDetPixelsY, image, imagesize, dynamicRange, - currentFileIndex, completeImage); + nDetPixelsY, callbackImage, imagesize, + dynamicRange, currentFileIndex, completeImage); dataReady( thisData, currentFrameIndex,