Change default mask template type to be of unsigned char pixel type

blowekamp · blowekamp · commit 6152557491f6 · 2017-09-13T10:00:50.000-04:00
diff --git a/include/itkCoocurrenceTextureFeaturesImageFilter.h b/include/itkCoocurrenceTextureFeaturesImageFilter.h
@@ -83,8 +83,9 @@ namespace Statistics
 
 template< typename TInputImage,
           typename TOutputImage,
-          typename TMaskImage = TInputImage>
-class ITK_TEMPLATE_EXPORT CoocurrenceTextureFeaturesImageFilter:public ImageToImageFilter< TInputImage, TOutputImage >
+          typename TMaskImage = Image< unsigned char, TInputImage::ImageDimension> >
+class ITK_TEMPLATE_EXPORT CoocurrenceTextureFeaturesImageFilter
+  : public ImageToImageFilter< TInputImage, TOutputImage >
 {
 public:
   /** Standard typedefs */
diff --git a/include/itkRunLengthTextureFeaturesImageFilter.h b/include/itkRunLengthTextureFeaturesImageFilter.h
@@ -96,7 +96,7 @@ namespace Statistics
 
 template< typename TInputImage,
           typename TOutputImage,
-          typename TMaskImage = TInputImage>
+          typename TMaskImage = Image< unsigned char, TInputImage::ImageDimension> >
 class ITK_TEMPLATE_EXPORT RunLengthTextureFeaturesImageFilter
   : public ImageToImageFilter< TInputImage, TOutputImage >
 {
diff --git a/test/CoocurrenceTextureFeaturesImageFilterInstantiationTest.cxx b/test/CoocurrenceTextureFeaturesImageFilterInstantiationTest.cxx
@@ -63,7 +63,7 @@ int CoocurrenceTextureFeaturesImageFilterInstantiationTest( int argc, char *argv
 
   // Create the filter
   typedef itk::Statistics::CoocurrenceTextureFeaturesImageFilter<
-    InputImageType, OutputImageType, MaskImageType > FilterType;
+    InputImageType, OutputImageType > FilterType;
   FilterType::Pointer filter = FilterType::New();
 
   EXERCISE_BASIC_OBJECT_METHODS( filter,
diff --git a/test/CoocurrenceTextureFeaturesImageFilterTest.cxx b/test/CoocurrenceTextureFeaturesImageFilterTest.cxx
@@ -60,7 +60,7 @@ int CoocurrenceTextureFeaturesImageFilterTest( int argc, char *argv[] )
 
   // Create the filter
   typedef itk::Statistics::CoocurrenceTextureFeaturesImageFilter<
-    InputImageType, OutputImageType > FilterType;
+    InputImageType, OutputImageType, InputImageType > FilterType;
   FilterType::Pointer filter = FilterType::New();
 
   filter->SetInput( reader->GetOutput() );
diff --git a/test/CoocurrenceTextureFeaturesImageFilterTestSeparateFeatures.cxx b/test/CoocurrenceTextureFeaturesImageFilterTestSeparateFeatures.cxx
@@ -67,7 +67,7 @@ int CoocurrenceTextureFeaturesImageFilterTestSeparateFeatures( int argc, char *a
 
   // Create the filter
   typedef itk::Statistics::CoocurrenceTextureFeaturesImageFilter<
-    InputImageType, OutputImageType > FilterType;
+    InputImageType, OutputImageType, InputImageType > FilterType;
   FilterType::Pointer filter = FilterType::New();
 
   filter->SetInput( reader->GetOutput() );
diff --git a/test/CoocurrenceTextureFeaturesImageFilterTestVectorImageSeparateFeatures.cxx b/test/CoocurrenceTextureFeaturesImageFilterTestVectorImageSeparateFeatures.cxx
@@ -66,7 +66,7 @@ int CoocurrenceTextureFeaturesImageFilterTestVectorImageSeparateFeatures( int ar
 
   // Create the filter
   typedef itk::Statistics::CoocurrenceTextureFeaturesImageFilter<
-    InputImageType, OutputImageType > FilterType;
+    InputImageType, OutputImageType, InputImageType > FilterType;
   FilterType::Pointer filter = FilterType::New();
 
   filter->SetInput( reader->GetOutput() );
diff --git a/test/CoocurrenceTextureFeaturesImageFilterTestWithVectorImage.cxx b/test/CoocurrenceTextureFeaturesImageFilterTestWithVectorImage.cxx
@@ -62,7 +62,7 @@ int CoocurrenceTextureFeaturesImageFilterTestWithVectorImage( int argc, char *ar
 
   // Create the filter
   typedef itk::Statistics::CoocurrenceTextureFeaturesImageFilter<
-    InputImageType, OutputImageType > FilterType;
+    InputImageType, OutputImageType, InputImageType  > FilterType;
   FilterType::Pointer filter = FilterType::New();
 
   EXERCISE_BASIC_OBJECT_METHODS( filter, CoocurrenceTextureFeaturesImageFilter,
diff --git a/test/RunLengthTextureFeaturesImageFilterInstantiationTest.cxx b/test/RunLengthTextureFeaturesImageFilterInstantiationTest.cxx
@@ -62,7 +62,7 @@ int RunLengthTextureFeaturesImageFilterInstantiationTest( int argc, char *argv[]
 
   // Create the filter
   typedef itk::Statistics::RunLengthTextureFeaturesImageFilter<
-    InputImageType, OutputImageType, MaskImageType > FilterType;
+    InputImageType, OutputImageType > FilterType;
 
   FilterType::Pointer filter = FilterType::New();
 
diff --git a/test/RunLengthTextureFeaturesImageFilterTest.cxx b/test/RunLengthTextureFeaturesImageFilterTest.cxx
@@ -67,7 +67,7 @@ int RunLengthTextureFeaturesImageFilterTest( int argc, char *argv[] )
 
   // Create the filter
   typedef itk::Statistics::RunLengthTextureFeaturesImageFilter<
-    InputImageType, OutputImageType > FilterType;
+    InputImageType, OutputImageType, InputImageType > FilterType;
 
   FilterType::Pointer filter = FilterType::New();
 
diff --git a/test/RunLengthTextureFeaturesImageFilterTestSeparateFeatures.cxx b/test/RunLengthTextureFeaturesImageFilterTestSeparateFeatures.cxx
@@ -69,7 +69,7 @@ int RunLengthTextureFeaturesImageFilterTestSeparateFeatures( int argc, char *arg
 
   // Create the filter
   typedef itk::Statistics::RunLengthTextureFeaturesImageFilter<
-    InputImageType, OutputImageType > FilterType;
+    InputImageType, OutputImageType, InputImageType > FilterType;
   FilterType::Pointer filter = FilterType::New();
 
   filter->SetInput( reader->GetOutput() );
diff --git a/test/RunLengthTextureFeaturesImageFilterTestVectorImageSeparateFeatures.cxx b/test/RunLengthTextureFeaturesImageFilterTestVectorImageSeparateFeatures.cxx
@@ -70,7 +70,7 @@ int RunLengthTextureFeaturesImageFilterTestVectorImageSeparateFeatures( int argc
 
   // Create the filter
   typedef itk::Statistics::RunLengthTextureFeaturesImageFilter<
-    InputImageType, OutputImageType > FilterType;
+    InputImageType, OutputImageType, InputImageType > FilterType;
   FilterType::Pointer filter = FilterType::New();
 
   filter->SetInput( reader->GetOutput() );
diff --git a/test/RunLengthTextureFeaturesImageFilterTestWithVectorImage.cxx b/test/RunLengthTextureFeaturesImageFilterTestWithVectorImage.cxx
@@ -64,7 +64,7 @@ int RunLengthTextureFeaturesImageFilterTestWithVectorImage( int argc, char *argv
 
   // Create the filter
   typedef itk::Statistics::RunLengthTextureFeaturesImageFilter<
-    InputImageType, OutputImageType > FilterType;
+    InputImageType, OutputImageType, InputImageType > FilterType;
   FilterType::Pointer filter = FilterType::New();
 
   EXERCISE_BASIC_OBJECT_METHODS( filter, RunLengthTextureFeaturesImageFilter,

Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ namespace Statistics`
`96`	`96`
`97`	`97`	`template< typename TInputImage,`
`98`	`98`	`typename TOutputImage,`
`99`		`- typename TMaskImage = TInputImage>`
	`99`	`+ typename TMaskImage = Image< unsigned char, TInputImage::ImageDimension> >`
`100`	`100`	`class ITK_TEMPLATE_EXPORT RunLengthTextureFeaturesImageFilter`
`101`	`101`	`: public ImageToImageFilter< TInputImage, TOutputImage >`
`102`	`102`	`{`