Changeset 17371

Timestamp:

Apr 7, 2008, 2:16:31 PM (18 years ago)

Author:

Paul Price

Message:

Fixed so that sample can be used as a buffer (to save allocating over
and over; at least, that's what I thought it was for until I ran into
lots of memory leaks due to the function overwriting the used
pointer). It should still give the correct output.

File:

• trunk/psLib/src/imageops/psImageBackground.c (modified) (3 diffs)

trunk/psLib/src/imageops/psImageBackground.c

@@ -42 +42 @@
     const int Nsubset = (stats->nSubsample == 0) ? Npixels : PS_MIN(stats->nSubsample, Npixels); // Number of pixels in subset
 
-    psVector *values = psVectorAllocEmpty(Nsubset, PS_TYPE_F32); // Vector containing subsample
+    psVector *values;                   // Vector containing subsample
+    if (sample) {
+        *sample = psVectorRecycle(*sample, Nsubset, PS_TYPE_F32);
+        values = psMemIncrRefCounter(*sample);
+        values->n = 0;
+    } else {
+        values = psVectorAllocEmpty(Nsubset, PS_TYPE_F32);
+    }
 
     // Minimum and maximum values
@@ -67 +74 @@
     }
     if (n < 0.01*Nsubset) {
-        psLogMsg ("psLib", PS_LOG_INFO, "too few data points");
-        psFree (values);
-        return false;
+        psLogMsg ("psLib", PS_LOG_INFO, "too few data points");
+        psFree (values);
+        return false;
     }
 
@@ -121 +128 @@
     }
 
-    if (sample != NULL) {
-        *sample = values;
-    } else {
-        psFree(values);
-    }
+    psFree(values);
+
     return true;
 }