Skip to content

Commit 724f51a

Browse files
committed
STYLE: Replace char with signed char as itk::Image argument in tests
The use of `char` as `TPixel` argument in tests appears to triggers test failures, when compiling with an unsigned default `char` type (GCC option `-funsigned-char`). It appears clearer to explicitly specify that the pixel type should be signed, as in `signed char`.
1 parent 10b2044 commit 724f51a

21 files changed

+31
-31
lines changed

Modules/Core/Common/test/itkBSplineInterpolationWeightFunctionTest.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ itkBSplineInterpolationWeightFunctionTest(int, char *[])
274274
using KernelType = itk::BSplineKernelFunction<SplineOrder>;
275275
auto kernel = KernelType::New();
276276

277-
using ImageType = itk::Image<char, SpaceDimension>;
277+
using ImageType = itk::Image<signed char, SpaceDimension>;
278278
auto image = ImageType::New();
279279
const ImageType::RegionType region{ startIndex, size };
280280

Modules/Core/Common/test/itkConstNeighborhoodIteratorWithOnlyIndexTest.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -452,7 +452,7 @@ int
452452
itkConstNeighborhoodIteratorWithOnlyIndexTest(int, char *[])
453453
{
454454
std::cout << "*** Testing with itk::Image" << std::endl << std::endl;
455-
if (itkConstNeighborhoodIteratorWithOnlyIndexTestRun<itk::Image<char, 4>>() == EXIT_FAILURE)
455+
if (itkConstNeighborhoodIteratorWithOnlyIndexTestRun<itk::Image<signed char, 4>>() == EXIT_FAILURE)
456456
{
457457
std::cerr << "XXX Failed with itk::Image XXX" << std::endl;
458458
return EXIT_FAILURE;

Modules/Core/Common/test/itkImageAlgorithmCopyTest.cxx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ AverageTestCopy(typename TImage::SizeType & size)
118118
int
119119
itkImageAlgorithmCopyTest(int, char *[])
120120
{
121-
using ImageType3D = itk::Image<char, 3>;
121+
using ImageType3D = itk::Image<signed char, 3>;
122122
auto size3d = ImageType3D::SizeType::Filled(16);
123123
AverageTestCopy<ImageType3D>(size3d);
124124

@@ -131,7 +131,7 @@ itkImageAlgorithmCopyTest(int, char *[])
131131
size3d.Fill(128);
132132
AverageTestCopy<ImageType3D>(size3d);
133133

134-
using ImageType2D = itk::Image<char, 2>;
134+
using ImageType2D = itk::Image<signed char, 2>;
135135
auto size2d = ImageType2D::SizeType::Filled(16);
136136
AverageTestCopy<ImageType2D>(size2d);
137137

Modules/Core/Common/test/itkImageRegionConstIteratorWithOnlyIndexTest.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ itkImageRegionConstIteratorWithOnlyIndexTest(int, char *[])
189189

190190
{
191191
std::cout << "Testing with Image< char, 3 >... " << std::endl;
192-
itkImageRegionConstIteratorWithOnlyIndexTestIteratorTester<itk::Image<char, 3>> Tester;
192+
itkImageRegionConstIteratorWithOnlyIndexTestIteratorTester<itk::Image<signed char, 3>> Tester;
193193
if (Tester.TestConstIterator() == false)
194194
{
195195
testPassed = false;

Modules/Core/Common/test/itkImageVectorOptimizerParametersHelperTest.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ itkImageVectorOptimizerParametersHelperTest(int, char *[])
142142
ITK_TRY_EXPECT_EXCEPTION(params.MoveDataPointer(array.data_block()));
143143

144144
// Test setting an image of wrong type
145-
using BadImageType = itk::Image<char, 2>;
145+
using BadImageType = itk::Image<signed char, 2>;
146146
auto badImage = BadImageType::New();
147147
ITK_TRY_EXPECT_EXCEPTION(params.SetParametersObject(badImage));
148148

Modules/Core/Common/test/itkMultiThreaderParallelizeArrayTest.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ itkMultiThreaderParallelizeArrayTest(int argc, char * argv[])
6666
constexpr unsigned int size = 1029;
6767
std::vector<unsigned int> vec(size);
6868

69-
using SomeProcessObject = itk::AbsImageFilter<itk::Image<char>, itk::Image<char>>;
69+
using SomeProcessObject = itk::AbsImageFilter<itk::Image<signed char>, itk::Image<signed char>>;
7070
auto progressPO = SomeProcessObject::New();
7171
auto showProgress = ShowProgress::New();
7272
progressPO->AddObserver(itk::ProgressEvent(), showProgress);

Modules/Core/Common/test/itkSimpleFilterWatcherTest.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ itkSimpleFilterWatcherTest(int, char *[])
8585
{
8686
// Test out the code
8787
using WatcherType = itk::SimpleFilterWatcher;
88-
using ImageType = itk::Image<char, 3>;
88+
using ImageType = itk::Image<signed char, 3>;
8989
using FilterType = itk::TanHelperImageFilter<ImageType, ImageType>;
9090
auto filter = FilterType::New();
9191
const char * comment = "comment";

Modules/Filtering/AntiAlias/test/itkAntiAliasBinaryImageFilterTest.cxx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@ sphere(float x, float y, float z)
4848
}
4949

5050
void
51-
evaluate_function(itk::Image<char, 3> * im, float (*f)(float, float, float))
51+
evaluate_function(itk::Image<signed char, 3> * im, float (*f)(float, float, float))
5252
{
53-
itk::Image<char, 3>::IndexType idx;
53+
itk::Image<signed char, 3>::IndexType idx;
5454

5555
for (int z = 0; z < V_DEPTH; ++z)
5656
{

Modules/Filtering/ImageCompose/test/itkJoinImageFilterTest.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ itkJoinImageFilterTest(int, char *[])
2929
constexpr unsigned int myDimension = 2;
3030

3131
// Declare the types of the images
32-
using myImageType1 = itk::Image<char, myDimension>;
32+
using myImageType1 = itk::Image<signed char, myDimension>;
3333
using myImageType2 = itk::Image<itk::Vector<unsigned short, 2>, myDimension>;
3434
using myImageType3 = itk::Image<itk::RGBAPixel<short>, myDimension>;
3535

Modules/Filtering/ImageFrequency/test/itkFrequencyIteratorsGTest.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ template <typename TOutputImageType>
105105
static typename TOutputImageType::Pointer
106106
CreateImage(unsigned int size)
107107
{
108-
using ImageType = itk::Image<char, TOutputImageType::ImageDimension>;
108+
using ImageType = itk::Image<signed char, TOutputImageType::ImageDimension>;
109109
auto imageSize = ImageType::SizeType::Filled(size);
110110
using RandomImageSourceType = itk::RandomImageSource<ImageType>;
111111
auto randomImageSource = RandomImageSourceType::New();

0 commit comments

Comments
 (0)