Changeset 6887 for trunk/stac/src/stacRead.c

Timestamp:

Apr 18, 2006, 12:20:45 PM (20 years ago)

Author:

Paul Price

Message:

Updating to use psLib rel11. Main problem was that vector and array lengths ('n' element) are no longer set to equal the number of allocated values ('nalloc' element) when allocated.

File:

• trunk/stac/src/stacRead.c (modified) (3 diffs)

trunk/stac/src/stacRead.c

@@ -13 +13 @@
     int nFiles = filenames->n;          // The number of input files
     psArray *images = psArrayAlloc(nFiles); // The input files, to be returned
+    images->n = nFiles;
     assert(!headers || ! *headers || (*headers)->n == nFiles);
     if (headers && ! *headers) {
         *headers = psArrayAlloc(nFiles);
+        (*headers)->n = nFiles;
     }
 
@@ -71 +73 @@
     psArray *coords = psArrayAlloc(BUFFER); // The array of coordinates to be returned
     float x, y;                         // Coordinates to read
-    int num = 0;                        // Number of coordinates read
     while (fscanf(file, "%f %f\n", &x, &y) == 2) {
         psPlane *coord = psPlaneAlloc();// A coordinate
         coord->x = x;
         coord->y = y;
-        coords->data[num] = coord;
-        num++;
-        if (num % BUFFER) {
-            coords = psArrayRealloc(coords, num + BUFFER);
-        }
-    }
-    coords->n = num;
+        coords->data[coords->n] = coord;
+        coords->n++;
+        if (coords->n % BUFFER == 0) {
+            coords = psArrayRealloc(coords, coords->n + BUFFER);
+        }
+    }
 
     psTrace("stac.read.coords", 5, "%d coordinates read.\n", num);
@@ -184 +184 @@
     int nFiles = filenames->n;          // The number of input files
     psArray *maps = psArrayAlloc(nFiles); // The maps, to be returned
+    maps->n = nFiles;
     char mapfile[MAXCHAR];              // Filename of map