Changeset 38589

Timestamp:

Jul 15, 2015, 10:49:42 AM (11 years ago)

Author:

eugene

Message:

update to handle compressed data (need to finish this work)

File:

• branches/eam_branches/ipp-20150625/Ohana/src/dvomerge/src/dvorepairDeleteImagesByExternID.c (modified) (2 diffs)

branches/eam_branches/ipp-20150625/Ohana/src/dvomerge/src/dvorepairDeleteImagesByExternID.c

@@ -271 +271 @@
         }
 
-        // read Measure table data : format is irrelevant here */
-        if (!gfits_fread_ftable_data (cpmFile, &cpmFtable, TRUE)) { 
+        char nativeOrder;
+        Catalog catalog;
+        dvo_catalog_init (&catalog);
+        catalog.f = cpmFile;
+        if (!gfits_fread_uncompressed (&catalog, &cpmFtable, &nativeOrder, TRUE)) {
           myAbort("can't read data for cpm table");
         }
@@ -289 +292 @@
         // NOTE: FtableToMeasure (and equivalent) free the data associated with cpmFtable.
         // We are left with the data in measure.
-        measure = FtableToMeasure (&cpmFtable, NULL, &Nmeasure, &catformat, FALSE);
+        measure = FtableToMeasure (&cpmFtable, NULL, &Nmeasure, &catformat, nativeOrder);
         myAssert(measure, "failed to convert ftable to measure data");