Changeset 13833 for trunk/psModules/src/config/pmConfig.c

Timestamp:

Jun 14, 2007, 10:56:57 AM (19 years ago)

Author:

Paul Price

Message:

Wasn't creating DARK.NORM calibration for all cameras.
Fixing problem when adding dummy entry (psPolynomial1DAlloc arguments round the wrong way again....).

File:

• trunk/psModules/src/config/pmConfig.c (modified) (4 diffs)

trunk/psModules/src/config/pmConfig.c

@@ -4 +4 @@
  *  @author EAM (IfA)
  *
- *  @version $Revision: 1.96 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-06-14 02:03:29 $
+ *  @version $Revision: 1.97 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-06-14 20:56:57 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -324 +324 @@
     } else {
         // Add a dummy entry
-        psPolynomial1D *poly = psPolynomial1DAlloc(1, PS_POLYNOMIAL_ORD); // Dummy polynomial
+        psPolynomial1D *poly = psPolynomial1DAlloc(PS_POLYNOMIAL_ORD, 1); // Dummy polynomial
         poly->coeff[0] = 0.0;
         poly->coeff[1] = 1.0;
@@ -620 +620 @@
         }
 
-        // Now fill in the formats
+        // Now fill in the formats and calibrations
         psMetadataIterator *iter = psMetadataIteratorAlloc(cameras, PS_LIST_HEAD, NULL); // Iterator
         psMetadataItem *item;           // Item from iteration
@@ -627 +627 @@
             if (!cameraReadFormats(item->data.md, item->name)) {
                 psWarning("Unable to read formats for camera %s: removed.\n", item->name);
+                psMetadataRemoveKey(cameras, item->name);
+            }
+            if (!cameraReadCalibrations(item->data.md, item->name)) {
+                psWarning("Unable to read calibrations for camera %s: removed.\n", item->name);
                 psMetadataRemoveKey(cameras, item->name);
             }