Changeset 2764 for trunk/stac/src/stac.c

Timestamp:

Dec 20, 2004, 6:15:28 PM (22 years ago)

Author:

Paul Price

Message:

Running faster now by only transforming rejection masks where we're interested. To do: only transform and combine in the second iteration for areas where we're interested

File:

• trunk/stac/src/stac.c (modified) (2 diffs)

trunk/stac/src/stac.c

@@ -72 +72 @@
 #endif
 
+    // Get regions of interest in the source frame
+    psArray *regions = psArrayAlloc(inputs->n); // Array of images denoting regions of interest
+    for (int i = 0; i < inputs->n; i++) {
+        fprintf(stderr, "Finding area of interest for image %d\n", i);
+        regions->data[i] = stacAreaOfInterest(rejected->data[i], inverseMaps->data[i],
+                                              ((psImage*)(inputs->data[i]))->numCols,
+                                              ((psImage*)(inputs->data[i]))->numRows);
+#ifdef TESTING
+        char regionFile[MAXCHAR];       // Filename of region image
+        sprintf(regionFile,"%s.region",config->inputs->data[i]);
+        psImageWriteSection(regions->data[i], 0, 0, 0, NULL, 0, regionFile);
+#endif
+    }
+
     // Transform rejected pixels to source frame
-    psArray *rejectedSource = stacRejection(inputs, transformed, combined, maps, inverseMaps, rejected, config);
+    psArray *rejectedSource = stacRejection(inputs, rejected, regions, maps, inverseMaps, config);
 
     // Redo transformation with the mask
@@ -93 +107 @@
     // Free everything I've used
     stacConfigFree(config);
+    psFree(regions);
     psFree(inputs);
     psFree(maps);