Changeset 38441 for trunk/Ohana/src/libfits/table/F_copy_T.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/libfits/table/F_copy_T.c (modified) (2 diffs)

trunk/Ohana/src/libfits/table/F_copy_T.c

@@ -6 +6 @@
 
   /* find buffer size */
-  out[0].validsize = in[0].validsize;
-  out[0].datasize  = in[0].datasize;
+  out[0].validsize  = in[0].validsize;
+  out[0].datasize   = in[0].datasize;
+  out[0].heap_start = in[0].heap_start;
 
   ALLOCATE (out[0].buffer, char, out[0].datasize);
   memcpy (out[0].buffer, in[0].buffer, out[0].datasize);
+  return (TRUE);
+}       
+
+/*********************** copy ftable pointers (does not copy memory) ***********************************/
+int gfits_copy_ftable_ptr (FTable *in, FTable *out) {
+
+  if (!in)  return FALSE;
+  if (!out) return FALSE;
+
+  /* find buffer size */
+  out[0].validsize  = in[0].validsize;
+  out[0].datasize   = in[0].datasize;
+  out[0].heap_start = in[0].heap_start;
+  out[0].header     = in[0].header;
+  out[0].buffer     = in[0].buffer;
   return (TRUE);
 }       
@@ -28 +44 @@
 
   /* find buffer size */
-  out[0].datasize = in[0].datasize;
-  out[0].pad      = in[0].pad;
-  out[0].Nrow     = in[0].Nrow;
+  out[0].datasize   = in[0].datasize;
+  // out[0].heap_start = in[0].heap_start;
+  out[0].pad        = in[0].pad;
+  out[0].Nrow       = in[0].Nrow;
 
   off_t Nrows = out[0].Nrow;