Skip to content

Commit 2b8b064

Browse files
N-DekkerN-Dekker
committed
COMP: Fix ITK_FUTURE_LEGACY_REMOVE constness compile errors
Fixed errors like this, when ITK_FUTURE_LEGACY_REMOVE is on: > elxAdaptiveStochasticLBFGS.hxx(1573): error C2440: 'initializing': cannot convert from 'const itk::AdvancedTransform<double,2,2> *' to 'itk::SmartPointer<itk::AdvancedTransform<double,2,2>>' Replaced `itkGetObjectMacro` calls by `itkGetModifiableObjectMacro`, fixing errors like this: > itkPolydataDummyPenalty.h(129): error C3861: 'purposeful_error': identifier not found
1 parent ceafb80 commit 2b8b064

12 files changed

Lines changed: 30 additions & 30 deletions

File tree

‎Common/itkComputePreconditionerUsingDisplacementDistribution.hxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -739,7 +739,7 @@ ComputePreconditionerUsingDisplacementDistribution< TFixedImage, TTransform >
739739
CombinationTransformType * testPtr_combo
740740
= dynamic_cast< CombinationTransformType * >( this->m_Transform.GetPointer() );
741741
if( !testPtr_combo ) return; // throw an error?
742-
BSplineTransformType * testPtr_bspline = dynamic_cast<BSplineTransformType *>( testPtr_combo->GetCurrentTransform() );
742+
const auto testPtr_bspline = dynamic_cast<const BSplineTransformType *>( testPtr_combo->GetCurrentTransform() );
743743
if( !testPtr_bspline ) return; // throw an error?
744744

745745
GridRegionType gridRegion = testPtr_bspline->GetGridRegion();

‎Components/Metrics/MissingStructurePenalty/itkMissingStructurePenalty.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ class MissingVolumeMeshPenalty :
132132
itkGetConstObjectMacro( FixedMeshContainer, FixedMeshContainerType );
133133

134134
itkSetObjectMacro( MappedMeshContainer, MappedMeshContainerType );
135-
itkGetObjectMacro( MappedMeshContainer, MappedMeshContainerType );
135+
itkGetModifiableObjectMacro( MappedMeshContainer, MappedMeshContainerType );
136136

137137
/** Initialize the Metric by making sure that all the components are
138138
* present and plugged together correctly.

‎Components/Metrics/PolydataDummyPenalty/itkPolydataDummyPenalty.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ class ITK_EXPORT MeshPenalty :
126126
itkGetConstObjectMacro( FixedMeshContainer, FixedMeshContainerType );
127127

128128
itkSetObjectMacro( MappedMeshContainer, MappedMeshContainerType );
129-
itkGetObjectMacro( MappedMeshContainer, MappedMeshContainerType );
129+
itkGetModifiableObjectMacro( MappedMeshContainer, MappedMeshContainerType );
130130

131131
/** Get the mapped points. */
132132
//itkGetObjectMacro( MappedPoints, MeshPointsContainerPointer );

‎Components/Optimizers/AdaGrad/elxAdaGrad.hxx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -553,7 +553,7 @@ AdaGrad< TElastix >
553553
<< this->elxGetClassName() << " ..." << std::endl;
554554

555555
/** Get current position to start the parameter estimation. */
556-
this->GetRegistration()->GetAsITKBaseType()->GetTransform()->SetParameters(
556+
this->GetRegistration()->GetAsITKBaseType()->GetModifiableTransform()->SetParameters(
557557
this->GetCurrentPosition() );
558558

559559
/** Get the number of parameters. */
@@ -673,7 +673,7 @@ AdaGrad< TElastix >
673673
computeDisplacementDistribution->SetFixedImageRegion(testPtr->GetFixedImageRegion());
674674
computeDisplacementDistribution->SetFixedImageMask(testPtr->GetFixedImageMask());
675675
computeDisplacementDistribution->SetTransform(
676-
this->GetRegistration()->GetAsITKBaseType()->GetTransform());
676+
this->GetRegistration()->GetAsITKBaseType()->GetModifiableTransform());
677677
computeDisplacementDistribution->SetCostFunction(this->m_CostFunction);
678678
computeDisplacementDistribution->SetNumberOfJacobianMeasurements(
679679
this->m_NumberOfJacobianMeasurements);
@@ -1012,7 +1012,7 @@ AdaGrad< TElastix >
10121012
::CheckForAdvancedTransform( void )
10131013
{
10141014
typename TransformType::Pointer transform = this->GetRegistration()
1015-
->GetAsITKBaseType()->GetTransform();
1015+
->GetAsITKBaseType()->GetModifiableTransform();
10161016

10171017
AdvancedTransformType * testPtr = dynamic_cast< AdvancedTransformType * >(
10181018
transform.GetPointer() );

‎Components/Optimizers/AdaptiveStochasticLBFGS/elxAdaptiveStochasticLBFGS.hxx‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -967,7 +967,7 @@ AdaptiveStochasticLBFGS<TElastix>
967967
double maxJCJ = 0.0;
968968

969969
/** Get current position to start the parameter estimation. */
970-
this->GetRegistration()->GetAsITKBaseType()->GetTransform()->SetParameters(
970+
this->GetRegistration()->GetAsITKBaseType()->GetModifiableTransform()->SetParameters(
971971
this->GetCurrentPosition() );
972972

973973
/** Cast to advanced metric type. */
@@ -986,7 +986,7 @@ AdaptiveStochasticLBFGS<TElastix>
986986
computeJacobianTerms->SetFixedImageRegion( testPtr->GetFixedImageRegion() );
987987
computeJacobianTerms->SetFixedImageMask( testPtr->GetFixedImageMask() );
988988
computeJacobianTerms->SetTransform(
989-
this->GetRegistration()->GetAsITKBaseType()->GetTransform() );
989+
this->GetRegistration()->GetAsITKBaseType()->GetModifiableTransform() );
990990
computeJacobianTerms->SetMaxBandCovSize( this->m_MaxBandCovSize );
991991
computeJacobianTerms->SetNumberOfBandStructureSamples(
992992
this->m_NumberOfBandStructureSamples );
@@ -1116,7 +1116,7 @@ AdaptiveStochasticLBFGS<TElastix>
11161116
itk::TimeProbe timer4 ,timer5;
11171117

11181118
/** Get current position to start the parameter estimation. */
1119-
this->GetRegistration()->GetAsITKBaseType()->GetTransform()->SetParameters(
1119+
this->GetRegistration()->GetAsITKBaseType()->GetModifiableTransform()->SetParameters(
11201120
this->GetCurrentPosition() );
11211121

11221122
/** Get the user input. */
@@ -1140,7 +1140,7 @@ AdaptiveStochasticLBFGS<TElastix>
11401140
computeDisplacementDistribution->SetFixedImageRegion( testPtr->GetFixedImageRegion() );
11411141
computeDisplacementDistribution->SetFixedImageMask( testPtr->GetFixedImageMask() );
11421142
computeDisplacementDistribution->SetTransform(
1143-
this->GetRegistration()->GetAsITKBaseType()->GetTransform() );
1143+
this->GetRegistration()->GetAsITKBaseType()->GetModifiableTransform() );
11441144
computeDisplacementDistribution->SetCostFunction( this->m_CostFunction );
11451145
computeDisplacementDistribution->SetNumberOfJacobianMeasurements(
11461146
this->m_NumberOfJacobianMeasurements );
@@ -1236,7 +1236,7 @@ AdaptiveStochasticLBFGS<TElastix>
12361236
::AutomaticLBFGSStepsizeEstimation( void )
12371237
{
12381238
/** Get current position to start the parameter estimation. */
1239-
this->GetRegistration()->GetAsITKBaseType()->GetTransform()->SetParameters(
1239+
this->GetRegistration()->GetAsITKBaseType()->GetModifiableTransform()->SetParameters(
12401240
this->GetCurrentPosition() );
12411241

12421242
/** Get the user input. */
@@ -1260,7 +1260,7 @@ AdaptiveStochasticLBFGS<TElastix>
12601260
computeDisplacementDistribution->SetFixedImageRegion( testPtr->GetFixedImageRegion() );
12611261
computeDisplacementDistribution->SetFixedImageMask( testPtr->GetFixedImageMask() );
12621262
computeDisplacementDistribution->SetTransform(
1263-
this->GetRegistration()->GetAsITKBaseType()->GetTransform() );
1263+
this->GetRegistration()->GetAsITKBaseType()->GetModifiableTransform() );
12641264
computeDisplacementDistribution->SetCostFunction( this->m_CostFunction );
12651265
computeDisplacementDistribution->SetNumberOfJacobianMeasurements(
12661266
this->m_NumberOfJacobianMeasurements );
@@ -1570,7 +1570,7 @@ AdaptiveStochasticLBFGS<TElastix>
15701570
::CheckForAdvancedTransform( void )
15711571
{
15721572
typename TransformType::Pointer transform = this->GetRegistration()
1573-
->GetAsITKBaseType()->GetTransform();
1573+
->GetAsITKBaseType()->GetModifiableTransform();
15741574

15751575
AdvancedTransformType * testPtr = dynamic_cast<AdvancedTransformType *>(
15761576
transform.GetPointer() );

‎Components/Optimizers/AdaptiveStochasticVarianceReducedGradient/elxAdaptiveStochasticVarianceReducedGradient.hxx‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -595,7 +595,7 @@ AdaptiveStochasticVarianceReducedGradient<TElastix>
595595
timeCollector.Stop( "copy" );
596596

597597
timeCollector.Start( "g1" );
598-
this->GetRegistration()->GetAsITKBaseType()->GetMetric()->SetNumberOfWorkUnits(
598+
this->GetRegistration()->GetAsITKBaseType()->GetModifiableMetric()->SetNumberOfWorkUnits(
599599
this->GetRegistration()->GetAsITKBaseType()->GetMetric()->GetThreader()->GetGlobalDefaultNumberOfThreads()
600600
);
601601
this->GetScaledDerivativeWithExceptionHandling( previousPosition, this->m_MeanGradient );
@@ -639,7 +639,7 @@ AdaptiveStochasticVarianceReducedGradient<TElastix>
639639
// (and large parameter vectors)
640640
if( this->m_NumberOfInnerLoopSamples < 300 )
641641
{
642-
this->GetRegistration()->GetAsITKBaseType()->GetMetric()->SetNumberOfWorkUnits( 1 );
642+
this->GetRegistration()->GetAsITKBaseType()->GetModifiableMetric()->SetNumberOfWorkUnits( 1 );
643643
}
644644
}
645645

@@ -825,7 +825,7 @@ AdaptiveStochasticVarianceReducedGradient<TElastix>
825825
double maxJCJ = 0.0;
826826

827827
/** Get current position to start the parameter estimation. */
828-
this->GetRegistration()->GetAsITKBaseType()->GetTransform()->SetParameters(
828+
this->GetRegistration()->GetAsITKBaseType()->GetModifiableTransform()->SetParameters(
829829
this->GetCurrentPosition() );
830830

831831
/** Cast to advanced metric type. */
@@ -844,7 +844,7 @@ AdaptiveStochasticVarianceReducedGradient<TElastix>
844844
computeJacobianTerms->SetFixedImageRegion( testPtr->GetFixedImageRegion() );
845845
computeJacobianTerms->SetFixedImageMask( testPtr->GetFixedImageMask() );
846846
computeJacobianTerms->SetTransform(
847-
this->GetRegistration()->GetAsITKBaseType()->GetTransform() );
847+
this->GetRegistration()->GetAsITKBaseType()->GetModifiableTransform() );
848848
computeJacobianTerms->SetMaxBandCovSize( this->m_MaxBandCovSize );
849849
computeJacobianTerms->SetNumberOfBandStructureSamples(
850850
this->m_NumberOfBandStructureSamples );
@@ -974,7 +974,7 @@ AdaptiveStochasticVarianceReducedGradient<TElastix>
974974
itk::TimeProbe timer4, timer5;
975975

976976
/** Get current position to start the parameter estimation. */
977-
this->GetRegistration()->GetAsITKBaseType()->GetTransform()->SetParameters(
977+
this->GetRegistration()->GetAsITKBaseType()->GetModifiableTransform()->SetParameters(
978978
this->GetCurrentPosition() );
979979

980980
/** Get the user input. */
@@ -998,7 +998,7 @@ AdaptiveStochasticVarianceReducedGradient<TElastix>
998998
computeDisplacementDistribution->SetFixedImageRegion( testPtr->GetFixedImageRegion() );
999999
computeDisplacementDistribution->SetFixedImageMask( testPtr->GetFixedImageMask() );
10001000
computeDisplacementDistribution->SetTransform(
1001-
this->GetRegistration()->GetAsITKBaseType()->GetTransform() );
1001+
this->GetRegistration()->GetAsITKBaseType()->GetModifiableTransform() );
10021002
computeDisplacementDistribution->SetCostFunction( this->m_CostFunction );
10031003
computeDisplacementDistribution->SetNumberOfJacobianMeasurements(
10041004
this->m_NumberOfJacobianMeasurements );
@@ -1360,7 +1360,7 @@ AdaptiveStochasticVarianceReducedGradient<TElastix>
13601360
::CheckForAdvancedTransform( void )
13611361
{
13621362
typename TransformType::Pointer transform = this->GetRegistration()
1363-
->GetAsITKBaseType()->GetTransform();
1363+
->GetAsITKBaseType()->GetModifiableTransform();
13641364

13651365
AdvancedTransformType * testPtr = dynamic_cast<AdvancedTransformType *>(
13661366
transform.GetPointer() );

‎Components/Optimizers/PreconditionedStochasticGradientDescent/elxPreconditionedStochasticGradientDescent.hxx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -554,7 +554,7 @@ PreconditionedStochasticGradientDescent< TElastix >
554554
<< this->elxGetClassName() << " ..." << std::endl;
555555

556556
/** Get current position to start the parameter estimation. */
557-
this->GetRegistration()->GetAsITKBaseType()->GetTransform()->SetParameters(
557+
this->GetRegistration()->GetAsITKBaseType()->GetModifiableTransform()->SetParameters(
558558
this->GetCurrentPosition() );
559559

560560
/** Get the number of parameters. */
@@ -611,7 +611,7 @@ PreconditionedStochasticGradientDescent< TElastix >
611611
preconditionerEstimator->SetFixedImageRegion( testPtr->GetFixedImageRegion() );
612612
preconditionerEstimator->SetFixedImageMask( testPtr->GetFixedImageMask() );
613613
preconditionerEstimator->SetTransform(
614-
this->GetRegistration()->GetAsITKBaseType()->GetTransform() );
614+
this->GetRegistration()->GetAsITKBaseType()->GetModifiableTransform() );
615615
preconditionerEstimator->SetCostFunction( this->m_CostFunction );
616616
preconditionerEstimator->SetNumberOfJacobianMeasurements(
617617
this->m_NumberOfJacobianMeasurements );
@@ -675,7 +675,7 @@ PreconditionedStochasticGradientDescent< TElastix >
675675
computeDisplacementDistribution->SetFixedImageRegion( testPtr->GetFixedImageRegion() );
676676
computeDisplacementDistribution->SetFixedImageMask( testPtr->GetFixedImageMask() );
677677
computeDisplacementDistribution->SetTransform(
678-
this->GetRegistration()->GetAsITKBaseType()->GetTransform() );
678+
this->GetRegistration()->GetAsITKBaseType()->GetModifiableTransform() );
679679
computeDisplacementDistribution->SetCostFunction( this->m_CostFunction );
680680
computeDisplacementDistribution->SetNumberOfJacobianMeasurements(
681681
this->m_NumberOfJacobianMeasurements );
@@ -1026,7 +1026,7 @@ PreconditionedStochasticGradientDescent< TElastix >
10261026
::CheckForAdvancedTransform( void )
10271027
{
10281028
typename TransformType::Pointer transform = this->GetRegistration()
1029-
->GetAsITKBaseType()->GetTransform();
1029+
->GetAsITKBaseType()->GetModifiableTransform();
10301030

10311031
AdvancedTransformType * testPtr = dynamic_cast< AdvancedTransformType * >(
10321032
transform.GetPointer() );

‎Components/Transforms/AffineDTITransform/elxAffineDTITransform.hxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,7 @@ AffineDTITransformElastix< TElastix >
364364
elxout << "Scales for transform parameters are: " << newscales << std::endl;
365365

366366
/** Set the scales into the optimizer. */
367-
this->m_Registration->GetAsITKBaseType()->GetOptimizer()->SetScales( newscales );
367+
this->m_Registration->GetAsITKBaseType()->GetModifiableOptimizer()->SetScales( newscales );
368368

369369
} // end SetScales()
370370

‎Components/Transforms/AffineLogTransform/elxAffineLogTransform.hxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,7 @@ AffineLogTransformElastix< TElastix >
364364
elxout << "Scales for transform parameters are: " << newscales << std::endl;
365365

366366
/** Set the scales into the optimizer. */
367-
this->m_Registration->GetAsITKBaseType()->GetOptimizer()->SetScales( newscales );
367+
this->m_Registration->GetAsITKBaseType()->GetModifiableOptimizer()->SetScales( newscales );
368368

369369
} // end SetScales()
370370

‎Components/Transforms/MultiBSplineTransformWithNormal/elxMultiBSplineTransformWithNormal.hxx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -782,7 +782,7 @@ MultiBSplineTransformWithNormal< TElastix >::SetOptimizerScales( const unsigned
782782
if( edgeWidth == 0 )
783783
{
784784
/** Just set the unit scales into the optimizer. */
785-
this->m_Registration->GetAsITKBaseType()->GetOptimizer()->SetScales( newScales );
785+
this->m_Registration->GetAsITKBaseType()->GetModifiableOptimizer()->SetScales( newScales );
786786
return;
787787
}
788788

@@ -840,7 +840,7 @@ MultiBSplineTransformWithNormal< TElastix >::SetOptimizerScales( const unsigned
840840
}
841841

842842
/** Set the scales into the optimizer. */
843-
this->m_Registration->GetAsITKBaseType()->GetOptimizer()->SetScales( newScales );
843+
this->m_Registration->GetAsITKBaseType()->GetModifiableOptimizer()->SetScales( newScales );
844844

845845
} // end SetOptimizerScales()
846846

0 commit comments

Comments
 (0)