Changeset 20580

Timestamp:

Nov 7, 2008, 3:03:55 PM (18 years ago)

Author:

bills

Message:

clip when excising pixels so that the code that calculates the streak
pixels doesn't have to

Location:

trunk/magic/remove/src

Files:

• Makefile.simple (modified) (1 diff)
• streaksremove.c (modified) (2 diffs)

trunk/magic/remove/src/Makefile.simple

@@ -13 +13 @@
 streaksremove:  ${OBJECTS}
 
-install:
+install:        streaksremove
         cp streaksremove $(PSCONFDIR)/$(PSCONFIG)/bin
         chmod 755  $(PSCONFDIR)/$(PSCONFIG)/bin/streaksremove

trunk/magic/remove/src/streaksremove.c

@@ -1244 +1244 @@
 excisePixel(streakFiles *sfiles, unsigned int x, unsigned int y, double newMaskValue)
 {
+    // we clip so that the streak calculation code doesn't have to
+    if ((x < 0) || (x >= sfiles->inImage->numCols) || (y < 0) || (y >= sfiles->inImage->numRows)) {
+        return;
+    }
+
     double imageValue  = psImageGet (sfiles->inImage->image,  x, y);
     psImageSet (sfiles->recImage->image,  x, y, imageValue);
@@ -1316 +1321 @@
     }
 
+    // we clip so that the streak calculation code doesn't have to
+    if ((cellCoord->x < 0) || (cellCoord->x >= sfiles->inImage->numCols) ||
+        (cellCoord->y < 0) || (cellCoord->y >= sfiles->inImage->numRows)) {
+        return false;
+    }
+
     cellToChip(&chipCoord, sfiles->astrom, cellCoord);
+
 
     return psImageGet(sfiles->warpedPixels, chipCoord.x, chipCoord.y) ? true : false;