Move rician to gaussian to itk 5

ocommowi · ocommowi · commit d10ec3925d6b · 2020-03-24T14:30:39.000+01:00
diff --git a/Anima/filtering/rician_to_gaussian_noise/animaRicianToGaussianImageFilter.hxx b/Anima/filtering/rician_to_gaussian_noise/animaRicianToGaussianImageFilter.hxx
@@ -55,8 +55,7 @@ RicianToGaussianImageFilter<ComponentType,ImageDimension>
 template <class ComponentType,unsigned int ImageDimension>
 void
 RicianToGaussianImageFilter<ComponentType,ImageDimension>
-::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
-                       itk::ThreadIdType threadId)
+::DynamicThreadedGenerateData(const OutputImageRegionType& outputRegionForThread)
 {
     typedef itk::ConstNeighborhoodIterator<InputImageType> InputIteratorType;
     typedef itk::ConstNeighborhoodIterator<MaskImageType> MaskIteratorType;
@@ -83,6 +82,8 @@ RicianToGaussianImageFilter<ComponentType,ImageDimension>
     typename InputImageType::IndexType currentIndex, neighborIndex;
     typename InputImageType::PointType currentPoint, neighborPoint;
     
+    unsigned int threadId = this->GetSafeThreadId();
+
     while (!maskItr.IsAtEnd())
     {
         // Discard voxels outside of the brain
@@ -222,6 +223,8 @@ RicianToGaussianImageFilter<ComponentType,ImageDimension>
         ++scaleItr;
         ++signalItr;
     }
+
+    this->SafeReleaseThreadId(threadId);
 }
 
 template <class ComponentType,unsigned int ImageDimension>

Original file line number	Diff line number	Diff line change
`@@ -55,8 +55,7 @@ RicianToGaussianImageFilter<ComponentType,ImageDimension>`
`55`	`55`	`template <class ComponentType,unsigned int ImageDimension>`
`56`	`56`	`void`
`57`	`57`	`RicianToGaussianImageFilter<ComponentType,ImageDimension>`
`58`		`-::ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,`
`59`		`- itk::ThreadIdType threadId)`
	`58`	`+::DynamicThreadedGenerateData(const OutputImageRegionType& outputRegionForThread)`
`60`	`59`	`{`
`61`	`60`	`typedef itk::ConstNeighborhoodIterator<InputImageType> InputIteratorType;`
`62`	`61`	`typedef itk::ConstNeighborhoodIterator<MaskImageType> MaskIteratorType;`
`@@ -83,6 +82,8 @@ RicianToGaussianImageFilter<ComponentType,ImageDimension>`
`83`	`82`	`typename InputImageType::IndexType currentIndex, neighborIndex;`
`84`	`83`	`typename InputImageType::PointType currentPoint, neighborPoint;`
`85`	`84`
	`85`	`+ unsigned int threadId = this->GetSafeThreadId();`
	`86`	`+`
`86`	`87`	`while (!maskItr.IsAtEnd())`
`87`	`88`	`{`
`88`	`89`	`// Discard voxels outside of the brain`
`@@ -222,6 +223,8 @@ RicianToGaussianImageFilter<ComponentType,ImageDimension>`
`222`	`223`	`++scaleItr;`
`223`	`224`	`++signalItr;`
`224`	`225`	`}`
	`226`	`+`
	`227`	`+ this->SafeReleaseThreadId(threadId);`
`225`	`228`	`}`
`226`	`229`
`227`	`230`	`template <class ComponentType,unsigned int ImageDimension>`