Changeset 38344 for branches/eam_branches/ohana.20150429/src/libautocode/def/autocode.c

Timestamp:

Jun 1, 2015, 8:56:11 AM (11 years ago)

Author:

eugene

Message:

extending gfits_table_get_ APIs to allow separate scaling from swapping, in prep of using compression on tables

File:

• branches/eam_branches/ohana.20150429/src/libautocode/def/autocode.c (modified) (2 diffs)

branches/eam_branches/ohana.20150429/src/libautocode/def/autocode.c

@@ -27 +27 @@
 /*** add test of EXTNAME and header-defined columns? ***/
 /* return internal structure representation */
-$STRUCT *gfits_table_get_$STRUCT (FTable *ftable, off_t *Ndata, char *swapped) {
+/* scaledData & nativeBytes describe the current state of the ftable.buffer */
+$STRUCT *gfits_table_get_$STRUCT (FTable *ftable, off_t *Ndata, char *scaledValue, char *nativeOrder) {
 
   int Ncols;
@@ -40 +41 @@
   *Ndata = ftable[0].header[0].Naxis[1];
   data = ($STRUCT *) ftable[0].buffer;
-  if ((swapped == NULL) || (*swapped == FALSE)) {
+
+  // if the pointer is not passed, we need to swap
+  if (!nativeOrder || !*nativeOrder) {
     if (!gfits_convert_$STRUCT (data, sizeof ($STRUCT), *Ndata)) {
       return NULL;
     }
+    if (nativeOrder) *nativeOrder = TRUE;
+  }
+  // if the pointer is not passed, we need to scale
+  if (!scaledValue || !*scaledValue) {
     gfits_table_scale_data (ftable);
-    if (swapped != NULL) *swapped = TRUE;
+    if (scaledValue) *scaledValue = TRUE;
   }
   return (data);