Changeset 13518 for trunk/gsdl/packages/isis-gdl/Master.cpp

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.

File:

• trunk/gsdl/packages/isis-gdl/Master.cpp (modified) (3 diffs)

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!!!!