Changeset 29537 for trunk/Ohana/src/libautocode/def/autocode.c

Timestamp:

Oct 25, 2010, 12:36:40 PM (16 years ago)

Author:

eugene

Message:

merge changes from eam_branches/ipp-20100823

File:

• trunk/Ohana/src/libautocode/def/autocode.c (modified) (3 diffs)

trunk/Ohana/src/libautocode/def/autocode.c

@@ -25 +25 @@
 } 
 
-$STRUCT *gfits_downsize_and_convert_$STRUCT ($STRUCT *data, off_t size, off_t nitems) {
-
-  off_t i;
-  unsigned char *byte, tmp;
-  $STRUCT *output;
-
-  if ($SIZE > size) { 
-    fprintf (stderr, "ERROR: uncorrectable mismatch in data types $STRUCT: "OFF_T_FMT" vs %d\n",  size,  $SIZE);
-    exit (1);
-  }
-
-  // allocate a new array 
-  ALLOCATE (output, $STRUCT, nitems);
-  for (i = 0; i < nitems; i++) {
-    memcpy (&output[i], &data[i], $SIZE);
-  }
-
-  /* provide initial values to avoid compiler warnings for non-BYTE_SWAP arch */
-  i = tmp = 0;
-  byte = NULL;
-
-# ifdef BYTE_SWAP
-  byte = (unsigned char *) output;
-  for (i = 0; i < nitems; i++, byte += size) {
-    /** BYTE SWAP **/
-  }
-# endif  
-
-  return (output);
-} 
-
 /*** add test of EXTNAME and header-defined columns? ***/
 /* return internal structure representation */
@@ -61 +30 @@
 
   int Ncols;
-  $STRUCT *data, *output;
+  $STRUCT *data;
 
   Ncols = ftable[0].header[0].Naxis[0];
@@ -73 +42 @@
   if ((swapped == NULL) || (*swapped == FALSE)) {
     if (!gfits_convert_$STRUCT (data, sizeof ($STRUCT), *Ndata)) {
-      output = gfits_downsize_and_convert_$STRUCT (data, sizeof ($STRUCT), *Ndata);
-      free (ftable[0].buffer);
-      ftable[0].buffer = (char *) output;
-      // XXX do I need to change NX?
+      return NULL;
     }
     gfits_table_scale_data (ftable);