Changeset 27838 for branches/tap_branches/Ohana/src/libfits/matrix/F_compress_M.c

Timestamp:

May 3, 2010, 8:41:49 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/tap_branches

Files:

• . (modified) (1 prop)
• Ohana (modified) (1 prop)
• Ohana/src/libfits/matrix/F_compress_M.c (modified) (15 diffs)

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

@@ -24 +24 @@
     gfits_delete (header, ZNAME, 1); }
 
+# define MOD_KEYWORD_ALT(ZNAME,NAME,TYPE,IN,OUT) { \
+    if (gfits_scan_alt (header, ZNAME, TYPE, 1, IN)) { \
+      gfits_modify_alt (header, NAME, TYPE, 1, OUT); \
+    } \
+    gfits_delete (header, ZNAME, 1); }
+
 # define MOD_KEYWORD_REQUIRED(ZNAME,NAME,TYPE,IN,OUT) { \
   if (!gfits_scan (header, ZNAME, TYPE, 1, IN)) ESCAPE; \
@@ -31 +37 @@
 int gfits_uncompress_image (Header *header, Matrix *matrix, FTable *ftable) {
 
-  int i, j, status, zimage, zcol, Nzrows, Nout, Nzdata, max_tile_size;
+  off_t Nzdata, Nzrows, zcol;
+  int i, j, status, zimage, Nout, max_tile_size;
   char cmptype[80];
   char zaxis[10], naxis[10], key[10], word[81], exttype[81], checksum[81], datasum[81];
@@ -51 +58 @@
 
   // is ZIMAGE present?
-  status = gfits_scan (ftable->header, "ZIMAGE", "%t", 1, &zimage);
+  status = gfits_scan_alt (ftable->header, "ZIMAGE", "%t", 1, &zimage);
   if (!status || !zimage) ESCAPE;
 
@@ -70 +77 @@
     snprintf (zaxis, 10, "ZNAXIS%d", i + 1);
     snprintf (naxis, 10, "NAXIS%d", i + 1);
-    MOD_KEYWORD_REQUIRED (zaxis,  naxis,  "%d", &header->Naxis[i],  header->Naxis[i]);
+    MOD_KEYWORD_REQUIRED (zaxis,  naxis,  "%lld", (long long *) &header->Naxis[i], (long long) header->Naxis[i]);
   }    
 
@@ -118 +125 @@
   int have_ztension;
 
-  have_zsimple  = gfits_scan (header, "ZSIMPLE", "%t", 1, &zsimple);
+  have_zsimple  = gfits_scan_alt (header, "ZSIMPLE", "%t", 1, &zsimple);
   have_ztension = gfits_scan (header, "ZTENSION", "%s", 1, exttype);
 
@@ -130 +137 @@
     gfits_extended_to_primary (header, header->simple, "Image data");
 
-    MOD_KEYWORD ("ZEXTEND",  "EXTEND",   "%t", &header->extend, header->extend);
-    MOD_KEYWORD ("ZBLOCKED", "BLOCKED",  "%t", &header->extend, header->extend);
+    MOD_KEYWORD_ALT ("ZEXTEND",  "EXTEND",   "%t", &header->extend, header->extend);
+    MOD_KEYWORD_ALT ("ZBLOCKED", "BLOCKED",  "%t", &header->extend, header->extend);
   }
 
@@ -140 +147 @@
     gfits_extended_to_primary (header, header->simple, "Image data");
 
-    MOD_KEYWORD ("ZEXTEND",  "EXTEND",   "%t", &header->extend, header->extend);
-    MOD_KEYWORD ("ZBLOCKED", "BLOCKED",  "%t", &header->extend, header->extend);
+    MOD_KEYWORD_ALT ("ZEXTEND",  "EXTEND",   "%t", &header->extend, header->extend);
+    MOD_KEYWORD_ALT ("ZBLOCKED", "BLOCKED",  "%t", &header->extend, header->extend);
   } 
 
@@ -175 +182 @@
 
   zscale = 1;
-  gfits_scan (header, "ZSCALE", "%lf", 1, &zscale);
+  gfits_scan (header, "ZSCALE", "%f", 1, &zscale);
 
   zblank = 32767;
@@ -184 +191 @@
 
   zzero = 0;
-  gfits_scan (header, "ZZERO", "%lf", 1, &zzero);
+  gfits_scan (header, "ZZERO", "%f", 1, &zzero);
 
   // find the COMPRESSED_DATA column (format should be 1PB, 1PI, 1PJ)
@@ -196 +203 @@
   if (!gfits_varlength_column_define (ftable, &zdef, zcol)) ESCAPE;
   gfits_delete (header, "TFIELDS", 1);
-  snprintf (key, 10, "TTYPE%d", zcol);
+  snprintf (key, 10, "TTYPE%lld", (long long) zcol);
   gfits_delete (header, key, 1);
-  snprintf (key, 10, "TFORM%d", zcol);
+  snprintf (key, 10, "TFORM%lld", (long long) zcol);
   gfits_delete (header, key, 1);
 
@@ -236 +243 @@
   ALLOCATE (out, char, odata_pixsize*max_tile_size);
 
+  off_t row;
+
   // uncompress the data
   Nzrows = ftable->header->Naxis[1];
-  for (i = 0; i < Nzrows; i++) {
+  for (row = 0; row < Nzrows; row++) {
 
     // expected output size for this tile
     Nout = gfits_tile_size (matrix, otile, ztile);
 
-    zdata = gfits_varlength_column_pointer (ftable, &zdef, i, &Nzdata);
+    zdata = gfits_varlength_column_pointer (ftable, &zdef, row, &Nzdata);
     if (!zdata) return (FALSE);
 
@@ -254 +263 @@
 
     // gfits_uncompress_data uncompresses from zdata to the temporary output buffer which must be allocated
+    // XXX the tile must not be > 2GB
     if (!gfits_uncompress_data ((char *)zdata, Nzdata, cmptype, optname, optvalue, Noptions, out, &Nout, odata_pixsize)) return (FALSE);
 
@@ -284 +294 @@
 
 // true sizes of this tile (in pixels)
-int gfits_tile_size (Matrix *matrix, int *otile, int *ztile) {
-
-  int i, Npixels, Ndimen;
+off_t gfits_tile_size (Matrix *matrix, int *otile, int *ztile) {
+
+  off_t i, Npixels, Ndimen;
 
   Npixels = 1;
@@ -470 +480 @@
     has_extension = gfits_scan (header, "XTENSION", "%s", 1, extension);
     has_extname = gfits_scan (header, "EXTNAME", "%s", 1, extname);
-    has_zimage  = gfits_scan (header, "ZIMAGE", "%t", 1, &zimage);
+    has_zimage  = gfits_scan_alt (header, "ZIMAGE", "%t", 1, &zimage);
 
     if (has_extension && !strcmp (extension, "IMAGE")) return (FALSE);
@@ -486 +496 @@
     int ztension, zimage;
 
-    has_zimage   = gfits_scan (header, "ZIMAGE",   "%t", 1, &zimage);
-    has_ztension = gfits_scan (header, "ZTENSION", "%t", 1, &ztension);
+    has_zimage   = gfits_scan_alt (header, "ZIMAGE",   "%t", 1, &zimage);
+    has_ztension = gfits_scan_alt (header, "ZTENSION", "%t", 1, &ztension);
 
     if (has_zimage && zimage) return (TRUE);