Merge pull request #7145 from Bleach665:vs2010_fix

This commit is contained in:
Alexander Alekhin 2016-08-20 21:51:47 +00:00
commit 413e985907

View File

@ -253,8 +253,8 @@ CalibProcessor::CalibProcessor(cv::Ptr<calibrationData> data, captureParameters
mCapuredFrames = 0;
mNeededFramesNum = capParams.calibrationStep;
mDelayBetweenCaptures = static_cast<int>(capParams.captureDelay * capParams.fps);
mMaxTemplateOffset = std::sqrt(std::pow(mCalibData->imageSize.height, 2) +
std::pow(mCalibData->imageSize.width, 2)) / 20.0;
mMaxTemplateOffset = std::sqrt(static_cast<float>(mCalibData->imageSize.height * mCalibData->imageSize.height) +
static_cast<float>(mCalibData->imageSize.width * mCalibData->imageSize.width)) / 20.0;
mSquareSize = capParams.squareSize;
mTemplDist = capParams.templDst;