Changeset 13518

Timestamp:

2006-12-15T12:19:11+13:00 (17 years ago)

Author:

mdewsnip

Message:

Running this on a big-endian machine would fail to read little-endian CDS/ISIS files. I've assumed most (all?) CDS/ISIS files are little-endian, and added code to convert the values into the right endianness on big-endian machines.

Location:

trunk/gsdl/packages/isis-gdl

Files:

• Compat.h (modified) (1 diff)
• MFFile.h (modified) (3 diffs)
• Master.cpp (modified) (3 diffs)
• XRFFile.cpp (modified) (2 diffs)

trunk/gsdl/packages/isis-gdl/Compat.h

@@ -104 +104 @@
 #define MoveMemory memmove
 #define ZeroMemory(p,size) memset(p,0,size)
+
+
+inline void fix_endianness(short int& x)
+{
+#if !defined(LITTLE_ENDIAN)
+  if (x < 0) {
+    unsigned short int ux = (unsigned short int) x;
+    x = (ux>>8) | 
+        (ux<<8);
+  }
+  else {
+    x = (x>>8) | 
+        (x<<8);
+  }
+#endif
+}
+
+inline void fix_endianness(long int& x)
+{
+#if !defined(LITTLE_ENDIAN)
+  if (x < 0) {
+    unsigned long ux = (unsigned long) x;
+    x = (ux>>24) | 
+      ((ux<<8) & 0x00FF0000) |
+      ((ux>>8) & 0x0000FF00) |
+      (ux<<24);
+  }
+  else {
+    x = (x>>24) | 
+      ((x<<8) & 0x00FF0000) |
+      ((x>>8) & 0x0000FF00) |
+      (x<<24);
+  }
+#endif
+}

trunk/gsdl/packages/isis-gdl/MFFile.h

@@ -250 +250 @@
  
 //////////////////////////////
- 
+
 inline void MfFile::ReadMfHdr()
 //  Reads the master file header record
@@ -257 +257 @@
    TRACE(_T("\nsizeof(SMfHeader)=%d"), sizeof(SMfHeader));
    ::MoveMemory(&mfh_, buf_, sizeof(SMfHeader));
+
+   fix_endianness(mfh_.ctlmfn_);
+   fix_endianness(mfh_.nxtmfn_);
+   fix_endianness(mfh_.nxtmfb_);
+   fix_endianness(mfh_.nxtmfp_);
+   fix_endianness(mfh_.mftype_);
+   fix_endianness(mfh_.reccnt_);
+   fix_endianness(mfh_.mfcxx1_);
+   fix_endianness(mfh_.mfcxx2_);
+   fix_endianness(mfh_.mfcxx3_);
 }
  
@@ -279 +289 @@
    ReadBlk(buf_, 1L);
    ::MoveMemory(&h, buf_, sizeof(SMfHeader));
+
+   fix_endianness(h.ctlmfn_);
+   fix_endianness(h.nxtmfn_);
+   fix_endianness(h.nxtmfb_);
+   fix_endianness(h.nxtmfp_);
+   fix_endianness(h.mftype_);
+   fix_endianness(h.reccnt_);
+   fix_endianness(h.mfcxx1_);
+   fix_endianness(h.mfcxx2_);
+   fix_endianness(h.mfcxx3_);
 }
  

trunk/gsdl/packages/isis-gdl/Master.cpp

@@ -161 +161 @@
         s.read((char *) &leader_directory.status_, sizeof(ISIS_INT));
 
+        fix_endianness(leader_directory.mfn_);
+        fix_endianness(leader_directory.mfrl_);
+        fix_endianness(leader_directory.mfbwb_);
+        fix_endianness(leader_directory.mfbwp_);
+        fix_endianness(leader_directory.base_);
+        fix_endianness(leader_directory.nvf_);
+        fix_endianness(leader_directory.status_);
+
         if (!leader_directory.dir_.empty())
             leader_directory.dir_.clear();
@@ -174 +182 @@
                 DirEntry de;
                 s.read((char *) &de, GetDirEntrySize());
+                fix_endianness(de.tag_);
+                fix_endianness(de.pos_);
+                fix_endianness(de.len_);
                 // Don't check integrity of directory entries here
                 leader_directory.dir_.push_back(de);
@@ -714 +725 @@
     leader_directory_.mfn_  = *(reinterpret_cast<ISIS_LONG*>((char *) record_.c_str()));
     leader_directory_.mfrl_ = *(reinterpret_cast<ISIS_INT*> ((char *)(record_.c_str()+sizeof(ISIS_LONG))));
+    fix_endianness(leader_directory_.mfn_);
+    fix_endianness(leader_directory_.mfrl_);
     if (leader_directory_.mfrl_ < 0) leader_directory_.mfrl_ = -leader_directory_.mfrl_;    // mfrl can be negative!!!!
 

trunk/gsdl/packages/isis-gdl/XRFFile.cpp

@@ -151 +151 @@
 void XrfFile::UnPack(void)
 {
+   fix_endianness(xrf_->xrfpos_);
+
    xrfa_->xrfpos_ = xrf_->xrfpos_;
    if (xrfa_->xrfpos_ < 0)
@@ -163 +165 @@
    {
       long j = xrf_->xrftiv_[i];             // Packed value
+      fix_endianness(j);
       bool b = (j < 0);
       if (b)