From ef30910d72e92579aaad53e77311d0f815226cbe Mon Sep 17 00:00:00 2001 From: Mathew Seng Date: Tue, 18 Feb 2020 09:01:46 -0600 Subject: [PATCH] ENH: Update enums from recent enum changes in ITK --- src/itkFDFImageIO.cxx | 76 +++++++++++++++++++++---------------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/src/itkFDFImageIO.cxx b/src/itkFDFImageIO.cxx index cea7bb1..c32c8a6 100644 --- a/src/itkFDFImageIO.cxx +++ b/src/itkFDFImageIO.cxx @@ -231,47 +231,47 @@ FDFImageIO::ReadImageInformation() // Get the binary data type if (name == "storage") { - this->SetPixelType(SCALAR); + this->SetPixelType(IOPixelEnum::SCALAR); if (value == "double") { - this->SetComponentType(DOUBLE); + this->SetComponentType(IOComponentEnum::DOUBLE); } else if (value == "float") { - this->SetComponentType(FLOAT); + this->SetComponentType(IOComponentEnum::FLOAT); } else if (value == "long") { - this->SetComponentType(LONG); + this->SetComponentType(IOComponentEnum::LONG); } else if (value == "unsigned long") { - this->SetComponentType(ULONG); + this->SetComponentType(IOComponentEnum::ULONG); } else if (value == "int") { - this->SetComponentType(INT); + this->SetComponentType(IOComponentEnum::INT); } else if (value == "unsigned int") { - this->SetComponentType(UINT); + this->SetComponentType(IOComponentEnum::UINT); } else if (value == "short") { - this->SetComponentType(SHORT); + this->SetComponentType(IOComponentEnum::SHORT); } else if (value == "unsigned short") { - this->SetComponentType(USHORT); + this->SetComponentType(IOComponentEnum::USHORT); } else if (value == "char") { - this->SetComponentType(CHAR); + this->SetComponentType(IOComponentEnum::CHAR); } else if (value == "unsigned char") { - this->SetComponentType(UCHAR); + this->SetComponentType(IOComponentEnum::UCHAR); } else { @@ -455,109 +455,109 @@ FDFImageIO::SwapBytesIfNecessary(void * buffer, unsigned long numberOfPixels) { switch (this->GetComponentType()) { - case CHAR: + case IOComponentEnum::CHAR: { - if (this->m_ByteOrder == LittleEndian) + if (this->m_ByteOrder == IOByteOrderEnum::LittleEndian) { ByteSwapper::SwapRangeFromSystemToLittleEndian((char *)buffer, numberOfPixels); } - else if (this->m_ByteOrder == BigEndian) + else if (this->m_ByteOrder == IOByteOrderEnum::BigEndian) { ByteSwapper::SwapRangeFromSystemToBigEndian((char *)buffer, numberOfPixels); } break; } - case FLOAT: + case IOComponentEnum::FLOAT: { - if (this->m_ByteOrder == LittleEndian) + if (this->m_ByteOrder == IOByteOrderEnum::LittleEndian) { ByteSwapper::SwapRangeFromSystemToLittleEndian((float *)buffer, numberOfPixels); } - else if (this->m_ByteOrder == BigEndian) + else if (this->m_ByteOrder == IOByteOrderEnum::BigEndian) { ByteSwapper::SwapRangeFromSystemToBigEndian((float *)buffer, numberOfPixels); } break; } - case UCHAR: + case IOComponentEnum::UCHAR: { - if (this->m_ByteOrder == LittleEndian) + if (this->m_ByteOrder == IOByteOrderEnum::LittleEndian) { ByteSwapper::SwapRangeFromSystemToLittleEndian((unsigned char *)buffer, numberOfPixels); } - else if (this->m_ByteOrder == BigEndian) + else if (this->m_ByteOrder == IOByteOrderEnum::BigEndian) { ByteSwapper::SwapRangeFromSystemToBigEndian((unsigned char *)buffer, numberOfPixels); } break; } - case SHORT: + case IOComponentEnum::SHORT: { - if (this->m_ByteOrder == LittleEndian) + if (this->m_ByteOrder == IOByteOrderEnum::LittleEndian) { ByteSwapper::SwapRangeFromSystemToLittleEndian((short *)buffer, numberOfPixels); } - else if (this->m_ByteOrder == BigEndian) + else if (this->m_ByteOrder == IOByteOrderEnum::BigEndian) { ByteSwapper::SwapRangeFromSystemToBigEndian((short *)buffer, numberOfPixels); } break; } - case USHORT: + case IOComponentEnum::USHORT: { - if (this->m_ByteOrder == LittleEndian) + if (this->m_ByteOrder == IOByteOrderEnum::LittleEndian) { ByteSwapper::SwapRangeFromSystemToLittleEndian((unsigned short *)buffer, numberOfPixels); } - else if (this->m_ByteOrder == BigEndian) + else if (this->m_ByteOrder == IOByteOrderEnum::BigEndian) { ByteSwapper::SwapRangeFromSystemToBigEndian((unsigned short *)buffer, numberOfPixels); } break; } - case INT: + case IOComponentEnum::INT: { - if (this->m_ByteOrder == LittleEndian) + if (this->m_ByteOrder == IOByteOrderEnum::LittleEndian) { ByteSwapper::SwapRangeFromSystemToLittleEndian((int *)buffer, numberOfPixels); } - else if (this->m_ByteOrder == BigEndian) + else if (this->m_ByteOrder == IOByteOrderEnum::BigEndian) { ByteSwapper::SwapRangeFromSystemToBigEndian((int *)buffer, numberOfPixels); } break; } - case UINT: + case IOComponentEnum::UINT: { - if (this->m_ByteOrder == LittleEndian) + if (this->m_ByteOrder == IOByteOrderEnum::LittleEndian) { ByteSwapper::SwapRangeFromSystemToLittleEndian((unsigned int *)buffer, numberOfPixels); } - else if (this->m_ByteOrder == BigEndian) + else if (this->m_ByteOrder == IOByteOrderEnum::BigEndian) { ByteSwapper::SwapRangeFromSystemToBigEndian((unsigned int *)buffer, numberOfPixels); } break; } - case LONG: + case IOComponentEnum::LONG: { - if (this->m_ByteOrder == LittleEndian) + if (this->m_ByteOrder == IOByteOrderEnum::LittleEndian) { ByteSwapper::SwapRangeFromSystemToLittleEndian((long *)buffer, numberOfPixels); } - else if (this->m_ByteOrder == BigEndian) + else if (this->m_ByteOrder == IOByteOrderEnum::BigEndian) { ByteSwapper::SwapRangeFromSystemToBigEndian((long *)buffer, numberOfPixels); } break; } - case ULONG: + case IOComponentEnum::ULONG: { - if (this->m_ByteOrder == LittleEndian) + if (this->m_ByteOrder == IOByteOrderEnum::LittleEndian) { ByteSwapper::SwapRangeFromSystemToLittleEndian((unsigned long *)buffer, numberOfPixels); } - else if (this->m_ByteOrder == BigEndian) + else if (this->m_ByteOrder == IOByteOrderEnum::BigEndian) { ByteSwapper::SwapRangeFromSystemToBigEndian((unsigned long *)buffer, numberOfPixels); }