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

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

@@ -289 +289 @@
                     PS_ARRAY_ADD_SCALAR(args, poorFrac, PS_TYPE_F32);
                     if (!psThreadJobAddPending(job)) {
-                        psFree(job);
                         psFree(source);
                         psFree(target);
                         return NULL;
                     }
-                    psFree(job);
                 } else if (!stackRejectGrow(target, source, kernels, numCols, numRows,
                                             i, xSubMax, j, ySubMax, poorFrac)) {