Changeset 25027 for branches/pap/ppSim/src/ppSimMergeReadouts.c

Timestamp:

Aug 7, 2009, 4:08:25 PM (17 years ago)

Author:

Paul Price

Message:

Merging trunk (r25026) to get up-to-date on old branch.

Location:

branches/pap

Files:

• . (modified) (1 prop)
• ppSim/src/ppSimMergeReadouts.c (modified) (1 diff)

branches/pap/ppSim/src/ppSimMergeReadouts.c

@@ -15 +15 @@
 
     if (!inReadout->variance) {
-      if (!pmReadoutGenerateVariance(inReadout, true)) {
+        if (!pmReadoutGenerateVariance(inReadout, NULL, true)) {
         psError (PS_ERR_UNKNOWN, false, "trouble creating variance");
         return false;