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

Timestamp:

Feb 26, 2009, 2:45:31 PM (17 years ago)

Author:

Paul Price

Message:

Reorganised the concepts files, moving the Write functions into pmConceptsWrite, and the Read functions into pmConceptsRead, which sort of makes sense. Added new type of concept property: copy. Most concepts use the default copy method (which is to simply copy the item), but for the TIMESYS concepts, we want to ensure that the target is of the correct type --- if it's already set (e.g., via the DEFAULTS), then we don't copy it. This will allow us to set the target TIMESYS using the DEFAULTS in the camera format, and have the output time be adjusted appropriately. Without this, the TIMESYS is simply copied, and specifying the TIMESYS in the DEFAULTS results in a warning ('values don't match'). Removed pmFPACopyConcepts, since it is pretty much the same as pmConceptsCopyFPA.

File:

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

trunk/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;