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

branches/pap/ppArith/src/ppArithArguments.c

@@ -51 +51 @@
                         )
 {
-    psString value = psMetadataLookupStr(NULL, arguments, argName); // Value of interest 
+    psString value = psMetadataLookupStr(NULL, arguments, argName); // Value of interest
     if (value && strlen(value) > 0) {
         return psMetadataAddStr(target, PS_LIST_TAIL, mdName, 0, NULL, value);
@@ -82 +82 @@
     psMetadataAddStr(arguments, PS_LIST_TAIL, "-op", 0, "Operation to perform", NULL);
     psMetadataAddStr(arguments, PS_LIST_TAIL, "-file2", 0, "Second image", NULL);
+    psMetadataAddF32(arguments, PS_LIST_TAIL, "-const2", 0, "Constant", NAN);
     psMetadataAddBool(arguments, PS_LIST_TAIL, "-mask", 0, "Treat images as masks", false);
     psMetadataAddStr(arguments, PS_LIST_TAIL, "-stats", 0, "Statistics file", NULL);
@@ -98 +99 @@
                      "File rule for output", outFilerule);
 
-    bool status = false;                // Status for file definition 
+    bool status = false;                // Status for file definition
 
     // First file
@@ -135 +136 @@
         }
     }
+    float const2 = psMetadataLookupF32(NULL, arguments, "-const2"); // Constant to apply
+    if (!isnan(const2)) {
+        if (name2) {
+            psError(PS_ERR_BAD_PARAMETER_VALUE, true, "Cannot specify both -file2 and -const2");
+            goto ERROR;
+        }
+        psMetadataAddF32(config->arguments, PS_LIST_TAIL, "PPARITH.CONST", 0, "Constant to apply", const2);
+    }
 
     // Output image