Changeset 20652 for trunk/Ohana/src/libfits/matrix/F_compress_M.c

Timestamp:

Nov 10, 2008, 2:17:14 PM (18 years ago)

Author:

eugene

Message:

ippScripts/scripts/camera_exp.pl

File:

• trunk/Ohana/src/libfits/matrix/F_compress_M.c (modified) (5 diffs)

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

@@ -34 +34 @@
   char cmptype[80];
   char zaxis[10], naxis[10], key[10], word[81], exttype[81], checksum[81], datasum[81];
-  int Noptions, NOPTIONS;
+  int Noptions, NOPTIONS, zblank, oblank;
   VarLengthColumn zdef;
   float zscale, zzero;
@@ -177 +177 @@
   gfits_scan (header, "ZSCALE", "%lf", 1, &zscale);
 
+  zblank = 32767;
+  gfits_scan (header, "ZBLANK", "%d", 1, &zblank);
+
+  oblank = 32767;
+  gfits_scan (header, "BLANK", "%d", 1, &oblank);
+
   zzero = 0;
   gfits_scan (header, "ZZERO", "%lf", 1, &zzero);
@@ -248 +254 @@
 
     // copy the uncompressed pixels into their correct locations            
-    if (!gfits_distribute_data (matrix, odata_pixsize, out, Nout, otile, ztile, zscale, zzero)) return (FALSE);
+    if (!gfits_distribute_data (matrix, odata_pixsize, out, Nout, otile, oblank, ztile, zblank, zscale, zzero)) return (FALSE);
 
     // update the tile counters, carrying to the next dimension if needed
@@ -289 +295 @@
 
 // bitpix is the input data size/type
-int gfits_distribute_data (Matrix *matrix, int bitpix, char *data, int Ndata, int *otile, int *ztile, float zscale, float zzero) {
+int gfits_distribute_data (Matrix *matrix, int bitpix, char *data, int Ndata, int *otile, int oblank, int *ztile, int zblank, float zscale, float zzero) {
 
   int i, j, start, offset, coord, Nline;
@@ -331 +337 @@
     TYPE *Optr = (TYPE *) &matrix->buffer[SIZE*(offset + start)]; \
     for (j = 0; j < Ztile[0]; j++, Iptr++, Optr++) { \
-      *Optr = *Iptr * zscale + zzero; \
-    } }
+      if (*Iptr == zblank) { \
+          *Optr = oblank;    \
+      } else { \
+          *Optr = *Iptr * zscale + zzero;       \
+      } } }
 
   // this macro sets up the outer switch and calls above macro with all output bitpix options