Changeset 38441 for trunk/Ohana/src/libdvo/src/dvo_image.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/dvo_image.c (modified) (6 diffs)

trunk/Ohana/src/libdvo/src/dvo_image.c

@@ -19 +19 @@
   db[0].lockstate = lockstate;
   db[0].timeout   = timeout;
-  gfits_db_init (db);
 
   if (!gfits_db_lock (db, filename)) {
@@ -89 +88 @@
   // so when we later do a gfits_copy_ftable, we stomp on bad memory
   FtableToImage (&db[0].ftable, &db[0].theader, &db[0].format);
-  db[0].swapped = TRUE;  /* table has internal byte-order */
+  db[0].nativeOrder = TRUE;  /* table has internal byte-order */
+  db[0].scaledValue = TRUE;  /* table has internal byte-order */
   return (TRUE);
 }
@@ -100 +100 @@
   /* convert from internal to requested external format */
   ImageToFtable (&db[0].ftable, &db[0].theader, db[0].format);
-  db[0].swapped = FALSE;
+  db[0].nativeOrder = FALSE;
+  db[0].scaledValue = FALSE;
 
   /* write data in appropriate mode */
@@ -149 +150 @@
   /* theader is modified to match output format */
   ImageToVtable (&db[0].vtable, &db[0].theader, db[0].format);
-  db[0].swapped = FALSE;
+  db[0].scaledValue = FALSE;
+  db[0].nativeOrder = FALSE;
 
   /* write data in appropriate mode */
@@ -363 +365 @@
 
 /* return internal structure representation */
-Image *gfits_table_get_Image (FTable *ftable, off_t *Ndata, char *swapped) {
+Image *gfits_table_get_Image (FTable *ftable, off_t *Ndata, char *scaledValue, char *nativeOrder) {
 
   int Ncols;
@@ -377 +379 @@
   data = (Image *) ftable[0].buffer;
 
-  if (!swapped) {
-    myAbort ("invalid to call this without suppying 'swapped'");
-  }
-  if (*swapped == FALSE) {
-    myAbort ("invalid for table to be swapped");
+  if (!scaledValue) {
+    myAbort ("invalid to call this without suppying 'scaledValue'");
+  }
+  if (*scaledValue == FALSE) {
+    myAbort ("invalid for table NOT to be scaledValue");
+  }
+  if (!nativeOrder) {
+    myAbort ("invalid to call this without suppying 'nativeOrder'");
+  }
+  if (*nativeOrder == FALSE) {
+    myAbort ("invalid for table NOT to be nativeOrder");
   }