Changeset 27075 for trunk/ppStack/src/ppStackCamera.c

Timestamp:

Feb 25, 2010, 10:58:13 AM (16 years ago)

Author:

Paul Price

Message:

Ensure files are closed when exiting with an error. Moved target PSF to its own file so that it can be closed independently of the images (they share data_exists, which need to have multiple states if they're on the same file).

File:

• trunk/ppStack/src/ppStackCamera.c (modified) (1 diff)

trunk/ppStack/src/ppStackCamera.c

@@ -284 +284 @@
 
     if (havePSFs) {
-        pmFPAfile *targetPSF = pmFPAfileDefineOutput(config, output->fpa, "PPSTACK.TARGET.PSF");
+        pmFPA *psfFPA = pmFPAConstruct(config->camera, config->cameraName); // FPA to contain PSF
+        if (!psfFPA) {
+            psError(psErrorCodeLast(), false, "Unable to construct an FPA from camera configuration.");
+            return false;
+        }
+        pmFPAfile *targetPSF = pmFPAfileDefineOutput(config, psfFPA, "PPSTACK.TARGET.PSF");
         if (!targetPSF) {
             psError(psErrorCodeLast(), false, _("Unable to generate output file from PPSTACK.TARGET.PSF"));
             return false;
         }
+        psFree(psfFPA);
         if (targetPSF->type != PM_FPA_FILE_PSF) {
             psError(PPSTACK_ERR_CONFIG, true, "PPSTACK.TARGET.PSF is not of type PSF");