Changeset 19284 for trunk/Mars/mcore

Timestamp:

10/24/18 16:01:11 (6 years ago)

Author:

tbretz

Message:

Removed processings from BlockHeader, as a variable size array, it created problem with compiling the root dictionary with certain compilers. Now, the memory position is calculated directly in the code (fortunately, this 'trick' was only used in one location).

Location:

trunk/Mars/mcore

Files:

• FITS.h (modified) (1 diff)
• zfits.h (modified) (2 diffs)

trunk/Mars/mcore/FITS.h

@@ -131 +131 @@
         char          ordering;
         unsigned char numProcs;
-        uint16_t      processings[];
+        // This looks like a nice solution but always created problems
+        // with the root dictionary because the dictionary generator
+        // generates invalid code for some compilers.
+        // As it is used only while reading, and only in one place
+        // I replaced that by a direct cast.
+        // uint16_t      processings[];
 
         BlockHeader(uint64_t      s=0,

trunk/Mars/mcore/zfits.h

@@ -518 +518 @@
 
             const FITS::BlockHeader* head = reinterpret_cast<FITS::BlockHeader*>(&fCompressedBuffer[compressedOffset]);
+            const uint16_t *processings = reinterpret_cast<const uint16_t*>(reinterpret_cast<const char*>(head)+sizeof(FITS::BlockHeader));
 
             fColumnOrdering[i] = head->ordering;
@@ -530 +531 @@
                 uint32_t sizeWritten=0;
 
-                switch (head->processings[j])
+                switch (processings[j])
                 {
                 case FITS::kFactRaw: