Changeset 27435 for trunk/Ohana/src/libfits/matrix/F_add_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_add_M.c (modified) (2 diffs)

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

@@ -3 +3 @@
 
 /*********************** fits insert array ***********************************/
-void gfits_add_matrix (matrix, array, x, y) 
-Matrix *matrix, *array; 
-int x, y;
+void gfits_add_matrix (Matrix *matrix, Matrix *array, off_t x, off_t y) 
 {
 
@@ -15 +13 @@
   if ((x + array[0].Naxis[0] > matrix[0].Naxis[0]) ||
       (y + array[0].Naxis[1] > matrix[0].Naxis[1])) {
-    fprintf (stderr, "can't add array here: (%d,%d) - (%d,%d) vs (%d,%d)\n",
-             x, y, x + array[0].Naxis[0], y + array[0].Naxis[1],
-             matrix[0].Naxis[0], matrix[0].Naxis[1]);
+    fprintf (stderr, "can't add array here: (%lld,%lld) - (%lld,%lld) vs (%lld,%lld)\n",
+             (long long) x, 
+             (long long) y, 
+             (long long) x + array[0].Naxis[0], 
+             (long long) y + array[0].Naxis[1],
+             (long long) matrix[0].Naxis[0], 
+             (long long) matrix[0].Naxis[1]);
     return;
   }