Changeset 15649

Timestamp:

Nov 18, 2007, 11:58:15 PM (18 years ago)

Author:

eugene

Message:

working on compression

Location:

trunk/Ohana/src/libfits/matrix

Files:

• F_compress_M.c (modified) (3 diffs)
• F_uncompress_data.c (modified) (1 diff)

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

@@ -103 +103 @@
   // XXX is Noptions set to the correct value?
   // XXX get ZMASKCMP 
-
   int zsimple, have_zsimple;
   int have_ztension;
@@ -183 +182 @@
       // put the byte-swapping in gifts_varlength_column_pointer, but this is fairly weak.
 
+      // XXX inconsistency between data element size between compressed data, uncompressed data, 
+      // and output pixel data.....
+
       case 'B': {
         char *zdata;
@@ -254 +256 @@
   int *Ztile = NULL;
 
+  ALLOCATE (counter, int, matrix->Naxes);
+  ALLOCATE (Ztile, int, matrix->Naxes);
+
   // counter for current row in tile to copy
-  ALLOCATE (counter, int, matrix->Naxes);
-  memset (counter, 0, matrix->Naxes*sizeof(int));
-
   // true sizes of this tile (in pixels)
-  ALLOCATE (Ztile, int, matrix->Naxes);
   for (i = 0; i < matrix->Naxes; i++) {
+    counter[i] = 0;
     Ztile[i] = MIN ((matrix->Naxis[i] - otile[i]*ztile[i]), ztile[i]);
   }

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

@@ -53 +53 @@
 
     int Npix;
-    Npix = *Nout * (out_pixsize / 4.0);
+    // Npix = *Nout * (out_pixsize / 4.0);
+    Npix = *Nout;
 
     Ninsum += Nzdata;