Changeset 28484 for branches/pap/ppArith/src/ppArithReadout.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/ppArithReadout.c (modified) (2 diffs)

branches/pap/ppArith/src/ppArithReadout.c

@@ -21 +21 @@
 #include "ppArith.h"
 
-bool ppArithReadout(pmReadout *output, const pmReadout *input1, const pmReadout *input2,
+bool ppArithReadout(pmReadout *output, const pmReadout *input1, const pmReadout *input2, float const2,
                     const pmConfig *config, const pmFPAview *view)
 {
@@ -77 +77 @@
     if (input2) {
         psBinaryOp(outImage, inImage1, op, inImage2);
+    }  else if (!isnan(const2)) {
+        psBinaryOp(outImage, inImage1, op, psScalarAlloc(const2, inImage1->type.type));
     } else {
         psUnaryOp(outImage, inImage1, op);