COMP: Change IOComponentType to IOComponentEnum

Change last few usages of pre ITK v5 IOComponentType enums to IOComponentEnum enum classes to make ITK compile with ITK_LEGACY_REMOVE.
InsightSoftwareConsortium · Aug 5, 2022 · abc6a27 · abc6a27
1 parent b1e080d
commit abc6a27
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/Modules/Video/BridgeOpenCV/include/itkOpenCVVideoIO.h b/Modules/Video/BridgeOpenCV/include/itkOpenCVVideoIO.h
@@ -168,7 +168,7 @@ class ITKVideoBridgeOpenCV_EXPORT OpenCVVideoIO : public VideoIOBase
                       const std::vector<SizeValueType> & dim,
                       const char *                       fourCC,
                       unsigned int                       nChannels,
-                      IOComponentType                    componentType);
+                      IOComponentEnum                    componentType);
 
 protected:
   OpenCVVideoIO();

diff --git a/Modules/Video/BridgeOpenCV/src/itkOpenCVVideoIO.cxx b/Modules/Video/BridgeOpenCV/src/itkOpenCVVideoIO.cxx
@@ -437,15 +437,15 @@ OpenCVVideoIO::SetWriterParameters(TemporalRatioType                  fps,
                                    const std::vector<SizeValueType> & dim,
                                    const char *                       fourCC,
                                    unsigned int                       nChannels,
-                                   IOComponentType                    componentType)
+                                   IOComponentEnum                    componentType)
 {
   if (this->m_ReaderOpen || this->m_WriterOpen)
   {
     itkExceptionMacro("Can not set the writer's parameters when either reader or writer is already open");
   }
 
   // Make sure componentType is acceptable (right now we only support char)
-  if (componentType != UCHAR)
+  if (componentType != IOComponentEnum::UCHAR)
   {
     itkExceptionMacro("OpenCV IO only supports writing video with pixels of UCHAR");
   }

diff --git a/Modules/Video/BridgeVXL/include/itkVXLVideoIO.h b/Modules/Video/BridgeVXL/include/itkVXLVideoIO.h
@@ -146,7 +146,7 @@ class VXLVideoIO : public VideoIOBase
                       const std::vector<SizeValueType> & dim,
                       const char *                       fourCC,
                       unsigned int                       nChannels,
-                      IOComponentType                    componentType) override;
+                      IOComponentEnum                    componentType) override;
 
 protected:
   VXLVideoIO();

diff --git a/Modules/Video/BridgeVXL/src/itkVXLVideoIO.cxx b/Modules/Video/BridgeVXL/src/itkVXLVideoIO.cxx
@@ -497,14 +497,14 @@ VXLVideoIO::SetWriterParameters(TemporalRatioType                  fps,
                                 const std::vector<SizeValueType> & dim,
                                 const char *                       fourCC,
                                 unsigned int                       nChannels,
-                                IOComponentType                    componentType)
+                                IOComponentEnum                    componentType)
 {
   if (this->m_ReaderOpen || this->m_WriterOpen)
   {
     itkExceptionMacro("Can not set the writer's parameters when either reader or writer is already open");
   }
 
-  if (componentType != UCHAR && componentType != UINT)
+  if (componentType != IOComponentEnum::UCHAR && IOComponentEnum::componentType != UINT)
   {
     itkExceptionMacro("VXL IO only supports writing video with pixels of UCHAR and UINT");
   }