Changeset 17916

Timestamp:

Jun 4, 2008, 3:41:57 PM (18 years ago)

Author:

Paul Price

Message:

Need to include camera name.

Location:

trunk

Files:

• ppStack/src/ppStackCamera.c (modified) (1 diff)
• pswarp/src/pswarpDefineSkycell.c (modified) (2 diffs)

trunk/ppStack/src/ppStackCamera.c

@@ -243 +243 @@
 
     // Output image
-    pmFPA *fpa = pmFPAConstruct(config->camera); // FPA to contain the output
+    pmFPA *fpa = pmFPAConstruct(config->camera, config->cameraName); // FPA to contain the output
     if (!fpa) {
         psError(PS_ERR_UNEXPECTED_NULL, false, "Unable to construct an FPA from camera configuration.");

trunk/pswarp/src/pswarpDefineSkycell.c

@@ -80 +80 @@
 
     // build the template fpa, set up the basic view
-    fpa = pmFPAConstruct (skyConfig->camera);
+    fpa = pmFPAConstruct (skyConfig->camera, skyConfig->cameraName);
     if (!fpa) {
         psError(PS_ERR_IO, false, "Failed to construct FPA from %s", realName);
@@ -119 +119 @@
     pmFPAview *view = pmFPAAddSourceFromHeader (fpa, phu, format);
     if (!view) {
-        psError(PS_ERR_IO, false, "Unable to determine source for %s", file->name);
-        psFree(phu);
-        psFree (fpa);
-        psFree (format);
-        return false;
+        psError(PS_ERR_IO, false, "Unable to determine source for %s", file->name);
+        psFree(phu);
+        psFree (fpa);
+        psFree (format);
+        return false;
     }