Changeset 16163

Timestamp:

Jan 18, 2008, 5:34:44 PM (18 years ago)

Author:

Paul Price

Message:

Only attempt to read HCOMPRESS parameters if required. Put free in correct place.

File:

• branches/pap_branch_080117/psModules/src/camera/pmFPAfileDefine.c (modified) (1 diff)

branches/pap_branch_080117/psModules/src/camera/pmFPAfileDefine.c

@@ -316 +316 @@
             tile->data.S32[2] = parseOptionInt(scheme, "TILE.Z", source, 1); // Tiling in z
             int noise = parseOptionInt(scheme, "NOISE", source, 16); // Noise bits
-            int hscale = parseOptionInt(scheme, "HSCALE", source, 0); // Scaling for HCOMPRESS
-            int hsmooth = parseOptionInt(scheme, "HSMOOTH", source, 0); // Smoothing for HCOMPRESS
-            psFree(source);
+            int hscale = 0, hsmooth = 0;// Scaling and smoothing for HCOMPRESS
+            if (type == PS_FITS_COMPRESS_HCOMPRESS) {
+                hscale = parseOptionInt(scheme, "HSCALE", source, 0);
+                hsmooth = parseOptionInt(scheme, "HSMOOTH", source, 0);
+            }
 
             file->compression = psFitsCompressionAlloc(type, tile, noise, hscale, hsmooth);
             psFree(tile);
         }
+
+        psFree(source);
     }
  FITS_OPTIONS_DONE: