Changeset 24769 for trunk/psModules/src/camera/pmHDUGenerate.c

Timestamp:

Jul 12, 2009, 12:52:36 PM (17 years ago)

Author:

eugene

Message:

warn on missing data for HDU, but do not raise an error (OK for mask and variance); generateHDU does not own cells -- free after exit in calling function

File:

• trunk/psModules/src/camera/pmHDUGenerate.c (modified) (4 diffs)

trunk/psModules/src/camera/pmHDUGenerate.c

@@ -390 +390 @@
     if (numReadouts == 0 || (imageType == 0 && maskType == 0 && varianceType == 0)) {
         // Nothing from which to create an HDU
-        psFree(cells);
-        psError(PS_ERR_IO, true, "Nothing from which to create an HDU\n");
-        return false;
+        // psError(PS_ERR_IO, true, "Nothing from which to create an HDU\n");
+        psWarning("Nothing from which to create an HDU, must be empty\n");
+        return true;
     }
 
@@ -504 +504 @@
         psFree(iter);
     }
-    psFree(cells);
-
     return true;
 }
@@ -615 +613 @@
                 return true;
             }
-
-            return generateHDU(hdu, cells);
+            bool status = generateHDU(hdu, cells);
+            psFree (cells);
+            return status;
         }
     case PM_FPA_LEVEL_CHIP:
@@ -664 +663 @@
             }
 
-            return generateHDU(hdu, cells);
+            bool status = generateHDU(hdu, cells);
+            psFree (cells);
+            return status;
         }
     case PM_FPA_LEVEL_FPA: