Changeset 28484 for branches/pap/psModules/src/imcombine/pmSubtractionMatch.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)
• psModules (modified) (1 prop)
• psModules/src/imcombine/pmSubtractionMatch.c (modified) (1 diff)

branches/pap/psModules/src/imcombine/pmSubtractionMatch.c

@@ -1060 +1060 @@
             PS_ARRAY_ADD_SCALAR(job->args, bg2, PS_TYPE_F32);
             if (!psThreadJobAddPending(job)) {
-                psFree(job);
                 return false;
             }
-            psFree(job);
         } else {
             if (!pmSubtractionOrderStamp(ratios, mask, stamps, models, modelSums, i, bg1, bg2)) {