Changeset 38366 for branches/eam_branches/ohana.20150429/src/libfits/table/F_get_column.c

Timestamp:

Jun 4, 2015, 5:42:47 PM (11 years ago)

Author:

eugene

Message:

libfits compressed I/O seems to be generally working

File:

• branches/eam_branches/ohana.20150429/src/libfits/table/F_get_column.c (modified) (8 diffs)

branches/eam_branches/ohana.20150429/src/libfits/table/F_get_column.c

@@ -17 +17 @@
 
 void *gfits_get_bintable_column_data (Header *header, FTable *table, char *label, char *type, off_t *Nrow, int *Ncol) {
+  void *data = gfits_get_bintable_column_data_raw (header, table, label, type, Nrow, Ncol, FALSE);
+  return data;
+}
+
+void *gfits_get_bintable_column_data_raw (Header *header, FTable *table, char *label, char *type, off_t *Nrow, int *Ncol, char nativeOrder) {
 
   off_t Nx, Ny;
@@ -87 +92 @@
     for (i = 0; i < Nval*Ny; i++, Pin+=Nbytes, Pout+=Nbytes) {
 # ifdef BYTE_SWAP
-      SWAP_BYTE;
+      if (!nativeOrder) { SWAP_BYTE; }
 # endif
       *(short *)Pout = *(short *)Pin*Bscale + Bzero;
@@ -95 +100 @@
     for (i = 0; i < Nval*Ny; i++, Pin+=Nbytes, Pout+=Nbytes) {
 # ifdef BYTE_SWAP
-      SWAP_WORD;
+      if (!nativeOrder) { SWAP_WORD; }
 # endif
       *(int *)Pout = *(int *)Pin*Bscale + Bzero;
@@ -104 +109 @@
       for (i = 0; i < Nval*Ny; i++, Pin+=Nbytes, Pout+=Nbytes) {
 # ifdef BYTE_SWAP
-        SWAP_DBLE;
+        if (!nativeOrder) { SWAP_DBLE; }
 # endif
         *(int64_t *)Pout = *(int64_t *)Pin;
@@ -111 +116 @@
       for (i = 0; i < Nval*Ny; i++, Pin+=Nbytes, Pout+=Nbytes) {
 # ifdef BYTE_SWAP
-        SWAP_DBLE;
+        if (!nativeOrder) { SWAP_DBLE; }
 # endif
         *(int64_t *)Pout = *(int64_t *)Pin*Bscale + Bzero;
@@ -120 +125 @@
     for (i = 0; i < Nval*Ny; i++, Pin+=Nbytes, Pout+=Nbytes) {
 # ifdef BYTE_SWAP
-      SWAP_WORD;
+      if (!nativeOrder) { SWAP_WORD; }
 # endif
       *(float *)Pout = *(float *)Pin*Bscale + Bzero;
@@ -128 +133 @@
     for (i = 0; i < Nval*Ny; i++, Pin+=Nbytes, Pout+=Nbytes) {
 # ifdef BYTE_SWAP
-      SWAP_DBLE;
+      if (!nativeOrder) { SWAP_DBLE; }
 # endif
       *(double *)Pout = *(double *)Pin*Bscale + Bzero;
@@ -176 +181 @@
   if (!gfits_get_bintable_column_type_by_N (header, N, type, Nval)) return FALSE;
   return (TRUE);
+}
+
+/***********************/
+int gfits_get_bintable_column_raw (Header *header, FTable *table, char *label, void **data, char nativeOrder) {
+
+  char type[16];
+  off_t Nrow;
+  int Ncol;
+
+  char *array = gfits_get_bintable_column_data_raw (header, table, label, type, &Nrow, &Ncol, nativeOrder);
+  if (array == NULL) return (FALSE);
+
+  *data = array;
+  return TRUE;
 }