Changeset 16913

Timestamp:

Mar 10, 2008, 3:29:20 PM (18 years ago)

Author:

Paul Price

Message:

Using new function.

Location:

trunk

Files:

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

trunk/ppStack/src/ppStackCamera.c

@@ -252 +252 @@
     output->save = true;
 
-    // Generate the correct structure
-    pmFPALevel phuLevel = pmFPAPHULevel(output->format); // Level at which PHU goes
-    pmFPAview *view = pmFPAviewAlloc(0);// View for current level
-    if (phuLevel == PM_FPA_LEVEL_FPA) {
-        if (!pmFPAAddSourceFromView(fpa, "Stack", view, output->format)) {
-            psError(PS_ERR_UNKNOWN, false, "Unable to add PHU to FPA.");
-            psFree(fpa);
-            psFree(view);
-            return NULL;
-        }
-    } else {
-        pmChip *chip;                       // Chip from FPA
-        while ((chip = pmFPAviewNextChip(view, fpa, 1))) {
-            if (phuLevel == PM_FPA_LEVEL_CHIP) {
-                if (!pmFPAAddSourceFromView(fpa, "Stack", view, output->format)) {
-                    psError(PS_ERR_UNKNOWN, false, "Unable to add PHU to FPA.");
-                    psFree(fpa);
-                    psFree(view);
-                    return NULL;
-                }
-            } else {
-                pmCell *cell;                   // Cell from chip
-                while ((cell = pmFPAviewNextCell(view, fpa, 1))) {
-                    if (phuLevel == PM_FPA_LEVEL_CELL) {
-                        if (!pmFPAAddSourceFromView(fpa, "Stack", view, output->format)) {
-                            psError(PS_ERR_UNKNOWN, false, "Unable to add PHU to FPA.");
-                            psFree(fpa);
-                            psFree(view);
-                            return NULL;
-                        }
-                    }
-                }
-            }
-        }
-    }
-    psFree(view);
+    if (!pmFPAAddSourceFromFormat(fpa, "Stack", output->format)) {
+        psError(PS_ERR_UNKNOWN, false, "Unable to generate output FPA.");
+        psFree(fpa);
+        return false;
+    }
 
     // Output mask

trunk/ppSub/src/ppSubCamera.c

@@ -119 +119 @@
     }
 
-    pmFPAview *view = pmFPAviewAlloc(0);// View to PHU
-    const char *name = psMetadataLookupStr(NULL, input->fpa->concepts, "FPA.NAME");
-    if (!pmFPAAddSourceFromView(output->fpa, name, view, output->format)) {
-        psError(PS_ERR_UNKNOWN, false, "Unable to add PHU to output.");
+    if (!pmFPAAddSourceFromFormat(output->fpa, name, output->format)) {
+        psError(PS_ERR_UNKNOWN, false, "Unable to generate output FPA.");
         psFree(view);
         return false;
     }
-    psFree(view);
 
     pmFPAfile *sources = pmFPAfileDefineFromArgs(&status, config, "PPSUB.SOURCES", "PPSUB.SOURCES");