Changeset 16481 for trunk/psModules/src/camera/pmFPAfileDefine.c

Timestamp:

Feb 14, 2008, 4:26:09 PM (18 years ago)

Author:

Paul Price

Message:

Gene needs the concepts copied over in pmFPAfileDefineChipMosaic, so to avoid the error due to differing number of cells, I've made new functions that provide optional recursion.

File:

• trunk/psModules/src/camera/pmFPAfileDefine.c (modified) (2 diffs)

trunk/psModules/src/camera/pmFPAfileDefine.c

@@ -1200 +1200 @@
 
     file->src = psMemIncrRefCounter(src); // inherit output elements from this source pmFPA
+    if (src) {
+        if (!pmConceptsCopyFPA(file->fpa, src, true, false)) {
+            psError(PS_ERR_UNKNOWN, false, "Unable to copy concepts from source to new FPA");
+            psFree(file);
+            return NULL;
+        }
+    }
 
     file->mosaicLevel = PM_FPA_LEVEL_CHIP; // don't do any I/O on this at a lower level
@@ -1245 +1252 @@
 
     file->src = psMemIncrRefCounter(src); // inherit output elements from this source pmFPA
+    if (src) {
+        if (!pmConceptsCopyFPA(file->fpa, src, false, false)) {
+            psError(PS_ERR_UNKNOWN, false, "Unable to copy concepts from source to new FPA");
+            psFree(file);
+            return NULL;
+        }
+    }
 
     file->mosaicLevel = PM_FPA_LEVEL_FPA; // don't do any I/O on this at a lower level