Skip to content

Let IOComponent::CHAR represents signed char #5450

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jul 10, 2025
Merged

Let IOComponent::CHAR represents signed char #5450

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3e04bad
DOC: Add note about `IOComponent::CHAR` representing `signed char`
N-Dekker Jul 3, 2025
ef58f36
ENH: Let file readers interpret `CHAR` enum as `signed char`
N-Dekker Jul 3, 2025
22e56ab
ENH: Let tests interpret `IOComponent::CHAR` as `signed char`
N-Dekker Jul 3, 2025
d26cce4
ENH: Let ImageIOBase ReadBufferAsASCII interpret `CHAR` as `signed char`
N-Dekker Jul 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Modules/Core/Common/include/itkCommonEnums.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,8 @@ class CommonEnums
* Enums used to manipulate the component type. The component type
* refers to the actual storage class associated with either a
* SCALAR pixel type or elements of a compound pixel.
*
* \note The enum `CHAR` represents `signed char` (not just plain `char`).
*/
ITK_CLANG_PRAGMA_PUSH
ITK_CLANG_SUPPRESS_Wduplicate_enum
Expand Down
2 changes: 1 addition & 1 deletion Modules/Core/TestKernel/src/itkTestDriverInclude.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -828,7 +828,7 @@ HashTestImage(const char * testImageFilename, const std::vector<std::string> & b
switch (componentType)
{
case itk::IOComponentEnum::CHAR:
testMD5 = ComputeHash<itk::VectorImage<char, ITK_TEST_DIMENSION_MAX>>(testImageFilename);
testMD5 = ComputeHash<itk::VectorImage<signed char, ITK_TEST_DIMENSION_MAX>>(testImageFilename);
break;
case itk::IOComponentEnum::UCHAR:
testMD5 = ComputeHash<itk::VectorImage<unsigned char, ITK_TEST_DIMENSION_MAX>>(testImageFilename);
Expand Down
2 changes: 1 addition & 1 deletion Modules/IO/ImageBase/include/itkImageFileReader.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -482,7 +482,7 @@ ImageFileReader<TOutputImage, ConvertPixelTraits>::DoConvertBuffer(const void *
{
}
ITK_CONVERT_BUFFER_IF_BLOCK(IOComponentEnum::UCHAR, unsigned char)
ITK_CONVERT_BUFFER_IF_BLOCK(IOComponentEnum::CHAR, char)
ITK_CONVERT_BUFFER_IF_BLOCK(IOComponentEnum::CHAR, signed char)
ITK_CONVERT_BUFFER_IF_BLOCK(IOComponentEnum::USHORT, unsigned short)
ITK_CONVERT_BUFFER_IF_BLOCK(IOComponentEnum::SHORT, short)
ITK_CONVERT_BUFFER_IF_BLOCK(IOComponentEnum::UINT, unsigned int)
Expand Down
2 changes: 1 addition & 1 deletion Modules/IO/ImageBase/src/itkImageIOBase.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -824,7 +824,7 @@ ImageIOBase::ReadBufferAsASCII(std::istream & is, void * buffer, IOComponentEnum
break;
case IOComponentEnum::CHAR:
{
auto * buf = static_cast<char *>(buffer);
auto * buf = static_cast<signed char *>(buffer);
ReadBuffer(is, buf, numComp);
}
break;
Expand Down
4 changes: 2 additions & 2 deletions Modules/IO/MeshBase/include/itkMeshFileReader.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -703,7 +703,7 @@ MeshFileReader<TOutputMesh, ConvertPointPixelTraits, ConvertCellPixelTraits>::Co
{
}
ITK_CONVERT_POINT_PIXEL_BUFFER_IF_BLOCK(IOComponentEnum::UCHAR, unsigned char)
ITK_CONVERT_POINT_PIXEL_BUFFER_IF_BLOCK(IOComponentEnum::CHAR, char)
ITK_CONVERT_POINT_PIXEL_BUFFER_IF_BLOCK(IOComponentEnum::CHAR, signed char)
ITK_CONVERT_POINT_PIXEL_BUFFER_IF_BLOCK(IOComponentEnum::USHORT, unsigned short)
ITK_CONVERT_POINT_PIXEL_BUFFER_IF_BLOCK(IOComponentEnum::SHORT, short)
ITK_CONVERT_POINT_PIXEL_BUFFER_IF_BLOCK(IOComponentEnum::UINT, unsigned int)
Expand Down Expand Up @@ -778,7 +778,7 @@ MeshFileReader<TOutputMesh, ConvertPointPixelTraits, ConvertCellPixelTraits>::Co
{
}
ITK_CONVERT_CELL_PIXEL_BUFFER_IF_BLOCK(IOComponentEnum::UCHAR, unsigned char)
ITK_CONVERT_CELL_PIXEL_BUFFER_IF_BLOCK(IOComponentEnum::CHAR, char)
ITK_CONVERT_CELL_PIXEL_BUFFER_IF_BLOCK(IOComponentEnum::CHAR, signed char)
ITK_CONVERT_CELL_PIXEL_BUFFER_IF_BLOCK(IOComponentEnum::USHORT, unsigned short)
ITK_CONVERT_CELL_PIXEL_BUFFER_IF_BLOCK(IOComponentEnum::SHORT, short)
ITK_CONVERT_CELL_PIXEL_BUFFER_IF_BLOCK(IOComponentEnum::UINT, unsigned int)
Expand Down
2 changes: 1 addition & 1 deletion Modules/IO/TIFF/test/itkTIFFImageIOCompressionTest.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ itkTIFFImageIOCompressionTest(int argc, char * argv[])
}
case itk::IOComponentEnum::CHAR:
{
using PixelType = char;
using PixelType = signed char;
return itkTIFFImageIOCompressionTestHelper<itk::Image<PixelType, 2>>(argc, argv, JPEGQuality);
}
case itk::IOComponentEnum::USHORT:
Expand Down
2 changes: 1 addition & 1 deletion Modules/Video/IO/include/itkVideoFileReader.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ VideoFileReader<TOutputVideoStream>::DoConvertBuffer(const void * inputData, Fra
{
}
ITK_CONVERT_BUFFER_IF_BLOCK(IOComponentEnum::UCHAR, unsigned char)
ITK_CONVERT_BUFFER_IF_BLOCK(IOComponentEnum::CHAR, char)
ITK_CONVERT_BUFFER_IF_BLOCK(IOComponentEnum::CHAR, signed char)
ITK_CONVERT_BUFFER_IF_BLOCK(IOComponentEnum::USHORT, unsigned short)
ITK_CONVERT_BUFFER_IF_BLOCK(IOComponentEnum::SHORT, short)
ITK_CONVERT_BUFFER_IF_BLOCK(IOComponentEnum::UINT, unsigned int)
Expand Down
Loading