Changeset 38441 for trunk/Ohana/src/dvomerge/src/dvo_image_merge_dbs.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/dvomerge/src/dvo_image_merge_dbs.c (modified) (3 diffs)

trunk/Ohana/src/dvomerge/src/dvo_image_merge_dbs.c

@@ -16 +16 @@
   short  *TgtCodes;
  
-  imagesSrc = gfits_table_get_Image (&src[0].ftable, &NimagesSrc, &src[0].swapped);
+  imagesSrc = gfits_table_get_Image (&src[0].ftable, &NimagesSrc, &src[0].scaledValue, &src[0].nativeOrder);
   if (!imagesSrc) {
     fprintf (stderr, "ERROR: failed to read images from src\n");
@@ -22 +22 @@
   }
 
-  imagesTgt = gfits_table_get_Image (&tgt[0].ftable, &NimagesTgt, &tgt[0].swapped);
+  imagesTgt = gfits_table_get_Image (&tgt[0].ftable, &NimagesTgt, &tgt[0].scaledValue, &tgt[0].nativeOrder);
   if (!imagesTgt) {
     fprintf (stderr, "ERROR: failed to read images from tgt\n");
@@ -83 +83 @@
   }
 
-  images = gfits_table_get_Image (&in[0].ftable, &Nimages, &in[0].swapped);
+  images = gfits_table_get_Image (&in[0].ftable, &Nimages, &in[0].scaledValue, &in[0].nativeOrder);
   if (!images) {
     fprintf (stderr, "ERROR: failed to read images\n");