Changeset 41523

Timestamp:

Apr 2, 2021, 2:44:18 PM (5 years ago)

Author:

eugene

Message:

assign pixel vector manually rather than using psVectorAppend (trying to find memory corruption problem)

File:

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

trunk/psLib/src/imageops/psImageBackground.c

@@ -104 +104 @@
     float min = +PS_MAX_F32;
     float max = -PS_MAX_F32;
-
+    
     if ((nSubset < 0.01*nGoodPixels) && (nGoodPixels >= 0.1*nPixels)) {
         psTrace ("psLib.imageops", 4, "case 3: nSubset < 0.01*nGoodPixels && nGoodPixels > 0.1*nPixels (%d x %d : %d : %d : %d)\n", (int) nx, (int) ny, (int) nSubset, (int) nGoodPixels, (int) nPixels);
@@ -144 +144 @@
         // generate a vector of all pixels which may in theory be selected
         psVector *pixelVector = psVectorAllocEmpty(nGoodPixels, PS_TYPE_F32);
+        int ipix = 0;
         for (long iy = 0; iy < ny; iy++) {
             for (long ix = 0; ix < nx; ix++) {
                 if (!isfinite(image->data.F32[iy][ix])) continue;
                 if (mask && mask->data.PS_TYPE_IMAGE_MASK_DATA[iy][ix] & maskValue) continue;
-                psVectorAppend(pixelVector, image->data.F32[iy][ix]);
+                psAssert (ipix < pixelVector->nalloc, "we must have mis-counted above");
+                pixelVector->data.F32[ipix] = image->data.F32[iy][ix];
+                ipix ++;
             }
         }
+        pixelVector->n = ipix;
+        psAssert (ipix <= pixelVector->nalloc, "we must have mis-counted above");
         psAssert (nGoodPixels == pixelVector->n, "we must have mis-counted above");
-        
+
         // generate the unique random subset
         for (int i = 0; i < nSubset; i++) {