Changeset 38441 for trunk/Ohana/src/libdvo/src/LoadPhotcodesFITS.c

Timestamp:

Jun 12, 2015, 6:18:23 PM (11 years ago)

Author:

eugene

Message:

merge changes from EAM dev branch ohana.20150429

Location:

trunk/Ohana

Files:

• . (modified) (1 prop)
• src/libdvo/src/LoadPhotcodesFITS.c (modified) (2 diffs)

trunk/Ohana/src/libdvo/src/LoadPhotcodesFITS.c

@@ -15 +15 @@
 
   /* XXX choose more sensible lock timeouts! */
+  gfits_db_init (&db);
   db.timeout   = 60.0;
   db.lockstate = LCK_SOFT;
-  gfits_db_init (&db);
 
   /* does this mean the db is empty, non-existent, or has access errors? */
@@ -43 +43 @@
 # define CONVERT_FORMAT(NAME, FORMAT)                                   \
   if (!strcmp (extname, NAME)) {                                        \
-    PhotCode_##FORMAT *photcode_input = gfits_table_get_PhotCode_##FORMAT (&db.ftable, &Ncode, &db.swapped); \
+    PhotCode_##FORMAT *photcode_input = gfits_table_get_PhotCode_##FORMAT (&db.ftable, &Ncode, &db.scaledValue, &db.nativeOrder); \
     if (!photcode_input) {                                                      \
       fprintf (stderr, "ERROR: failed to read photcodes in LoadPhotcodesFITS.c\n");             \