Changeset 26989

Timestamp:

Feb 18, 2010, 12:37:08 PM (16 years ago)

Author:

Paul Price

Message:

Require min_num to be specified and >= 2. We can't make a stack with 1 input image, and the number of inputs is sufficiently important to force the user to think.

File:

• trunk/ippTools/src/stacktool.c (modified) (3 diffs)

trunk/ippTools/src/stacktool.c

@@ -158 +158 @@
     // these are used to build the HAVING restriction
     PXOPT_COPY_S32(config->args, having, "-min_num", "num_warp", ">=");
+    PXOPT_LOOKUP_S32(min_num,     config->args, "-min_new",  false, false);
+    if (min_num < 2) {
+        psError(PXTOOLS_ERR_CONFIG, true, "Require at least two inputs for a stack, but min_num = %d",
+                min_num);
+        psFree(where);
+        psFree(having);
+        return false;
+    }
 
     // other options applied outside of the WHERE
@@ -168 +176 @@
 
     if (!psListLength(where->list)) {
+        psError(PXTOOLS_ERR_CONFIG, false, "search parameters are required");
         psFree(where);
-        psError(PXTOOLS_ERR_CONFIG, false, "search parameters are required");
+        psFree(having);
         return false;
     }
@@ -176 +185 @@
     if (!select) {
         psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement");
+        psFree(where);
+        psFree(having);
         return false;
     }