Changeset 28484 for branches/pap/Ohana/src/libfits/matrix/F_insert_M.c

Timestamp:

Jun 24, 2010, 2:59:09 PM (16 years ago)

Author:

Paul Price

Message:

Merging trunk in advance of reintegrating into trunk.

Location:

branches/pap

Files:

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

branches/pap/Ohana/src/libfits/matrix/F_insert_M.c

@@ -12 +12 @@
   if ((x + array[0].Naxis[0] > matrix[0].Naxis[0]) ||
       (y + array[0].Naxis[1] > matrix[0].Naxis[1])) {
-    fprintf (stderr, "can't insert 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]);
+    fprintf (stderr, "can't insert array here: ("OFF_T_FMT","OFF_T_FMT") - ("OFF_T_FMT","OFF_T_FMT") vs ("OFF_T_FMT","OFF_T_FMT")\n",
+              x, 
+              y, 
+              x + array[0].Naxis[0], 
+              y + array[0].Naxis[1],
+              matrix[0].Naxis[0], 
+              matrix[0].Naxis[1]);
     return;
   }