Changeset 28484 for branches/pap/ppStack/src/ppStackCombineFinal.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/ppStackCombineFinal.c (modified) (1 diff)

branches/pap/ppStack/src/ppStackCombineFinal.c

@@ -79 +79 @@
         PS_ARRAY_ADD_SCALAR(job->args, normalise, PS_TYPE_U8);
         if (!psThreadJobAddPending(job)) {
-            psFree(job);
             psFree(reject);
             return false;
         }
-        psFree(job);
     }