BUG: MRC write full machine stamp

The MRC2014 specification updated/clarifed the spec that the first two bytes should contain the specified value to determine endian. This appears to be enforced with Python mrcfile. This patch enables compatibility.
InsightSoftwareConsortium · Apr 21, 2023 · 8ca5d1f · 8ca5d1f
1 parent e7ffba6
commit 8ca5d1f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/Modules/IO/MRC/include/itkMRCHeaderObject.h b/Modules/IO/MRC/include/itkMRCHeaderObject.h
@@ -164,8 +164,8 @@ class ITKIOMRC_EXPORT MRCHeaderObject : public LightObject
     float zorg;
 
     char cmap[4];  /**< Contains "MAP "  */
-    char stamp[4]; /**< First byte has 17 for big- or 68 for
-                     little-endian  */
+    char stamp[4]; /**< First two bytes have 17 and 17 for big-endian or
+                        68 and 68 for little-endian */
     float rms;
 
     // ALL HEADERS:

diff --git a/Modules/IO/MRC/src/itkMRCImageIO.cxx b/Modules/IO/MRC/src/itkMRCImageIO.cxx
@@ -358,10 +358,12 @@ MRCImageIO::UpdateHeaderFromImageIO()
   if (ByteSwapper<void *>::SystemIsBigEndian())
   {
     header.stamp[0] = 17;
+    header.stamp[1] = 17;
   }
   else
   {
     header.stamp[0] = 68;
+    header.stamp[1] = 68;
   }
 
   header.alpha = 90;

diff --git a/Modules/IO/MRC/test/itkMRCImageIOTest2.cxx b/Modules/IO/MRC/test/itkMRCImageIOTest2.cxx
@@ -24,6 +24,9 @@
 #include "itkMetaDataObject.h"
 #include "itkTestingHashImageFilter.h"
 
+
+static_assert(sizeof(itk::MRCHeaderObject::Header) == 1024, " Ill defined MRC Header struct");
+
 namespace
 {