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

Timestamp:

Mar 24, 2010, 11:22:25 AM (16 years ago)

Author:

eugene

Message:

large update merging in changes for Ohana to support large files

Location:

trunk/Ohana

Files:

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

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

@@ -7 +7 @@
   int i;
 
-  matrix2[0].unsign = matrix1[0].unsign;
-  matrix2[0].bitpix = matrix1[0].bitpix;
-  matrix2[0].size   = matrix1[0].size;
-  matrix2[0].bzero  = matrix1[0].bzero;
-  matrix2[0].bscale = matrix1[0].bscale;
-  matrix2[0].Naxes  = matrix1[0].Naxes;
+  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;
   for (i = 0; i < FT_MAX_NAXES; i++) 
     matrix2[0].Naxis[i] = matrix1[0].Naxis[i];
 
   if (matrix2[0].buffer != NULL) free (matrix2[0].buffer);
-  ALLOCATE (matrix2[0].buffer, char, matrix2[0].size);
+  ALLOCATE (matrix2[0].buffer, char, matrix2[0].datasize);
   
-  memcpy (matrix2[0].buffer, matrix1[0].buffer, matrix2[0].size);
+  memcpy (matrix2[0].buffer, matrix1[0].buffer, matrix2[0].datasize);
 
   return (TRUE);