Changeset 24045

Timestamp:

May 3, 2009, 3:23:46 PM (17 years ago)

Author:

eugene

Message:

handle case where the ellipse is ill-defined

File:

• trunk/psastro/src/psastroMaskUtils.c (modified) (1 diff)

trunk/psastro/src/psastroMaskUtils.c

@@ -181 +181 @@
 bool psastroMaskEllipticalAnnulus (psImage *mask, psImageMaskType value, float x0, float y0, psEllipseAxes eInner, psEllipseAxes eOuter) {
 
+    // skip the masking if the outer ellipse is nonsensical
+    psEllipseShape sOuter = psEllipseAxesToShape (eOuter);
+    if (isnan(sOuter.sx) || isnan(sOuter.sy) || isnan(sOuter.sxy)) return false;
+
     psEllipseShape sInner = psEllipseAxesToShape (eInner);
-    psEllipseShape sOuter = psEllipseAxesToShape (eOuter);
+    if (isnan(sInner.sx) || isnan(sInner.sy) || isnan(sInner.sxy)) {
+        // use a solid ellipse if the inner ellipse is nonsensical
+        sInner.sx = 0.1;
+        sInner.sy = 0.1;
+        sInner.sxy = 0.0;
+    }
 
     // phi is the coordinate along the elliptical path