Changeset 3683

Timestamp:

Apr 7, 2005, 2:27:03 PM (21 years ago)

Author:

Paul Price

Message:

Adding program to clip out NaN so that sExtractor can work properly.

Location:

trunk/stac/src

Files:

• Makefile (modified) (2 diffs)
• fixImage.c (added)
• stacSize.c (modified) (1 diff)

trunk/stac/src/Makefile

@@ -15 +15 @@
 SHIFTSIZE = shiftSize.o stacWrite.o stacConfig.o stacRead.o stacCheckMemory.o stacSize.o
 
-TARGETS = stac shift combine shiftSize
+FIXIMAGE = fixImage.o
+
+TARGETS = stac shift combine shiftSize fixImage
 
 .PHONY: tags clean empty test profile optimise all
@@ -33 +35 @@
 shiftSize:      $(SHIFTSIZE)
                 $(CC) $(CFLAGS) -o $@ $(SHIFTSIZE) $(LDFLAGS) $(OPTFLAGS)
+
+fixImage:       $(FIXIMAGE)
+                $(CC) $(CFLAGS) -o $@ $(FIXIMAGE) $(LDFLAGS) $(OPTFLAGS)
 
 all:            $(TARGETS)

trunk/stac/src/stacSize.c

@@ -94 +94 @@
     // Tweak the maps to account for the offset
     if (xMapDiff != NULL) {
-        *xMapDiff = floor(xMin);
+        *xMapDiff = floorf(xMin);
     }
     if (yMapDiff != NULL) {
-        *yMapDiff = floor(yMin);
+        *yMapDiff = floorf(yMin);
     }
     for (int i = 0; i < nImages; i++) {
         psPlaneTransform *map = maps->data[i]; // The map of interest
-        map->x->coeff[0][0] -= floor(xMin);
-        map->y->coeff[0][0] -= floor(yMin);
+        map->x->coeff[0][0] -= floorf(xMin);
+        map->y->coeff[0][0] -= floorf(yMin);
     }
 
-    *outnx = (int)(xMax + 0.5) - (int)xMin;
-    *outny = (int)(yMax + 0.5) - (int)yMin;
+    *outnx = (int)ceilf(xMax - xMin);
+    *outny = (int)ceilf(yMax - yMin);
 
     psTrace("stac.size", 1, "Output size is to be %dx%d\n", *outnx, *outny);