Changeset 23197 for branches/cnb_branches/cnb_branch_20090215/psModules/src/camera/pmFPAfileDefine.c

Timestamp:

Mar 5, 2009, 11:13:29 AM (17 years ago)

Author:

beaumont

Message:

Finished ppStack visualization. Unified the way in which visualizations are invoked, plotting windows are closed, etc

Location:

branches/cnb_branches/cnb_branch_20090215

Files:

• . (modified) (1 prop)
• psModules/src/camera/pmFPAfileDefine.c (modified) (3 diffs)

branches/cnb_branches/cnb_branch_20090215/psModules/src/camera/pmFPAfileDefine.c

@@ -21 +21 @@
 #include "pmFPAConstruct.h"
 
-#include "pmConcepts.h"
+#include "pmConceptsCopy.h"
 
 # define FPA_TEST_ASSERT(A){ \
@@ -1024 +1024 @@
         }
 
-        // XXX A TEST: this is a provisional fpa until we read the first header for this pmFPAfile
-        // we are going to replace it when we determine the true file.  blow this away here...
-        psFree (file->fpa);
-        file->fpa = NULL;
+        // XXX A TEST: this is a provisional fpa until we read the first header for this pmFPAfile
+        // we are going to replace it when we determine the true file.  blow this away here...
+        psFree (file->fpa);
+        file->fpa = NULL;
     }
 
@@ -1184 +1184 @@
 
     // inherit the concepts from the src fpa:
-    pmFPACopyConcepts(file->fpa, file->src);
+    pmConceptsCopyFPA(file->fpa, file->src, true, true);
 
     return file;