COMP: Change IOComponentType to IOComponentEnum

kislinsk · dzenanz · commit abc6a272cda2 · 2022-08-05T14:24:26.000-04:00
Change last few usages of pre ITK v5 IOComponentType enums to
IOComponentEnum enum classes to make ITK compile with ITK_LEGACY_REMOVE.
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");
   }

Original file line number	Diff line number	Diff line change
`@@ -437,15 +437,15 @@ OpenCVVideoIO::SetWriterParameters(TemporalRatioType fps,`
`437`	`437`	`const std::vector<SizeValueType> & dim,`
`438`	`438`	`const char * fourCC,`
`439`	`439`	`unsigned int nChannels,`
`440`		`- IOComponentType componentType)`
	`440`	`+ IOComponentEnum componentType)`
`441`	`441`	`{`
`442`	`442`	`if (this->m_ReaderOpen \|\| this->m_WriterOpen)`
`443`	`443`	`{`
`444`	`444`	`itkExceptionMacro("Can not set the writer's parameters when either reader or writer is already open");`
`445`	`445`	`}`
`446`	`446`
`447`	`447`	`// Make sure componentType is acceptable (right now we only support char)`
`448`		`- if (componentType != UCHAR)`
	`448`	`+ if (componentType != IOComponentEnum::UCHAR)`
`449`	`449`	`{`
`450`	`450`	`itkExceptionMacro("OpenCV IO only supports writing video with pixels of UCHAR");`
`451`	`451`	`}`
Original file line number	Diff line number	Diff line change
`@@ -497,14 +497,14 @@ VXLVideoIO::SetWriterParameters(TemporalRatioType fps,`
`497`	`497`	`const std::vector<SizeValueType> & dim,`
`498`	`498`	`const char * fourCC,`
`499`	`499`	`unsigned int nChannels,`
`500`		`- IOComponentType componentType)`
	`500`	`+ IOComponentEnum componentType)`
`501`	`501`	`{`
`502`	`502`	`if (this->m_ReaderOpen \|\| this->m_WriterOpen)`
`503`	`503`	`{`
`504`	`504`	`itkExceptionMacro("Can not set the writer's parameters when either reader or writer is already open");`
`505`	`505`	`}`
`506`	`506`
`507`		`- if (componentType != UCHAR && componentType != UINT)`
	`507`	`+ if (componentType != IOComponentEnum::UCHAR && IOComponentEnum::componentType != UINT)`
`508`	`508`	`{`
`509`	`509`	`itkExceptionMacro("VXL IO only supports writing video with pixels of UCHAR and UINT");`
`510`	`510`	`}`