BUG: align type comparisons

BUG: add test reliance for read after write
BUG: access float enum correctly

Author: ebald19

include/itkAIMHeaderIO.h

@@ -119,9 +119,9 @@ class AIMHeaderIO : public ScancoHeaderIO
   unsigned int m_IntSize{ 4 }; // Size of integers in the header (4 for AIM v020, 8 for AIM v030)
 
   /** Header Size = m_PreHeaderSize + m_ImgStructSize + m_ProcessingLogSize */
-  unsigned long m_PreHeaderSize{ 0 };
-  unsigned long m_ImgStructSize{ 0 };
-  unsigned long m_ProcessingLogSize{ 0 };
+  size_t m_PreHeaderSize{ 0 };
+  size_t m_ImgStructSize{ 0 };
+  size_t m_ProcessingLogSize{ 0 };
 };
 } // namespace itk
 #endif // itkAIMHeaderIO_h

src/itkAIMHeaderIO.cxx

@@ -358,7 +358,7 @@ AIMHeaderIO::ReadImgStructHeader(AIMV030StructHeader * headerData)
 int
 AIMHeaderIO::ReadProcessingLog(std::ifstream & infile, unsigned long offset, unsigned long length)
 {
-  int         bytesRead = 0;
+  size_t      bytesRead = 0;
   std::string readString = "";
 
   if (length == 0)

src/itkScancoImageIO.cxx

@@ -334,7 +334,7 @@ ScancoImageIO::PopulateMetaDataDictionary()
   EncapsulateMetaData<double>(thisDic, "MuWater", this->m_HeaderData.m_MuWater);
   EncapsulateMetaData<double>(thisDic, "StartPosition", this->m_HeaderData.m_StartPosition);
 
-  for (int i = 0; i < this->GetNumberOfDimensions(); i++)
+  for (unsigned int i = 0; i < this->GetNumberOfDimensions(); i++)
   {
     pixelDimensions[i] = this->m_HeaderData.m_ScanDimensionsPixels[i];
     physicalDimensions[i] = this->m_HeaderData.m_ScanDimensionsPhysical[i];
@@ -423,7 +423,7 @@ ScancoImageIO::SetHeaderFromMetaDataDictionary()
     return;
   }
 
-  for (int i = 0; i < this->GetNumberOfDimensions(); i++)
+  for (unsigned int i = 0; i < this->GetNumberOfDimensions(); i++)
   {
     this->m_HeaderData.m_ScanDimensionsPixels[i] = pixelDimensions[i];
     this->m_HeaderData.m_ScanDimensionsPhysical[i] = physicalDimensions[i];

test/CMakeLists.txt

@@ -81,7 +81,9 @@ itk_add_test(NAME itkScancoImageIOISQReadWritten
       ${ITK_TEST_OUTPUT_DIR}/C0004255Test2.isq
       ${ITK_TEST_OUTPUT_DIR}/ISQWrite.ISQ
 )
-
+set_property(TEST itkScancoImageIOISQReadWritten APPEND PROPERTY DEPENDS 
+  itkScancoImageIOISQHeaderWriteTest2)
+  
 itk_add_test(NAME itkScancoImageIOAIMWriteTest
   COMMAND IOScancoTestDriver
   --compare
@@ -113,3 +115,23 @@ itk_add_test(NAME itkScancoImageIOAIM030FloatReadHeader
       0
       "AIMDATA_V030   "
 )
+
+itk_add_test(NAME itkScancoImageIOAIMReadBin
+  COMMAND IOScancoTestDriver
+  --compare
+      DATA{Baseline/AIMIOTestImage.mha}
+      ${ITK_TEST_OUTPUT_DIR}/AIMIOBinUncompressed.aim
+    itkScancoImageIOTest3
+      DATA{Input/AIMIOTestImageBin.AIM}
+      ${ITK_TEST_OUTPUT_DIR}/AIMIOBinUncompressed.aim
+)
+
+itk_add_test(NAME itkScancoImageIOAIMReadRun
+  COMMAND IOScancoTestDriver
+  --compare
+      DATA{Baseline/AIMIOTestImage.mha}
+      ${ITK_TEST_OUTPUT_DIR}/AIMIOBinUncompressed.aim
+    itkScancoImageIOTest3
+      DATA{Input/AIMIOTestImageRun.AIM}
+      ${ITK_TEST_OUTPUT_DIR}/AIMIOBinUncompressed.aim
+)

test/itkScancoImageIOTest3.cxx

@@ -80,7 +80,7 @@ itkScancoImageIOTest3(int argc, char * argv[])
   std::cout << "DataRange[0]: \t" << scancoIO->GetDataRange()[0] << std::endl;
   std::cout << "DataRange[1]: \t" << scancoIO->GetDataRange()[1] << std::endl;
 
-  if (scancoIO->GetComponentType() == itk::ImageIOBase::FLOAT)
+  if (scancoIO->GetComponentType() == itk::IOComponentEnum::FLOAT)
   {
     ITK_TEST_EXPECT_TRUE(itk::Math::FloatAlmostEqual(scancoIO->GetDataRange()[0], -1380.0, 6, 1e-3));
     ITK_TEST_EXPECT_TRUE(itk::Math::FloatAlmostEqual(scancoIO->GetDataRange()[1], 8823.0, 6, 1e-3));