Skip to content

Commit d0b0706

Browse files
N-Dekkerdzenanz
N-Dekker
authored and
dzenanz
committed
STYLE: Replace CHAR with SCHAR in IOComponentEnum::CHAR cases
Aims to clarify that those cases deal with a `signed` char type.
1 parent 1ffca61 commit d0b0706

File tree

26 files changed

+67
-67
lines changed

26 files changed

+67
-67
lines changed

‎Modules/Core/TestKernel/src/itkTestDriverInclude.cxx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -737,7 +737,7 @@ RegressionTestImage(const char * testImageFilename,
737737
verifyInputInformation,
738738
coordinateTolerance,
739739
directionTolerance);
740-
case itk::IOComponentEnum::CHAR:
740+
case itk::IOComponentEnum::SCHAR:
741741
case itk::IOComponentEnum::SHORT:
742742
case itk::IOComponentEnum::INT:
743743
case itk::IOComponentEnum::LONG:
@@ -827,7 +827,7 @@ HashTestImage(const char * testImageFilename, const std::vector<std::string> & b
827827
std::string testMD5 = "";
828828
switch (componentType)
829829
{
830-
case itk::IOComponentEnum::CHAR:
830+
case itk::IOComponentEnum::SCHAR:
831831
testMD5 = ComputeHash<itk::VectorImage<signed char, ITK_TEST_DIMENSION_MAX>>(testImageFilename);
832832
break;
833833
case itk::IOComponentEnum::UCHAR:

‎Modules/IO/BMP/src/itkBMPImageIO.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -609,7 +609,7 @@ BMPImageIO::SwapBytesIfNecessary(void * buffer, SizeValueType numberOfPixels)
609609
{
610610
switch (m_ComponentType)
611611
{
612-
case IOComponentEnum::CHAR:
612+
case IOComponentEnum::SCHAR:
613613
case IOComponentEnum::UCHAR:
614614
{
615615
// For CHAR and UCHAR, it is not necessary to swap bytes.

‎Modules/IO/Bruker/src/itkBruker2dseqImageIO.cxx‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,7 @@ Bruker2dseqImageIO::SwapBytesIfNecessary(void * buff, SizeValueType components)
360360
#define BYTE_SWAP(T) ByteSwapper<T>::SwapRangeFromSystemToLittleEndian((T *)buff, components)
361361
switch (this->m_OnDiskComponentType)
362362
{
363-
case IOComponentEnum::CHAR:
363+
case IOComponentEnum::SCHAR:
364364
case IOComponentEnum::UCHAR:
365365
// For CHAR and UCHAR, it is not necessary to swap bytes.
366366
break;
@@ -398,7 +398,7 @@ Bruker2dseqImageIO::SwapBytesIfNecessary(void * buff, SizeValueType components)
398398
#define BYTE_SWAP(T) ByteSwapper<T>::SwapRangeFromSystemToBigEndian((T *)buff, components)
399399
switch (this->m_OnDiskComponentType)
400400
{
401-
case IOComponentEnum::CHAR:
401+
case IOComponentEnum::SCHAR:
402402
case IOComponentEnum::UCHAR:
403403
// For CHAR and UCHAR, it is not necessary to swap bytes.
404404
break;
@@ -451,7 +451,7 @@ Bruker2dseqImageIO::Read(void * buffer)
451451
case IOComponentEnum::UCHAR:
452452
numberOfBytesOnDisk *= sizeof(unsigned char);
453453
break;
454-
case IOComponentEnum::CHAR:
454+
case IOComponentEnum::SCHAR:
455455
numberOfBytesOnDisk *= sizeof(char);
456456
break;
457457
case IOComponentEnum::USHORT:
@@ -496,7 +496,7 @@ Bruker2dseqImageIO::Read(void * buffer)
496496
auto * floatBuffer = static_cast<float *>(buffer);
497497
switch (m_OnDiskComponentType)
498498
{
499-
case IOComponentEnum::CHAR:
499+
case IOComponentEnum::SCHAR:
500500
CastCopy<char>(floatBuffer, dataFromDiskBuffer, numberOfComponents);
501501
break;
502502
case IOComponentEnum::UCHAR:
@@ -555,7 +555,7 @@ Bruker2dseqImageIO::Read(void * buffer)
555555

556556
switch (this->m_ComponentType)
557557
{
558-
case IOComponentEnum::CHAR:
558+
case IOComponentEnum::SCHAR:
559559
[[fallthrough]];
560560
case IOComponentEnum::UCHAR:
561561
[[fallthrough]];
@@ -606,7 +606,7 @@ Bruker2dseqImageIO::Read(void * buffer)
606606
const SizeValueType noswap = this->GetDimensions(3) / sizeToSwap;
607607
switch (this->m_ComponentType)
608608
{
609-
case IOComponentEnum::CHAR:
609+
case IOComponentEnum::SCHAR:
610610
SwapSlicesAndVolumes(static_cast<char *>(buffer), x, y, z, sizeToSwap, noswap);
611611
break;
612612
case IOComponentEnum::UCHAR:
@@ -651,7 +651,7 @@ Bruker2dseqImageIO::Read(void * buffer)
651651
const SizeValueType v = (this->GetNumberOfDimensions() > 3) ? this->GetDimensions(3) : 1;
652652
switch (this->m_ComponentType)
653653
{
654-
case IOComponentEnum::CHAR:
654+
case IOComponentEnum::SCHAR:
655655
ReverseSliceOrder(static_cast<char *>(buffer), x, y, z, v);
656656
break;
657657
case IOComponentEnum::UCHAR:

‎Modules/IO/GDCM/src/itkGDCMImageIO.cxx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1161,7 +1161,7 @@ GDCMImageIO::Write(const void * buffer)
11611161
gdcm::PixelFormat pixeltype = gdcm::PixelFormat::UNKNOWN;
11621162
switch (this->GetComponentType())
11631163
{
1164-
case IOComponentEnum::CHAR:
1164+
case IOComponentEnum::SCHAR:
11651165
pixeltype = gdcm::PixelFormat::INT8;
11661166
break;
11671167
case IOComponentEnum::UCHAR:
@@ -1240,7 +1240,7 @@ GDCMImageIO::Write(const void * buffer)
12401240
// already been taken care of. The float case use an Integer internal
12411241
// storage, and specifies the precision desired for it.
12421242
//
1243-
case IOComponentEnum::CHAR:
1243+
case IOComponentEnum::SCHAR:
12441244
outpixeltype = gdcm::PixelFormat::INT8;
12451245
break;
12461246
case IOComponentEnum::UCHAR:

‎Modules/IO/GIPL/src/itkGiplImageIO.cxx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -596,7 +596,7 @@ GiplImageIO::SwapBytesIfNecessary(void * buffer, SizeValueType numberOfPixels)
596596
{
597597
switch (m_ComponentType)
598598
{
599-
case IOComponentEnum::CHAR:
599+
case IOComponentEnum::SCHAR:
600600
case IOComponentEnum::UCHAR:
601601
{
602602
// For CHAR and UCHAR, it is not necessary to swap bytes.
@@ -739,7 +739,7 @@ GiplImageIO::Write(const void * buffer)
739739
unsigned short image_type = 0;
740740
switch (m_ComponentType)
741741
{
742-
case IOComponentEnum::CHAR:
742+
case IOComponentEnum::SCHAR:
743743
image_type = GIPL_CHAR;
744744
break;
745745
case IOComponentEnum::UCHAR:

‎Modules/IO/HDF5/src/itkHDF5ImageIO.cxx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ ComponentToPredType(IOComponentEnum cType)
165165
{
166166
case IOComponentEnum::UCHAR:
167167
return H5::PredType::NATIVE_UCHAR;
168-
case IOComponentEnum::CHAR:
168+
case IOComponentEnum::SCHAR:
169169
return H5::PredType::NATIVE_CHAR;
170170
case IOComponentEnum::USHORT:
171171
return H5::PredType::NATIVE_USHORT;
@@ -204,7 +204,7 @@ ComponentToString(IOComponentEnum cType)
204204
case IOComponentEnum::UCHAR:
205205
rval = "UCHAR";
206206
break;
207-
case IOComponentEnum::CHAR:
207+
case IOComponentEnum::SCHAR:
208208
rval = "CHAR";
209209
break;
210210
case IOComponentEnum::USHORT:

‎Modules/IO/ImageBase/src/itkImageIOBase.cxx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ ImageIOBase::GetComponentTypeInfo() const
170170
{
171171
case IOComponentEnum::UCHAR:
172172
return typeid(unsigned char);
173-
case IOComponentEnum::CHAR:
173+
case IOComponentEnum::SCHAR:
174174
return typeid(char);
175175
case IOComponentEnum::USHORT:
176176
return typeid(unsigned short);
@@ -402,7 +402,7 @@ ImageIOBase::GetComponentTypeAsString(IOComponentEnum t)
402402
{
403403
case IOComponentEnum::UCHAR:
404404
return { "unsigned_char" };
405-
case IOComponentEnum::CHAR:
405+
case IOComponentEnum::SCHAR:
406406
return { "char" };
407407
case IOComponentEnum::USHORT:
408408
return { "unsigned_short" };
@@ -702,7 +702,7 @@ ImageIOBase::WriteBufferAsASCII(std::ostream & os,
702702
WriteBuffer(os, buf, numComp);
703703
}
704704
break;
705-
case IOComponentEnum::CHAR:
705+
case IOComponentEnum::SCHAR:
706706
{
707707
using Type = const char *;
708708
auto buf = static_cast<Type>(buffer);
@@ -822,7 +822,7 @@ ImageIOBase::ReadBufferAsASCII(std::istream & is, void * buffer, IOComponentEnum
822822
ReadBuffer(is, buf, numComp);
823823
}
824824
break;
825-
case IOComponentEnum::CHAR:
825+
case IOComponentEnum::SCHAR:
826826
{
827827
auto * buf = static_cast<signed char *>(buffer);
828828
ReadBuffer(is, buf, numComp);

‎Modules/IO/MINC/src/itkMINCImageIO.cxx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ MINCImageIO::Read(void * buffer)
129129
case IOComponentEnum::UCHAR:
130130
volume_data_type = MI_TYPE_UBYTE;
131131
break;
132-
case IOComponentEnum::CHAR:
132+
case IOComponentEnum::SCHAR:
133133
volume_data_type = MI_TYPE_BYTE;
134134
break;
135135
case IOComponentEnum::USHORT:
@@ -1022,7 +1022,7 @@ MINCImageIO::WriteImageInformation()
10221022
case IOComponentEnum::UCHAR:
10231023
m_MINCPImpl->m_Volume_type = MI_TYPE_UBYTE;
10241024
break;
1025-
case IOComponentEnum::CHAR:
1025+
case IOComponentEnum::SCHAR:
10261026
m_MINCPImpl->m_Volume_type = MI_TYPE_BYTE;
10271027
break;
10281028
case IOComponentEnum::USHORT:
@@ -1394,7 +1394,7 @@ MINCImageIO::Write(const void * buffer)
13941394
volume_data_type = MI_TYPE_UBYTE;
13951395
get_buffer_min_max<unsigned char>(buffer, buffer_length, buffer_min, buffer_max);
13961396
break;
1397-
case IOComponentEnum::CHAR:
1397+
case IOComponentEnum::SCHAR:
13981398
volume_data_type = MI_TYPE_BYTE;
13991399
get_buffer_min_max<signed char>(buffer, buffer_length, buffer_min, buffer_max);
14001400
break;

‎Modules/IO/MeshBYU/src/itkBYUMeshIO.cxx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ BYUMeshIO::WritePoints(void * buffer)
334334
WritePoints(static_cast<unsigned char *>(buffer), outputFile);
335335
break;
336336
}
337-
case IOComponentEnum::CHAR:
337+
case IOComponentEnum::SCHAR:
338338
{
339339
WritePoints(static_cast<char *>(buffer), outputFile);
340340

@@ -442,7 +442,7 @@ BYUMeshIO::WriteCells(void * buffer)
442442
WriteCells(static_cast<unsigned char *>(buffer), outputFile);
443443
break;
444444
}
445-
case IOComponentEnum::CHAR:
445+
case IOComponentEnum::SCHAR:
446446
{
447447
WriteCells(static_cast<unsigned char *>(buffer), outputFile);
448448
break;

‎Modules/IO/MeshBase/include/itkMeshFileReader.hxx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -509,7 +509,7 @@ MeshFileReader<TOutputMesh, ConvertPointPixelTraits, ConvertCellPixelTraits>::Ge
509509
{
510510
switch (m_MeshIO->GetPointComponentType())
511511
{
512-
case IOComponentEnum::CHAR:
512+
case IOComponentEnum::SCHAR:
513513
{
514514
Self::ReadPointsUsingMeshIO<char>();
515515
break;
@@ -587,7 +587,7 @@ MeshFileReader<TOutputMesh, ConvertPointPixelTraits, ConvertCellPixelTraits>::Ge
587587
{
588588
switch (m_MeshIO->GetCellComponentType())
589589
{
590-
case IOComponentEnum::CHAR:
590+
case IOComponentEnum::SCHAR:
591591
{
592592
Self::ReadCellsUsingMeshIO<char>();
593593
break;

0 commit comments

Comments
 (0)