Changeset 6887 for trunk/stac/src/shift.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/shift.c (modified) (2 diffs)

trunk/stac/src/shift.c

@@ -126 +126 @@
     psArray *maps = psArrayAlloc(1);    // An array of one
     psArray *masks = psArrayAlloc(1);   // An array of one
+    images->n = maps->n = masks->n = 1;
     images->data[0] = image;
     maps->data[0] = map;
@@ -132 +133 @@
     // Get size
     if (outnx == 0 || outny == 0) {
-        stacSize(&outnx, &outny, NULL, NULL, images, maps);
+        psVector *xSize = psVectorAlloc(1, PS_TYPE_S32); // A vector of one
+        psVector *ySize = psVectorAlloc(1, PS_TYPE_S32); // A vector of one
+        xSize->n = 1;
+        ySize->n = 1;
+        xSize->data.S32[0] = image->numCols;
+        ySize->data.S32[0] = image->numRows;
+        stacSize(&outnx, &outny, NULL, NULL, xSize, ySize, maps);
+        psFree(xSize);
+        psFree(ySize);
     }