Changeset 31663 for trunk/Ohana/src/libfits/matrix/F_copy_M.c

Timestamp:

Jun 22, 2011, 12:33:45 AM (15 years ago)

Author:

eugene

Message:

merged from eam_branches/ipp-20110505: allow managed memory (with linked list a la psLib); add csv to mana; allow read-only dvo databases

File:

• trunk/Ohana/src/libfits/matrix/F_copy_M.c (modified) (1 diff)

trunk/Ohana/src/libfits/matrix/F_copy_M.c

@@ -3 +3 @@
 
 /*********************** fits copy header ***********************************/
-int gfits_copy_matrix (Matrix *matrix1, Matrix *matrix2) {
+int gfits_copy_matrix (Matrix *in, Matrix *out) {
 
   int i;
 
-  matrix2[0].unsign   = matrix1[0].unsign;
-  matrix2[0].bitpix   = matrix1[0].bitpix;
-  matrix2[0].datasize = matrix1[0].datasize;
-  matrix2[0].bzero    = matrix1[0].bzero;
-  matrix2[0].bscale   = matrix1[0].bscale;
-  matrix2[0].Naxes    = matrix1[0].Naxes;
+  out[0].unsign   = in[0].unsign;
+  out[0].bitpix   = in[0].bitpix;
+  out[0].datasize = in[0].datasize;
+  out[0].bzero    = in[0].bzero;
+  out[0].bscale   = in[0].bscale;
+  out[0].Naxes    = in[0].Naxes;
   for (i = 0; i < FT_MAX_NAXES; i++) 
-    matrix2[0].Naxis[i] = matrix1[0].Naxis[i];
+    out[0].Naxis[i] = in[0].Naxis[i];
 
-  if (matrix2[0].buffer != NULL) free (matrix2[0].buffer);
-  ALLOCATE (matrix2[0].buffer, char, matrix2[0].datasize);
+  if (out[0].buffer != NULL) free (out[0].buffer);
+  ALLOCATE (out[0].buffer, char, out[0].datasize);
   
-  memcpy (matrix2[0].buffer, matrix1[0].buffer, matrix2[0].datasize);
+  memcpy (out[0].buffer, in[0].buffer, out[0].datasize);
 
   return (TRUE);