Changeset 25082 for trunk/magic/remove/src/warpedpixels.c

Timestamp:

Aug 14, 2009, 3:58:07 PM (17 years ago)

Author:

Paul Price

Message:

Fix streaksremove so that output CMF files have PHU called ext.hdr and table called ext.psf. Turned on -Wall -Werror and fixed a host of little problems.

File:

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

trunk/magic/remove/src/warpedpixels.c

@@ -23 +23 @@
 
     psRegion     *bounds = pmChipPixels(sf->chip);
-    
+
     int width  = bounds->x1 - bounds->x0;
     int height = bounds->y1 - bounds->y0;
@@ -83 +83 @@
 
     /* now set up our wrapper to the chip astrometry to apply to the whole chip */
-    sf->astrom = streakSetAstrometry(sf->astrom, sf->stage, sf->inAstrom->fpa, sf->chip, false, NULL, 
+    sf->astrom = streakSetAstrometry(sf->astrom, sf->stage, sf->inAstrom->fpa, sf->chip, false, NULL,
         sf->warpedPixels->numCols, sf->warpedPixels->numRows);
 
@@ -106 +106 @@
         // convert corner of skycell to sky coordinates
         if (!pmAstromWCStoSky(&sky, wcs, &pt[i])) {
-            psError(PS_ERR_IO, false, "failed to convert pt %d of %s to sky coords: %s", fileName);
+            psErrorStackPrint(stderr, "failed to convert pt %d of %s to sky coords", i, fileName);
             streaksExit("", PS_EXIT_DATA_ERROR);
         }
@@ -112 +112 @@
         // convert to chip coordinates
         if (!skyToCell(&p, sf->astrom, sky.r, sky.d)) {
-            psError(PS_ERR_IO, false, "failed to convert pt %d of %s to sky coords: %s", fileName);
+            psErrorStackPrint(stderr, "failed to convert pt %d of %s to sky coords", i, fileName);
             streaksExit("", PS_EXIT_DATA_ERROR);
         }
@@ -171 +171 @@
 }
 
-// x as a function of y for the line between two points 
+// x as a function of y for the line between two points
 // Note: the caller guarentees that the y's of the two points are different
 static double xOfY(psPlane *pI, psPlane *pJ, int y)
@@ -212 +212 @@
  * To compute the overlap of a quadrilateral with a set of
  * points we transform the 4 corners to image coordinates
- * and name the 4 points of the quad 
+ * and name the 4 points of the quad
             pt 0 is left most (bottom most corner)
             pt 1 is bottom most (right most corner)
@@ -238 +238 @@
 
                 3
-                 C       
+                 C
          ---------------2           left boundary:  line 0_1 y < pt0.y
                  B                                  line 0_3 y >= pt0.y
@@ -249 +249 @@
               C
         0----------------
-              B     
+              B
       ----------------2
               A
@@ -258 +258 @@
 
         3       2
-            
+
             B
 
@@ -265 +265 @@
 (region A and C are empty in the case where the points form a rectangle)
 */
-            
+
 /*
     Name the corners
-    The following algorithm works for points that form a quadrilateral 
+    The following algorithm works for points that form a quadrilateral
     I think it also works for the situation where 3 points are co-linear
     and we have a triangle, but that isn't important for our purposes
@@ -313 +313 @@
         pt[i] = pt[i+1];
     }
-            
+
     // now find the right most (top most) of the remaining 2 points
     if ((pt[0].x > pt[1].x) ||