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

Timestamp:

Oct 24, 2006, 2:27:29 PM (20 years ago)

Author:

Paul Price

Message:

Changed definition of psVectorAlloc and psArrayAlloc

File:

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

trunk/stac/src/stacRead.c

@@ -17 +17 @@
     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;
     }
 
@@ -75 +73 @@
     psTrace("stac.read.coords", 5, "Reading coordinate file, %s\n", filename);
 
-    psArray *coords = psArrayAlloc(BUFFER); // The array of coordinates to be returned
+    psArray *coords = psArrayAllocEmpty(BUFFER); // The array of coordinates to be returned
     float x, y;                         // Coordinates to read
     while (fscanf(file, "%f %f\n", &x, &y) == 2) {
@@ -188 +186 @@
     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