Skip to content

Commit

Permalink
Fix various warnings detected with msvc17 around cast
Browse files Browse the repository at this point in the history
  • Loading branch information
fspindle committed Mar 20, 2024
1 parent 9daef7b commit bc77d8a
Show file tree
Hide file tree
Showing 6 changed files with 29 additions and 29 deletions.
6 changes: 3 additions & 3 deletions modules/core/src/math/misc/vpStatisticalTestHinkley.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -174,13 +174,13 @@ void vpStatisticalTestHinkley::computeMean(double signal)
// i.e. if ( ((m_Mk-m_Sk) == 0) && ((m_Tk-m_Nk) == 0) )
if ((std::fabs(m_Mk - m_Sk) <= std::fabs(vpMath::maximum(m_Mk, m_Sk)) * std::numeric_limits<double>::epsilon()) &&
(std::fabs(m_Tk - m_Nk) <= std::fabs(vpMath::maximum(m_Tk, m_Nk)) * std::numeric_limits<double>::epsilon())) {
m_mean = (m_mean * (m_count - 1) + signal) / (m_count);
m_mean = (m_mean * (m_count - 1) + static_cast<float>(signal)) / (m_count);
}
}

void vpStatisticalTestHinkley::computeSk(double signal)
{
m_Sk += signal - m_mean + m_dmin2;
m_Sk += static_cast<float>(signal) - m_mean + m_dmin2;
}

void vpStatisticalTestHinkley::computeMk()
Expand All @@ -192,7 +192,7 @@ void vpStatisticalTestHinkley::computeMk()

void vpStatisticalTestHinkley::computeTk(double signal)
{
m_Tk += signal - m_mean - m_dmin2;
m_Tk += static_cast<float>(signal) - m_mean - m_dmin2;
}

void vpStatisticalTestHinkley::computeNk()
Expand Down
4 changes: 2 additions & 2 deletions modules/core/test/math/testSPC.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -101,11 +101,11 @@ bool getOptions(int argc, const char **argv, float &opt_mean, float &opt_stdev,
while (i < argc) {
std::string argname(argv[i]);
if ((argname == "--mean") && ((i + 1) < argc)) {
opt_mean = std::atof(argv[i + 1]);
opt_mean = static_cast<float>(std::atof(argv[i + 1]));
++i;
}
else if ((argname == "--stdev") && ((i + 1) < argc)) {
opt_stdev = std::atof(argv[i + 1]);
opt_stdev = static_cast<float>(std::atof(argv[i + 1]));
++i;
}
else if ((argname == "-v") || (argname == "--verbose")) {
Expand Down
2 changes: 1 addition & 1 deletion modules/imgproc/src/vpCircleHoughTransform.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1084,7 +1084,7 @@ vpCircleHoughTransform::computeCircleProbability(const vpImageCircle &circle, co
float visibleArc(static_cast<float>(nbVotes));
float theoreticalLenght;
if (mp_mask != nullptr) {
theoreticalLenght = static_cast<unsigned int>(circle.computePixelsInMask(*mp_mask));
theoreticalLenght = static_cast<float>(circle.computePixelsInMask(*mp_mask));
}
else {
theoreticalLenght = circle.computeArcLengthInRoI(vpRect(vpImagePoint(0, 0), m_edgeMap.getWidth(), m_edgeMap.getHeight()));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -129,9 +129,9 @@ int main(int argc, const char **argv)
method = vp::GAMMA_MANUAL;
}
vpImage<unsigned char> I_gray_gamma_correction;
vp::gammaCorrection(I_gray, I_gray_gamma_correction, gamma, method);
vp::gammaCorrection(I_gray, I_gray_gamma_correction, static_cast<float>(gamma), method);
vpImage<vpRGBa> I_color_gamma_correction;
vp::gammaCorrection(I_color, I_color_gamma_correction, gamma, colorHandling, method);
vp::gammaCorrection(I_color, I_color_gamma_correction, static_cast<float>(gamma), colorHandling, method);
//! [Gamma correction]
I_gray_res.insert(I_gray_gamma_correction, vpImagePoint(0, I_gray.getWidth()));
ss.str("");
Expand Down
12 changes: 6 additions & 6 deletions tutorial/imgproc/hough-transform/tutorial-circle-hough.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ bool run_detection(const vpImage<unsigned char> &I_src, vpCircleHoughTransform &
#endif
unsigned int idColor = 0;
//! [Iterate detections]
const unsigned int nbCircle = detectedCircles.size();
const unsigned int nbCircle = static_cast<unsigned int>(detectedCircles.size());
for (unsigned int idCircle = 0; idCircle < nbCircle; ++idCircle) {
const vpImageCircle &circleCandidate = detectedCircles[idCircle];
vpImageDraw::drawCircle(I_disp, circleCandidate, v_colors[idColor], 2);
Expand Down Expand Up @@ -77,11 +77,11 @@ bool run_detection(const vpImage<unsigned char> &I_src, vpCircleHoughTransform &
{
const unsigned int crossSize = 3;
const unsigned int crossThickness = 1;
unsigned int nbVotedCircles = opt_votingPoints->size();
unsigned int nbVotedCircles = static_cast<unsigned int>(opt_votingPoints->size());
for (unsigned int idCircle = 0; idCircle < nbVotedCircles; ++idCircle) {
// Get the voting points of a detected circle
const std::vector<std::pair<unsigned int, unsigned int> > &votingPoints = (*opt_votingPoints)[idCircle];
unsigned int nbVotingPoints = votingPoints.size();
unsigned int nbVotingPoints = static_cast<unsigned int>(votingPoints.size());
for (unsigned int idPoint = 0; idPoint < nbVotingPoints; ++idPoint) {
// Draw the voting points
const std::pair<unsigned int, unsigned int> &pt = votingPoints[idPoint];
Expand Down Expand Up @@ -271,7 +271,7 @@ int main(int argc, char **argv)
i++;
}
else if (argName == "--visibility-ratio-thresh" && i + 1 < argc) {
opt_visibilityRatioThresh = atof(argv[i + 1]);
opt_visibilityRatioThresh = static_cast<float>(atof(argv[i + 1]));
i++;
}
else if (argName == "--record-voting-points") {
Expand Down Expand Up @@ -471,8 +471,8 @@ int main(int argc, char **argv)
, opt_nbEdgeFilteringIter
, opt_centerXlimits
, opt_centerYlimits
, opt_minRadius
, opt_maxRadius
, static_cast<float>(opt_minRadius)
, static_cast<float>(opt_maxRadius)
, opt_dilatationKerneSize
, opt_averagingWindowSize
, opt_centerThresh
Expand Down
30 changes: 15 additions & 15 deletions tutorial/mean-drift/tutorial-meandrift.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -396,8 +396,8 @@ int testOnSynthetic(const TutorialMeanDrift::TypeTest &type, const TutorialMeanD
//! [Test_Init]
// Initial computation of the mean and stdev of the input signal
for (unsigned int i = 0; i < parameters.m_test_nbsamples; ++i) {
vpGaussRand rndGen(stdev, mean, static_cast<float>(idFrame) * dt);
signal = rndGen();
vpGaussRand rndGen(stdev, mean, static_cast<long>(idFrame * dt));
signal = static_cast<float>(rndGen());
p_test->testDownUpwardMeanDrift(signal);
++idFrame;
}
Expand All @@ -411,8 +411,8 @@ int testOnSynthetic(const TutorialMeanDrift::TypeTest &type, const TutorialMeanD
bool hasToRun = true;
vpStatisticalTestAbstract::vpMeanDriftType drift_type = vpStatisticalTestAbstract::MEAN_DRIFT_NONE;
while (hasToRun) {
vpGaussRand rndGen(stdev, mean_eff, static_cast<float>(idFrame) * dt);
signal = rndGen();
vpGaussRand rndGen(stdev, mean_eff, static_cast<long>(idFrame * dt));
signal = static_cast<float>(rndGen());
plotter.plot(0, 0, idFrame - parameters.m_test_nbsamples, signal);
drift_type = p_test->testDownUpwardMeanDrift(signal);
if ((drift_type != vpStatisticalTestAbstract::MEAN_DRIFT_NONE) && (parameters.m_test_activatedalarms[drift_type])) {
Expand Down Expand Up @@ -488,15 +488,15 @@ int main(int argc, char *argv[])
++i;
}
else if ((std::string(argv[i]) == "--mean") && ((i + 1) < argc)) {
opt_mean = std::atof(argv[i + 1]);
opt_mean = static_cast<float>(std::atof(argv[i + 1]));
++i;
}
else if ((std::string(argv[i]) == "--mean-drift") && ((i + 1) < argc)) {
opt_meandrift = std::atof(argv[i + 1]);
opt_meandrift = static_cast<float>(std::atof(argv[i + 1]));
++i;
}
else if ((std::string(argv[i]) == "--stdev") && ((i + 1) < argc)) {
opt_stdev = std::atof(argv[i + 1]);
opt_stdev = static_cast<float>(std::atof(argv[i + 1]));
++i;
}
else if ((std::string(argv[i]) == "--alarms")) {
Expand All @@ -520,34 +520,34 @@ int main(int argc, char *argv[])
i += nbArguments;
}
else if ((std::string(argv[i]) == "--cusum-h") && ((i + 1) < argc)) {
parameters.m_cusum_h = std::atof(argv[i + 1]);
parameters.m_cusum_h = static_cast<float>(std::atof(argv[i + 1]));
++i;
}
else if ((std::string(argv[i]) == "--cusum-k") && ((i + 1) < argc)) {
parameters.m_cusum_k = std::atof(argv[i + 1]);
parameters.m_cusum_k = static_cast<float>(std::atof(argv[i + 1]));
++i;
}
else if ((std::string(argv[i]) == "--ewma-alpha") && ((i + 1) < argc)) {
parameters.m_ewma_alpha = std::atof(argv[i + 1]);
parameters.m_ewma_alpha = static_cast<float>(std::atof(argv[i + 1]));
++i;
}
else if ((std::string(argv[i]) == "--hinkley-alpha") && ((i + 1) < argc)) {
parameters.m_hinkley_alpha = std::atof(argv[i + 1]);
parameters.m_hinkley_alpha = static_cast<float>(std::atof(argv[i + 1]));
++i;
}
else if ((std::string(argv[i]) == "--hinkley-delta") && ((i + 1) < argc)) {
parameters.m_hinkley_delta = std::atof(argv[i + 1]);
parameters.m_hinkley_delta = static_cast<float>(std::atof(argv[i + 1]));
++i;
}
else if (std::string(argv[i]) == "--hinkley-compute") {
parameters.m_hinkley_computealphadelta = true;
}
else if ((std::string(argv[i]) == "--hinkley-h") && ((i + 1) < argc)) {
parameters.m_hinkley_h = std::atof(argv[i + 1]);
parameters.m_hinkley_h = static_cast<float>(std::atof(argv[i + 1]));
++i;
}
else if ((std::string(argv[i]) == "--hinkley-k") && ((i + 1) < argc)) {
parameters.m_hinkley_k = std::atof(argv[i + 1]);
parameters.m_hinkley_k = static_cast<float>(std::atof(argv[i + 1]));
++i;
}
else if ((std::string(argv[i]) == "--shewhart-rules") && (i + vpStatisticalTestShewhart::COUNT_WECO - 1 < argc)) {
Expand All @@ -566,7 +566,7 @@ int main(int argc, char *argv[])
parameters.m_shewhart_useWECO = true;
}
else if ((std::string(argv[i]) == "--sigma-h") && ((i + 1) < argc)) {
parameters.m_sigma_h = std::atof(argv[i + 1]);
parameters.m_sigma_h = static_cast<float>(std::atof(argv[i + 1]));
++i;
}
else if ((std::string(argv[i]) == "--help") || (std::string(argv[i]) == "-h")) {
Expand Down

0 comments on commit bc77d8a

Please sign in to comment.