Skip to content

Commit 8f6ca41

Browse files
committed
ENH: Modification of the internal typedef to protected for a better API backword compatibility
1 parent 2a40128 commit 8f6ca41

File tree

2 files changed

+12
-13
lines changed

2 files changed

+12
-13
lines changed

include/itkCoocurrenceTextureFeaturesImageFilter.h

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -109,10 +109,6 @@ class ITK_TEMPLATE_EXPORT CoocurrenceTextureFeaturesImageFilter
109109
typedef typename InputImageType::IndexType IndexType;
110110
typedef typename InputImageType::PointType PointType;
111111

112-
113-
typedef int HistogramIndexType;
114-
typedef itk::Image< HistogramIndexType, TInputImage::ImageDimension > DigitizedImageType;
115-
116112
typedef typename InputImageType::OffsetType OffsetType;
117113
typedef VectorContainer< unsigned char, OffsetType > OffsetVector;
118114
typedef typename OffsetVector::Pointer OffsetVectorPointer;
@@ -121,9 +117,7 @@ class ITK_TEMPLATE_EXPORT CoocurrenceTextureFeaturesImageFilter
121117
typedef typename InputImageType::RegionType InputRegionType;
122118
typedef typename OutputImageType::RegionType OutputRegionType;
123119

124-
typedef typename itk::ConstNeighborhoodIterator< DigitizedImageType > NeighborhoodIteratorType;
125-
typedef typename NeighborhoodIteratorType::RadiusType NeighborhoodRadiusType;
126-
typedef typename NeighborhoodIteratorType::NeighborIndexType NeighborIndexType;
120+
typedef typename itk::ConstNeighborhoodIterator< InputImageType >::RadiusType NeighborhoodRadiusType;
127121

128122
typedef typename NumericTraits<PixelType>::RealType MeasurementType;
129123
typedef typename NumericTraits<PixelType>::RealType RealType;
@@ -208,6 +202,11 @@ class ITK_TEMPLATE_EXPORT CoocurrenceTextureFeaturesImageFilter
208202

209203
protected:
210204

205+
typedef int HistogramIndexType;
206+
typedef itk::Image< HistogramIndexType, TInputImage::ImageDimension > DigitizedImageType;
207+
typedef typename itk::ConstNeighborhoodIterator< DigitizedImageType > NeighborhoodIteratorType;
208+
typedef typename NeighborhoodIteratorType::NeighborIndexType NeighborIndexType;
209+
211210
CoocurrenceTextureFeaturesImageFilter();
212211
virtual ~CoocurrenceTextureFeaturesImageFilter() {}
213212

include/itkRunLengthTextureFeaturesImageFilter.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -122,9 +122,6 @@ class ITK_TEMPLATE_EXPORT RunLengthTextureFeaturesImageFilter
122122
typedef typename InputImageType::IndexType IndexType;
123123
typedef typename InputImageType::PointType PointType;
124124

125-
typedef int HistogramIndexType;
126-
typedef itk::Image< HistogramIndexType, TInputImage::ImageDimension > DigitizedImageType;
127-
128125
typedef typename InputImageType::OffsetType OffsetType;
129126
typedef VectorContainer< unsigned char, OffsetType > OffsetVector;
130127
typedef typename OffsetVector::Pointer OffsetVectorPointer;
@@ -133,9 +130,7 @@ class ITK_TEMPLATE_EXPORT RunLengthTextureFeaturesImageFilter
133130
typedef typename InputImageType::RegionType InputRegionType;
134131
typedef typename OutputImageType::RegionType OutputRegionType;
135132

136-
typedef typename itk::ConstNeighborhoodIterator< DigitizedImageType > NeighborhoodIteratorType;
137-
typedef typename NeighborhoodIteratorType::RadiusType NeighborhoodRadiusType;
138-
typedef typename NeighborhoodIteratorType::NeighborIndexType NeighborIndexType;
133+
typedef typename itk::ConstNeighborhoodIterator< InputImageType >::RadiusType NeighborhoodRadiusType;
139134

140135
typedef typename NumericTraits<PixelType>::RealType MeasurementType;
141136
typedef typename NumericTraits<PixelType>::RealType RealType;
@@ -231,6 +226,11 @@ class ITK_TEMPLATE_EXPORT RunLengthTextureFeaturesImageFilter
231226

232227
protected:
233228

229+
typedef int HistogramIndexType;
230+
typedef itk::Image< HistogramIndexType, TInputImage::ImageDimension > DigitizedImageType;
231+
typedef typename itk::ConstNeighborhoodIterator< DigitizedImageType > NeighborhoodIteratorType;
232+
typedef typename NeighborhoodIteratorType::NeighborIndexType NeighborIndexType;
233+
234234
RunLengthTextureFeaturesImageFilter();
235235
virtual ~RunLengthTextureFeaturesImageFilter() {}
236236

0 commit comments

Comments
 (0)