Changeset 18967 for trunk/ppMerge/src/ppMergeCamera.c

Timestamp:

Aug 8, 2008, 8:17:12 AM (18 years ago)

Author:

Paul Price

Message:

Fixing following changes to psThread.

File:

• trunk/ppMerge/src/ppMergeCamera.c (modified) (5 diffs)

trunk/ppMerge/src/ppMergeCamera.c

@@ -31 +31 @@
             if (! pmFPASelectChip(fpa, chipNum, false)) {
                 psError(PS_ERR_IO, false, "Chip number %d doesn't exist in camera.\n", chipNum);
-                psFree (chips);
+                psFree (chips);
                 return false;
             }
@@ -43 +43 @@
     psArray *cells = psStringSplitArray (cellLine, ",", false);
     if (cells->n > 0) {
-        for (int i = 0; i < fpa->chips->n; i++) {
-            pmChip *chip = fpa->chips->data[i];
-            pmChipSelectCell (chip, -1, true); // deselect all cells
-            for (int j = 0; j < cells->n; j++) {
-                int cellNum = atoi(cells->data[j]);
-                if (! pmChipSelectCell(chip, cellNum, false)) {
-                    psError(PS_ERR_IO, false, "Cell number %d doesn't exist in camera.\n", cellNum);
-                    psFree (cells);
-                    return false;
-                }
-            }
-        }
+        for (int i = 0; i < fpa->chips->n; i++) {
+            pmChip *chip = fpa->chips->data[i];
+            pmChipSelectCell (chip, -1, true); // deselect all cells
+            for (int j = 0; j < cells->n; j++) {
+                int cellNum = atoi(cells->data[j]);
+                if (! pmChipSelectCell(chip, cellNum, false)) {
+                    psError(PS_ERR_IO, false, "Cell number %d doesn't exist in camera.\n", cellNum);
+                    psFree (cells);
+                    return false;
+                }
+            }
+        }
     }
     psFree (cells);
@@ -259 +259 @@
                     cell->file_exists = false;
                     culled++;
-                    if (cell->concepts) {
-                        psFree(cell->concepts);
-                        cell->concepts = NULL;
-                    }
+                    if (cell->concepts) {
+                        psFree(cell->concepts);
+                        cell->concepts = NULL;
+                    }
                 }
             }
@@ -268 +268 @@
                 chip->data_exists = false;
                 chip->file_exists = false;
-                if (chip->concepts) {
-                    psFree(chip->concepts);
-                    chip->concepts = NULL;
-                }
+                if (chip->concepts) {
+                    psFree(chip->concepts);
+                    chip->concepts = NULL;
+                }
             }
         }
@@ -298 +298 @@
     }
 
-    // Output image
-    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.");
-        psFree(phuView);
-        return false;
-    }
-
     psString outName = ppMergeOutputFile(config); // Name of output file