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

branches/pap/ppStack/src/ppStackReject.c

@@ -54 +54 @@
         PS_ARRAY_ADD_SCALAR(job->args, i, PS_TYPE_S32);
         if (!psThreadJobAddPending(job)) {
-            psFree(job);
             return false;
         }
-        psFree(job);
     }
     if (!psThreadPoolWait(true)) {
@@ -166 +164 @@
     psFree(options->inspect); options->inspect = NULL;
 
-    if (numRejected >= num) {
-        psError(PPSTACK_ERR_REJECTED, true, "All inputs completely rejected; unable to proceed.");
-        return false;
-    }
-
     if (options->stats) {
         psMetadataAddS32(options->stats, PS_LIST_TAIL, "REJECT_IMAGES", 0,