Changeset 28484 for branches/pap/Ohana/src/libfits/matrix/F_compress_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_compress_M.c (modified) (2 diffs)

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

@@ -77 +77 @@
     snprintf (zaxis, 10, "ZNAXIS%d", i + 1);
     snprintf (naxis, 10, "NAXIS%d", i + 1);
-    MOD_KEYWORD_REQUIRED (zaxis,  naxis,  "%lld", (long long *) &header->Naxis[i], (long long) header->Naxis[i]);
+    MOD_KEYWORD_REQUIRED (zaxis,  naxis,  OFF_T_FMT,  &header->Naxis[i],  header->Naxis[i]);
   }    
 
@@ -203 +203 @@
   if (!gfits_varlength_column_define (ftable, &zdef, zcol)) ESCAPE;
   gfits_delete (header, "TFIELDS", 1);
-  snprintf (key, 10, "TTYPE%lld", (long long) zcol);
+  snprintf (key, 10, "TTYPE"OFF_T_FMT,  zcol);
   gfits_delete (header, key, 1);
-  snprintf (key, 10, "TFORM%lld", (long long) zcol);
+  snprintf (key, 10, "TFORM"OFF_T_FMT,  zcol);
   gfits_delete (header, key, 1);