Changeset 28484 for branches/pap/ppArith/src/ppArithLoop.c

Timestamp:

Jun 24, 2010, 2:59:09 PM (16 years ago)

Author:

Paul Price

Message:

Merging trunk in advance of reintegrating into trunk.

Location:

branches/pap

Files:

• . (modified) (1 prop)
• ppArith/src/ppArithLoop.c (modified) (2 diffs)

branches/pap/ppArith/src/ppArithLoop.c

@@ -62 +62 @@
     }
     psFree(iter);
+
+    float const2 = psMetadataLookupF32(&mdok, config->arguments, "PPARITH.CONST");
 
     pmFPAview *view = pmFPAviewAlloc(0); // Pointer into FPA hierarchy
@@ -138 +140 @@
 
                 // Perform the analysis
-                if (!ppArithReadout(outRO, inRO1, inRO2, config, view)) {
+                if (!ppArithReadout(outRO, inRO1, inRO2, const2, config, view)) {
                     psError(PS_ERR_UNKNOWN, false, "Unable to perform arithmetic.\n");
                     return false;