Changeset 15574 for trunk/ppArith/src

Timestamp:

Nov 9, 2007, 4:38:52 PM (19 years ago)

Author:

Paul Price

Message:

Fixing check on image type.

File:

• trunk/ppArith/src/ppArithArguments.c (modified) (3 diffs)

trunk/ppArith/src/ppArithArguments.c

@@ -93 +93 @@
         goto ERROR;
     }
-    if ((isMask && file1->type != PM_FPA_FILE_MASK) || file1->type != PM_FPA_FILE_IMAGE) {
+    if ((isMask && file1->type != PM_FPA_FILE_MASK) || (!isMask && file1->type != PM_FPA_FILE_IMAGE)) {
         psError(PS_ERR_IO, true, "File rule %s is not of the expected type", inFilerule);
         goto ERROR;
@@ -107 +107 @@
             goto ERROR;
         }
-        if ((isMask && file2->type != PM_FPA_FILE_MASK) || file2->type != PM_FPA_FILE_IMAGE) {
+        if ((isMask && file2->type != PM_FPA_FILE_MASK) || (!isMask && file2->type != PM_FPA_FILE_IMAGE)) {
             psError(PS_ERR_IO, true, "File rule %s is not of the expected type", inFilerule);
             goto ERROR;
@@ -124 +124 @@
         goto ERROR;
     }
-    if ((isMask && output->type != PM_FPA_FILE_MASK) || output->type != PM_FPA_FILE_IMAGE) {
+    if ((isMask && output->type != PM_FPA_FILE_MASK) || (!isMask && output->type != PM_FPA_FILE_IMAGE)) {
         psError(PS_ERR_IO, true, "%s is not of the expected type", outFilerule);
         goto ERROR;