Changeset 20665

Timestamp:

Nov 10, 2008, 4:27:30 PM (17 years ago)

Author:

bills

Message:

convert to integer when naming coordinates

File:

• trunk/magic/remove/src/warpedpixels.c (modified) (5 diffs)

trunk/magic/remove/src/warpedpixels.c

@@ -33 +33 @@
     }
 
-    bool writeTouchedPixels = false;
+    bool writeTouchedPixels = false; // XXX: make this an argument to the program
     if (writeTouchedPixels) {
         // write out the warped pixels
@@ -123 +123 @@
     // Now set the touched pixels
     int ymin = fmax(0, pt[1].y);
-    int ymax = fmin(pt[3].y, sf->warpedPixels->numRows);
+    int ymax = fmin(pt[3].y + .5, sf->warpedPixels->numRows - 1);
 #ifdef DEBUG_PRINT
     printf("\nymin: %d ymax: %d\n", ymin, ymax);
 #endif
-    for (int y = ymin ; y < ymax; y++) {
+    for (int y = ymin ; y <= ymax; y++) {
         int xleft  = xLeft(pt, y);
         int xright = xRight(pt, y);
@@ -177 +177 @@
         x_d = xOfY(&pt[0], &pt[3], y);
     }
-    return (int) x_d;
+    return (int) (x_d + 0.5);
 }
 
@@ -266 +266 @@
     /* find pt0 the left most (bottom most) corner */
     int imin = 0;
-    double  min = pt[0].x;
+    int  min = (int) pt[0].x;
     int i;
-    for (i=0; i<4; i++) {
-        double x = pt[i].x;
+    for (i=1; i<4; i++) {
+        int x = pt[i].x;
         if ((x < min) ||
             ((x == min) && (pt[i].y < pt[imin].y))) {
@@ -285 +285 @@
     imin = 0;
     min = pt[0].y;
-    for (i=0; i<3; i++) {
-        double y = pt[i].y;
+    for (i=1; i<3; i++) {
+        int y = pt[i].y;
         if ((y < min) ||
             ((y == min) && (pt[i].x > pt[imin].x)) ) {