diff --git a/Modules/Core/Common/include/itkTotalProgressReporter.h b/Modules/Core/Common/include/itkTotalProgressReporter.h index 313fed0b983..782ef20fe4a 100644 --- a/Modules/Core/Common/include/itkTotalProgressReporter.h +++ b/Modules/Core/Common/include/itkTotalProgressReporter.h @@ -102,7 +102,7 @@ class ITKCommon_EXPORT TotalProgressReporter if (count >= m_PixelsBeforeUpdate) { - const SizeValueType total = static_cast(m_PixelsPerUpdate - m_PixelsBeforeUpdate) + count; + const SizeValueType total = m_PixelsPerUpdate - m_PixelsBeforeUpdate + count; const SizeValueType numberOfUpdates = total / m_PixelsPerUpdate; m_PixelsBeforeUpdate = m_PixelsPerUpdate - total % m_PixelsPerUpdate; diff --git a/Modules/Core/Common/src/itkObjectFactoryBase.cxx b/Modules/Core/Common/src/itkObjectFactoryBase.cxx index 45b4f51d7c1..1b162e598bd 100644 --- a/Modules/Core/Common/src/itkObjectFactoryBase.cxx +++ b/Modules/Core/Common/src/itkObjectFactoryBase.cxx @@ -667,7 +667,7 @@ ObjectFactoryBase::UnRegisterAllFactories() std::list libs; for (auto & registeredFactory : m_PimplGlobals->m_RegisteredFactories) { - libs.push_back(static_cast(registeredFactory->m_LibraryHandle)); + libs.push_back(registeredFactory->m_LibraryHandle); } // Unregister each factory for (auto & registeredFactory : m_PimplGlobals->m_RegisteredFactories) diff --git a/Modules/Core/Common/src/itkRealTimeStamp.cxx b/Modules/Core/Common/src/itkRealTimeStamp.cxx index f892e1e8148..5753eed6143 100644 --- a/Modules/Core/Common/src/itkRealTimeStamp.cxx +++ b/Modules/Core/Common/src/itkRealTimeStamp.cxx @@ -237,7 +237,7 @@ RealTimeStamp::operator+=(const RealTimeInterval & difference) CARRY_UNITS_OVER_UNSIGNED(seconds, micro_seconds); this->m_Seconds = static_cast(seconds); - this->m_MicroSeconds = static_cast(micro_seconds); + this->m_MicroSeconds = micro_seconds; return *this; } diff --git a/Modules/Core/Common/test/itkMetaDataDictionaryTest.cxx b/Modules/Core/Common/test/itkMetaDataDictionaryTest.cxx index b98230b0630..2612329ca0f 100644 --- a/Modules/Core/Common/test/itkMetaDataDictionaryTest.cxx +++ b/Modules/Core/Common/test/itkMetaDataDictionaryTest.cxx @@ -27,7 +27,7 @@ itkMetaDataDictionaryTest(int, char *[]) //------------------------Testing of native types //-------Floats - itk::EncapsulateMetaData(MyDictionary, "ASimpleFloatInitalized", static_cast(1.234560F)); + itk::EncapsulateMetaData(MyDictionary, "ASimpleFloatInitalized", 1.234560F); { float tempfloat = 0.0; const bool IsValidReturn = itk::ExposeMetaData(MyDictionary, "ASimpleFloatInitalized", tempfloat); @@ -41,8 +41,8 @@ itkMetaDataDictionaryTest(int, char *[]) } } - itk::EncapsulateMetaData(MyDictionary, "ASimpleFloatChanged", static_cast(-1000.234560F)); - itk::EncapsulateMetaData(MyDictionary, "ASimpleFloatChanged", static_cast(-0.000000001F)); + itk::EncapsulateMetaData(MyDictionary, "ASimpleFloatChanged", -1000.234560); + itk::EncapsulateMetaData(MyDictionary, "ASimpleFloatChanged", -0.000000001); //-------Char pointers -- These can be tricky, so be careful! itk::EncapsulateMetaData(MyDictionary, "charconst*", "Value String"); diff --git a/Modules/Core/Common/test/itkNumberToStringTest.cxx b/Modules/Core/Common/test/itkNumberToStringTest.cxx index 79b6ff1e340..0ea88921d8e 100644 --- a/Modules/Core/Common/test/itkNumberToStringTest.cxx +++ b/Modules/Core/Common/test/itkNumberToStringTest.cxx @@ -47,7 +47,7 @@ itkNumberToStringTest(int, char *[]) PrintValue("unsigned short", static_cast(0)); PrintValue("short", static_cast(0)); PrintValue("unsigned int", static_cast(0)); - PrintValue("int", static_cast(0)); + PrintValue("int", 0); PrintValue("unsigned long", static_cast(0)); PrintValue("long", static_cast(0)); PrintValue("float", static_cast(0)); diff --git a/Modules/Core/Common/test/itkNumericTraitsTest.cxx b/Modules/Core/Common/test/itkNumericTraitsTest.cxx index dfb90f0f6c4..970655ed63b 100644 --- a/Modules/Core/Common/test/itkNumericTraitsTest.cxx +++ b/Modules/Core/Common/test/itkNumericTraitsTest.cxx @@ -395,7 +395,7 @@ itkNumericTraitsTest(int, char *[]) { bool testPassedStatus = true; - CheckTraits("char", static_cast('a')); + CheckTraits("char", 'a'); CheckTraits("signed char", static_cast('a')); CheckTraits("unsigned char", static_cast('a')); @@ -403,8 +403,8 @@ itkNumericTraitsTest(int, char *[]) CheckTraits("signed short", static_cast(-1)); CheckTraits("unsigned short", static_cast(1)); - CheckTraits("int", static_cast(0)); - CheckTraits("signed int", static_cast(0)); + CheckTraits("int", 0); + CheckTraits("signed int", 0); CheckTraits("unsigned int", static_cast(0)); CheckTraits("long", static_cast(0)); diff --git a/Modules/Core/Common/test/itkObjectFactoryTest2.cxx b/Modules/Core/Common/test/itkObjectFactoryTest2.cxx index f2b9c3a19d5..c07ea3d8d64 100644 --- a/Modules/Core/Common/test/itkObjectFactoryTest2.cxx +++ b/Modules/Core/Common/test/itkObjectFactoryTest2.cxx @@ -170,7 +170,7 @@ itkObjectFactoryTest2(int argc, char * argv[]) MakeImage(10, static_cast(0)); MakeImage(10, static_cast(0)); - MakeImage(10, static_cast(0)); + MakeImage(10, 0); MakeImage(10, static_cast(0)); { MakeImage(10, static_cast(0)); diff --git a/Modules/Core/Mesh/include/itkSimplexMeshVolumeCalculator.hxx b/Modules/Core/Mesh/include/itkSimplexMeshVolumeCalculator.hxx index 4c5147dddab..dfda2a38789 100644 --- a/Modules/Core/Mesh/include/itkSimplexMeshVolumeCalculator.hxx +++ b/Modules/Core/Mesh/include/itkSimplexMeshVolumeCalculator.hxx @@ -204,9 +204,9 @@ SimplexMeshVolumeCalculator::CalculateTriangleVolume(InputPointType const double yavg = (p1[1] + p2[1] + p3[1]) / 3.0; const double xavg = (p1[0] + p2[0] + p3[0]) / 3.0; - m_VolumeX += (area * static_cast(u[2]) * static_cast(zavg)); - m_VolumeY += (area * static_cast(u[1]) * static_cast(yavg)); - m_VolumeZ += (area * static_cast(u[0]) * static_cast(xavg)); + m_VolumeX += (area * u[2] * zavg); + m_VolumeY += (area * u[1] * yavg); + m_VolumeZ += (area * u[0] * xavg); m_Area += area; diff --git a/Modules/Filtering/AnisotropicSmoothing/include/itkVectorAnisotropicDiffusionFunction.hxx b/Modules/Filtering/AnisotropicSmoothing/include/itkVectorAnisotropicDiffusionFunction.hxx index 5d8a74592a5..e8a7321552b 100644 --- a/Modules/Filtering/AnisotropicSmoothing/include/itkVectorAnisotropicDiffusionFunction.hxx +++ b/Modules/Filtering/AnisotropicSmoothing/include/itkVectorAnisotropicDiffusionFunction.hxx @@ -112,7 +112,7 @@ VectorAnisotropicDiffusionFunction::CalculateAverageGradientMagnitudeSqu ++fit; } - this->SetAverageGradientMagnitudeSquared(static_cast(accumulator) / counter); + this->SetAverageGradientMagnitudeSquared(accumulator / counter); } } // end namespace itk diff --git a/Modules/Filtering/Convolution/include/itkMaskedFFTNormalizedCorrelationImageFilter.hxx b/Modules/Filtering/Convolution/include/itkMaskedFFTNormalizedCorrelationImageFilter.hxx index 1927020c453..a92a0a7dd0e 100644 --- a/Modules/Filtering/Convolution/include/itkMaskedFFTNormalizedCorrelationImageFilter.hxx +++ b/Modules/Filtering/Convolution/include/itkMaskedFFTNormalizedCorrelationImageFilter.hxx @@ -252,7 +252,7 @@ MaskedFFTNormalizedCorrelationImageFilter m_MaximumNumberOfOverlappingPixels = static_cast(calculator->GetMaximum()); if (m_RequiredNumberOfOverlappingPixels > m_MaximumNumberOfOverlappingPixels) { - m_RequiredNumberOfOverlappingPixels = (SizeValueType)m_MaximumNumberOfOverlappingPixels; + m_RequiredNumberOfOverlappingPixels = m_MaximumNumberOfOverlappingPixels; } // The user can either specify the required number of overlapping pixels or the required fraction of overlapping diff --git a/Modules/Filtering/CurvatureFlow/include/itkMinMaxCurvatureFlowFunction.hxx b/Modules/Filtering/CurvatureFlow/include/itkMinMaxCurvatureFlowFunction.hxx index 8cd0257c02e..335cf09f852 100644 --- a/Modules/Filtering/CurvatureFlow/include/itkMinMaxCurvatureFlowFunction.hxx +++ b/Modules/Filtering/CurvatureFlow/include/itkMinMaxCurvatureFlowFunction.hxx @@ -243,7 +243,7 @@ MinMaxCurvatureFlowFunction::ComputeThreshold(const Dispatch<2> &, const return threshold; } - gradMagnitude = std::sqrt(static_cast(gradMagnitude)) / static_cast(m_StencilRadius); + gradMagnitude = std::sqrt(gradMagnitude) / static_cast(m_StencilRadius); for (double & j : gradient) { diff --git a/Modules/Filtering/ImageCompare/test/itkSTAPLEImageFilterTest.cxx b/Modules/Filtering/ImageCompare/test/itkSTAPLEImageFilterTest.cxx index a74aead76ce..0cfddd101d9 100644 --- a/Modules/Filtering/ImageCompare/test/itkSTAPLEImageFilterTest.cxx +++ b/Modules/Filtering/ImageCompare/test/itkSTAPLEImageFilterTest.cxx @@ -263,7 +263,7 @@ itkSTAPLEImageFilterTest(int argc, char * argv[]) stapler->SetMaximumIterations(maximumIterations); ITK_TEST_SET_GET_VALUE(maximumIterations, stapler->GetMaximumIterations()); - auto confidenceWeight = static_cast(std::stod(argv[5])); + auto confidenceWeight = std::stod(argv[5]); stapler->SetConfidenceWeight(confidenceWeight); ITK_TEST_SET_GET_VALUE(confidenceWeight, stapler->GetConfidenceWeight()); diff --git a/Modules/Filtering/ImageGrid/include/itkBSplineResampleImageFilterBase.hxx b/Modules/Filtering/ImageGrid/include/itkBSplineResampleImageFilterBase.hxx index 480ddca7793..b480fd4c796 100644 --- a/Modules/Filtering/ImageGrid/include/itkBSplineResampleImageFilterBase.hxx +++ b/Modules/Filtering/ImageGrid/include/itkBSplineResampleImageFilterBase.hxx @@ -286,7 +286,7 @@ BSplineResampleImageFilterBase::Expand1DImage(const s for (int outK = 0; outK < static_cast(outTraverseSize); ++outK) { double outVal = 0.0; - for (int k = (outK % 2); k < static_cast(m_HSize); k += 2) + for (int k = (outK % 2); k < m_HSize; k += 2) { int i1 = (outK - k) / 2; if (i1 < 0) @@ -298,7 +298,7 @@ BSplineResampleImageFilterBase::Expand1DImage(const s } outVal = outVal + m_H[k] * in[i1]; } - for (int k = 2 - (outK % 2); k < static_cast(m_HSize); k += 2) + for (int k = 2 - (outK % 2); k < m_HSize; k += 2) { int i2 = (outK + k) / 2; if (i2 > inModK) diff --git a/Modules/Filtering/ImageIntensity/include/itkVectorRescaleIntensityImageFilter.hxx b/Modules/Filtering/ImageIntensity/include/itkVectorRescaleIntensityImageFilter.hxx index c6739eba676..211ecf396a2 100644 --- a/Modules/Filtering/ImageIntensity/include/itkVectorRescaleIntensityImageFilter.hxx +++ b/Modules/Filtering/ImageIntensity/include/itkVectorRescaleIntensityImageFilter.hxx @@ -70,7 +70,7 @@ VectorRescaleIntensityImageFilter::BeforeThreadedGene m_InputMaximumMagnitude = std::sqrt(maximumSquaredMagnitude); - m_Scale = static_cast(m_OutputMaximumMagnitude) / static_cast(m_InputMaximumMagnitude); + m_Scale = static_cast(m_OutputMaximumMagnitude) / m_InputMaximumMagnitude; // Set up the functor values this->GetFunctor().SetFactor(m_Scale); diff --git a/Modules/Filtering/QuadEdgeMeshFiltering/include/itkSmoothingQuadEdgeMeshFilter.hxx b/Modules/Filtering/QuadEdgeMeshFiltering/include/itkSmoothingQuadEdgeMeshFilter.hxx index 3df3c959cea..bc046babab6 100644 --- a/Modules/Filtering/QuadEdgeMeshFiltering/include/itkSmoothingQuadEdgeMeshFilter.hxx +++ b/Modules/Filtering/QuadEdgeMeshFiltering/include/itkSmoothingQuadEdgeMeshFilter.hxx @@ -108,7 +108,7 @@ SmoothingQuadEdgeMeshFilter::GenerateData() qe_it = qe_it->GetOnext(); } while (qe_it != qe); - OutputCoordType den = 1.0 / static_cast(sum_coeff); + OutputCoordType den = 1.0 / sum_coeff; v *= den; r += m_RelaxationFactor * v; diff --git a/Modules/Filtering/Thresholding/test/itkKappaSigmaThresholdImageCalculatorTest.cxx b/Modules/Filtering/Thresholding/test/itkKappaSigmaThresholdImageCalculatorTest.cxx index 5cdcdfc605a..8537c8a84b5 100644 --- a/Modules/Filtering/Thresholding/test/itkKappaSigmaThresholdImageCalculatorTest.cxx +++ b/Modules/Filtering/Thresholding/test/itkKappaSigmaThresholdImageCalculatorTest.cxx @@ -59,7 +59,7 @@ itkKappaSigmaThresholdImageCalculatorTest(int argc, char * argv[]) calculator->SetMaskValue(maskValue); ITK_TEST_SET_GET_VALUE(maskValue, calculator->GetMaskValue()); - auto sigmaFactor = static_cast(std::stod(argv[4])); + auto sigmaFactor = std::stod(argv[4]); calculator->SetSigmaFactor(sigmaFactor); ITK_TEST_SET_GET_VALUE(sigmaFactor, calculator->GetSigmaFactor()); diff --git a/Modules/IO/GIPL/src/itkGiplImageIO.cxx b/Modules/IO/GIPL/src/itkGiplImageIO.cxx index 951c8ffbcf4..a26d224c2a7 100644 --- a/Modules/IO/GIPL/src/itkGiplImageIO.cxx +++ b/Modules/IO/GIPL/src/itkGiplImageIO.cxx @@ -794,11 +794,11 @@ GiplImageIO::Write(const void * buffer) auto value = static_cast(m_Spacing[i]); if (m_ByteOrder == IOByteOrderEnum::BigEndian) { - ByteSwapper::SwapFromSystemToBigEndian(static_cast(&value)); + ByteSwapper::SwapFromSystemToBigEndian(&value); } if (m_ByteOrder == IOByteOrderEnum::LittleEndian) { - ByteSwapper::SwapFromSystemToLittleEndian(static_cast(&value)); + ByteSwapper::SwapFromSystemToLittleEndian(&value); } if (m_IsCompressed) { diff --git a/Modules/IO/Meta/test/itkMetaImageIOTest2.cxx b/Modules/IO/Meta/test/itkMetaImageIOTest2.cxx index b118c21aee7..4991b965238 100644 --- a/Modules/IO/Meta/test/itkMetaImageIOTest2.cxx +++ b/Modules/IO/Meta/test/itkMetaImageIOTest2.cxx @@ -49,7 +49,7 @@ TestUnknowMetaDataBug(const std::string & fname) itk::MetaDataDictionary & dict = image->GetMetaDataDictionary(); - itk::EncapsulateMetaData(dict, "ASimpleFloatInitalized", static_cast(1.234560F)); + itk::EncapsulateMetaData(dict, "ASimpleFloatInitalized", 1.234560F); itk::EncapsulateMetaData>( dict, "AnUnsuportedComplexInitalized", std::complex(1.234560F)); diff --git a/Modules/IO/Meta/test/testMetaImage.cxx b/Modules/IO/Meta/test/testMetaImage.cxx index 953364480d0..f4d64c82416 100644 --- a/Modules/IO/Meta/test/testMetaImage.cxx +++ b/Modules/IO/Meta/test/testMetaImage.cxx @@ -270,31 +270,31 @@ testMetaImage(int, char *[]) { return EXIT_FAILURE; } - if (ReadWriteCompare(static_cast(-3141592), "int")) + if (ReadWriteCompare(-3141592, "int")) { return EXIT_FAILURE; } - if (ReadWriteCompare(static_cast(27182818), "unsigned long")) + if (ReadWriteCompare(27182818ul, "unsigned long")) { return EXIT_FAILURE; } - if (ReadWriteCompare(static_cast(-31415926), "long")) + if (ReadWriteCompare(-31415926l, "long")) { return EXIT_FAILURE; } - if (ReadWriteCompare(static_cast(8589934592ull), "unsigned long long")) + if (ReadWriteCompare(8589934592ull, "unsigned long long")) { return EXIT_FAILURE; } - if (ReadWriteCompare(static_cast(-8589934592ll), "long long")) + if (ReadWriteCompare(-8589934592ll, "long long")) { return EXIT_FAILURE; } - if (ReadWriteCompare(static_cast(1.23456), "float")) + if (ReadWriteCompare(1.23456F, "float")) { return EXIT_FAILURE; } - if (ReadWriteCompare(static_cast(7.891011121314), "double")) + if (ReadWriteCompare(7.891011121314, "double")) { return EXIT_FAILURE; } diff --git a/Modules/IO/NIFTI/src/itkNiftiImageIO.cxx b/Modules/IO/NIFTI/src/itkNiftiImageIO.cxx index b02cd925a78..1636693ea32 100644 --- a/Modules/IO/NIFTI/src/itkNiftiImageIO.cxx +++ b/Modules/IO/NIFTI/src/itkNiftiImageIO.cxx @@ -1255,8 +1255,8 @@ NiftiImageIO::WriteImageInformation() // external tools believe that the time units must be set, even if there // is only one dataset. Having the time specified for a purely spatial // image has no consequence, so go ahead and set it to seconds. - m_Holder->ptr->xyz_units = int{ NIFTI_UNITS_MM }; - m_Holder->ptr->time_units = int{ NIFTI_UNITS_SEC }; + m_Holder->ptr->xyz_units = NIFTI_UNITS_MM; + m_Holder->ptr->time_units = NIFTI_UNITS_SEC; m_Holder->ptr->dim[7] = m_Holder->ptr->nw = 1; m_Holder->ptr->dim[6] = m_Holder->ptr->nv = 1; m_Holder->ptr->dim[5] = m_Holder->ptr->nu = 1; diff --git a/Modules/IO/Siemens/src/itkSiemensVisionImageIO.cxx b/Modules/IO/Siemens/src/itkSiemensVisionImageIO.cxx index ff597b35cd7..c2539932bb4 100644 --- a/Modules/IO/Siemens/src/itkSiemensVisionImageIO.cxx +++ b/Modules/IO/Siemens/src/itkSiemensVisionImageIO.cxx @@ -158,9 +158,9 @@ SiemensVisionImageIO::ReadHeader(const char * FileNameToRead) DB(hdr->sliceThickness); int tmpInt = 0; this->GetIntAt(f, HDR_DISPLAY_SIZE, &tmpInt, sizeof(int)); - hdr->imageXsize = static_cast(tmpInt); + hdr->imageXsize = tmpInt; DB(hdr->imageXsize); - hdr->imageYsize = static_cast(tmpInt); + hdr->imageYsize = tmpInt; DB(hdr->imageYsize); this->GetStringAt(f, TEXT_ACQ_MTRX_FREQ, tmpStr, TEXT_ACQ_MTRX_FREQ_LEN); @@ -302,7 +302,7 @@ SiemensVisionImageIO::ReadHeader(const char * FileNameToRead) this->GetStringAt(f, TEXT_ECHO_NUM, tmpStr, TEXT_ECHO_NUM_LEN); tmpStr[TEXT_ECHO_NUM_LEN] = '\0'; - hdr->echoNumber = static_cast(std::stoi(tmpStr)); + hdr->echoNumber = std::stoi(tmpStr); DB(hdr->echoNumber); this->GetDoubleAt(f, HDR_FLIP_ANGLE, &tmpDble, sizeof(double)); diff --git a/Modules/Numerics/Optimizers/src/itkInitializationBiasedParticleSwarmOptimizer.cxx b/Modules/Numerics/Optimizers/src/itkInitializationBiasedParticleSwarmOptimizer.cxx index fc661b2985f..698290d96b5 100644 --- a/Modules/Numerics/Optimizers/src/itkInitializationBiasedParticleSwarmOptimizer.cxx +++ b/Modules/Numerics/Optimizers/src/itkInitializationBiasedParticleSwarmOptimizer.cxx @@ -48,7 +48,7 @@ InitializationBiasedParticleSwarmOptimizer::UpdateSwarm() Statistics::MersenneTwisterRandomVariateGenerator::GetInstance(); ParametersType initialPosition = GetInitialPosition(); - const auto n = static_cast((GetCostFunction())->GetNumberOfParameters()); + const auto n = (GetCostFunction())->GetNumberOfParameters(); // linear decrease in the weight of the initial parameter values const double initializationCoefficient = this->m_InitializationCoefficient * diff --git a/Modules/Numerics/Optimizers/src/itkParticleSwarmOptimizer.cxx b/Modules/Numerics/Optimizers/src/itkParticleSwarmOptimizer.cxx index 988dabb0478..40e903b4072 100644 --- a/Modules/Numerics/Optimizers/src/itkParticleSwarmOptimizer.cxx +++ b/Modules/Numerics/Optimizers/src/itkParticleSwarmOptimizer.cxx @@ -48,7 +48,7 @@ ParticleSwarmOptimizer::UpdateSwarm() const itk::Statistics::MersenneTwisterRandomVariateGenerator::Pointer randomGenerator = Statistics::MersenneTwisterRandomVariateGenerator::GetInstance(); - const auto n = static_cast((GetCostFunction())->GetNumberOfParameters()); + const auto n = GetCostFunction()->GetNumberOfParameters(); for (unsigned int j = 0; j < m_NumberOfParticles; ++j) { diff --git a/Modules/Numerics/Optimizers/src/itkParticleSwarmOptimizerBase.cxx b/Modules/Numerics/Optimizers/src/itkParticleSwarmOptimizerBase.cxx index 21dddb77e92..72295c6b053 100644 --- a/Modules/Numerics/Optimizers/src/itkParticleSwarmOptimizerBase.cxx +++ b/Modules/Numerics/Optimizers/src/itkParticleSwarmOptimizerBase.cxx @@ -219,7 +219,7 @@ ParticleSwarmOptimizerBase::StartOptimization() InvokeEvent(StartEvent()); // run the simulation - const auto n = static_cast((GetCostFunction())->GetNumberOfParameters()); + const auto n = GetCostFunction()->GetNumberOfParameters(); for (this->m_IterationIndex = 1; m_IterationIndex < m_MaximalNumberOfIterations && !converged; ++m_IterationIndex) { @@ -295,7 +295,7 @@ ParticleSwarmOptimizerBase::ValidateSettings() } // if we got here it is safe to get the number of parameters the cost // function expects - const auto n = static_cast((GetCostFunction())->GetNumberOfParameters()); + const auto n = GetCostFunction()->GetNumberOfParameters(); // check that the number of parameters match ParametersType initialPosition = GetInitialPosition(); diff --git a/Modules/Numerics/Statistics/include/itkExpectationMaximizationMixtureModelEstimator.hxx b/Modules/Numerics/Statistics/include/itkExpectationMaximizationMixtureModelEstimator.hxx index a14eae30b46..707c9f5d969 100644 --- a/Modules/Numerics/Statistics/include/itkExpectationMaximizationMixtureModelEstimator.hxx +++ b/Modules/Numerics/Statistics/include/itkExpectationMaximizationMixtureModelEstimator.hxx @@ -179,14 +179,14 @@ ExpectationMaximizationMixtureModelEstimator::CalculateDensities() for (unsigned int componentIndex = 0; componentIndex < numberOfComponents; ++componentIndex) { - double temp = tempWeights[static_cast(componentIndex)]; + double temp = tempWeights[componentIndex]; // just to make sure temp does not blow up! if (densitySum > NumericTraits::epsilon()) { temp /= densitySum; } - m_ComponentVector[static_cast(componentIndex)]->SetWeight(measurementVectorIndex, temp); + m_ComponentVector[componentIndex]->SetWeight(measurementVectorIndex, temp); } } else diff --git a/Modules/Registration/Metricsv4/include/itkJensenHavrdaCharvatTsallisPointSetToPointSetMetricv4.hxx b/Modules/Registration/Metricsv4/include/itkJensenHavrdaCharvatTsallisPointSetToPointSetMetricv4.hxx index ff10a850803..519519f15b2 100644 --- a/Modules/Registration/Metricsv4/include/itkJensenHavrdaCharvatTsallisPointSetToPointSetMetricv4.hxx +++ b/Modules/Registration/Metricsv4/include/itkJensenHavrdaCharvatTsallisPointSetToPointSetMetricv4.hxx @@ -55,7 +55,7 @@ JensenHavrdaCharvatTsallisPointSetToPointSetMetricv4m_TotalNumberOfPoints = static_cast( this->m_NumberOfValidPoints + this->m_MovingDensityFunction->GetInputPointSet()->GetNumberOfPoints()); - this->m_Prefactor0 = -1.0 / static_cast(this->m_TotalNumberOfPoints); + this->m_Prefactor0 = -1.0 / this->m_TotalNumberOfPoints; if (this->m_Alpha != 1.0) { this->m_Prefactor0 /= (this->m_Alpha - 1.0); diff --git a/Modules/Registration/Metricsv4/include/itkMattesMutualInformationImageToImageMetricv4GetValueAndDerivativeThreader.hxx b/Modules/Registration/Metricsv4/include/itkMattesMutualInformationImageToImageMetricv4GetValueAndDerivativeThreader.hxx index 416e09637af..939fe9d2994 100644 --- a/Modules/Registration/Metricsv4/include/itkMattesMutualInformationImageToImageMetricv4GetValueAndDerivativeThreader.hxx +++ b/Modules/Registration/Metricsv4/include/itkMattesMutualInformationImageToImageMetricv4GetValueAndDerivativeThreader.hxx @@ -263,8 +263,8 @@ MattesMutualInformationImageToImageMetricv4GetValueAndDerivativeThreader< } } // Move the pointer to the first affected bin - OffsetValueType pdfMovingIndex = static_cast(movingImageParzenWindowIndex) - 1; - const OffsetValueType pdfMovingIndexMax = static_cast(movingImageParzenWindowIndex) + 2; + OffsetValueType pdfMovingIndex = movingImageParzenWindowIndex - 1; + const OffsetValueType pdfMovingIndexMax = movingImageParzenWindowIndex + 2; const OffsetValueType fixedImageParzenWindowIndex = this->m_MattesAssociate->ComputeSingleFixedImageParzenWindowIndex(fixedImageValue); diff --git a/Modules/Registration/Metricsv4/test/itkEuclideanDistancePointSetMetricRegistrationTest.cxx b/Modules/Registration/Metricsv4/test/itkEuclideanDistancePointSetMetricRegistrationTest.cxx index a38e6873b4b..a859bd89a54 100644 --- a/Modules/Registration/Metricsv4/test/itkEuclideanDistancePointSetMetricRegistrationTest.cxx +++ b/Modules/Registration/Metricsv4/test/itkEuclideanDistancePointSetMetricRegistrationTest.cxx @@ -205,7 +205,7 @@ itkEuclideanDistancePointSetMetricRegistrationTest(int argc, char * argv[]) int finalResult = EXIT_SUCCESS; unsigned int numberOfIterations = 100; - auto maximumPhysicalStepSize = static_cast(2.0); + auto maximumPhysicalStepSize = 2.0; if (argc > 1) { numberOfIterations = std::stoi(argv[1]); @@ -215,7 +215,7 @@ itkEuclideanDistancePointSetMetricRegistrationTest(int argc, char * argv[]) maximumPhysicalStepSize = std::stod(argv[2]); } - auto pointMax = static_cast(100.0); + auto pointMax = 100.0; // // Test with affine transform diff --git a/Modules/Registration/Metricsv4/test/itkMultiStartImageToImageMetricv4RegistrationTest.cxx b/Modules/Registration/Metricsv4/test/itkMultiStartImageToImageMetricv4RegistrationTest.cxx index f8bea2bf005..011c8210791 100644 --- a/Modules/Registration/Metricsv4/test/itkMultiStartImageToImageMetricv4RegistrationTest.cxx +++ b/Modules/Registration/Metricsv4/test/itkMultiStartImageToImageMetricv4RegistrationTest.cxx @@ -206,7 +206,7 @@ itkMultiStartImageToImageMetricv4RegistrationTest(int argc, char * argv[]) { auto aff = AffineTransformType::New(); aff->SetIdentity(); - const float rad = static_cast(i) * itk::Math::pi / 180.0; + const float rad = i * static_cast(itk::Math::pi) / 180.0F; aff->Translate(moffset); aff->Rotate2D(rad); aff->Translate(foffset); diff --git a/Modules/Segmentation/Classifiers/include/itkImageKmeansModelEstimator.hxx b/Modules/Segmentation/Classifiers/include/itkImageKmeansModelEstimator.hxx index 11a834f061d..da566e43aea 100644 --- a/Modules/Segmentation/Classifiers/include/itkImageKmeansModelEstimator.hxx +++ b/Modules/Segmentation/Classifiers/include/itkImageKmeansModelEstimator.hxx @@ -148,7 +148,7 @@ ImageKmeansModelEstimator::Allocate() // Initialize m_Codebook to 0 (it now has only one row) m_Codebook.fill(0); } - const auto finalCodebookSize = (SizeValueType)m_NumberOfCodewords; + const auto finalCodebookSize = m_NumberOfCodewords; // Allocate scratch memory for the centroid, codebook histogram // and the codebook distortion diff --git a/Modules/Segmentation/LevelSets/include/itkParallelSparseFieldLevelSetImageFilter.hxx b/Modules/Segmentation/LevelSets/include/itkParallelSparseFieldLevelSetImageFilter.hxx index be113dacc2a..f31831e9ca0 100644 --- a/Modules/Segmentation/LevelSets/include/itkParallelSparseFieldLevelSetImageFilter.hxx +++ b/Modules/Segmentation/LevelSets/include/itkParallelSparseFieldLevelSetImageFilter.hxx @@ -698,7 +698,7 @@ ParallelSparseFieldLevelSetImageFilter::ComputeInitia } } // - m_Boundary[i] = static_cast((j + k / 2)); + m_Boundary[i] = j + k / 2; } break; } diff --git a/Modules/Segmentation/LevelSets/include/itkSparseFieldLevelSetImageFilter.hxx b/Modules/Segmentation/LevelSets/include/itkSparseFieldLevelSetImageFilter.hxx index 5d316d803c4..2636c824b08 100644 --- a/Modules/Segmentation/LevelSets/include/itkSparseFieldLevelSetImageFilter.hxx +++ b/Modules/Segmentation/LevelSets/include/itkSparseFieldLevelSetImageFilter.hxx @@ -440,8 +440,7 @@ SparseFieldLevelSetImageFilter::UpdateActiveLayerValu } else { - this->SetRMSChange( - static_cast(std::sqrt(static_cast(rms_change_accumulator / static_cast(counter))))); + this->SetRMSChange(std::sqrt(static_cast(rms_change_accumulator / static_cast(counter)))); } } diff --git a/Modules/Segmentation/LevelSets/include/itkThresholdSegmentationLevelSetFunction.hxx b/Modules/Segmentation/LevelSets/include/itkThresholdSegmentationLevelSetFunction.hxx index 63c9e802de9..4dab9111277 100644 --- a/Modules/Segmentation/LevelSets/include/itkThresholdSegmentationLevelSetFunction.hxx +++ b/Modules/Segmentation/LevelSets/include/itkThresholdSegmentationLevelSetFunction.hxx @@ -76,7 +76,7 @@ ThresholdSegmentationLevelSetFunction::CalculateS } else { - sit.Set(static_cast(threshold)); + sit.Set(threshold); } } } diff --git a/Modules/Segmentation/LevelSets/include/itkVectorThresholdSegmentationLevelSetFunction.hxx b/Modules/Segmentation/LevelSets/include/itkVectorThresholdSegmentationLevelSetFunction.hxx index a16e4fdfa01..9fe20bf07fb 100644 --- a/Modules/Segmentation/LevelSets/include/itkVectorThresholdSegmentationLevelSetFunction.hxx +++ b/Modules/Segmentation/LevelSets/include/itkVectorThresholdSegmentationLevelSetFunction.hxx @@ -36,7 +36,7 @@ VectorThresholdSegmentationLevelSetFunction::Calc for (fit.GoToBegin(), sit.GoToBegin(); !fit.IsAtEnd(); ++sit, ++fit) { threshold = m_Threshold - std::sqrt(m_Mahalanobis->Evaluate(fit.Get())); - sit.Set(static_cast(threshold)); + sit.Set(threshold); } } } // end namespace itk diff --git a/Modules/Segmentation/Voronoi/include/itkVoronoiDiagram2DGenerator.hxx b/Modules/Segmentation/Voronoi/include/itkVoronoiDiagram2DGenerator.hxx index 51530a8ca82..cfdc026b234 100644 --- a/Modules/Segmentation/Voronoi/include/itkVoronoiDiagram2DGenerator.hxx +++ b/Modules/Segmentation/Voronoi/include/itkVoronoiDiagram2DGenerator.hxx @@ -541,7 +541,7 @@ VoronoiDiagram2DGenerator::PQbucket(FortuneHalfEdge * task) { bucket = m_PQhashsize - 1; } - if (bucket < static_cast(m_PQmin)) + if (bucket < m_PQmin) { m_PQmin = bucket; }