Merge pull request fontforge#3873 from skef/islin

frank-trampe · web-flow · commit 547cb707316d · 2019-08-14T12:23:12.000-05:00
Only run WithinMinMax when spline is single-dimensional
diff --git a/fontforge/splineutil2.c b/fontforge/splineutil2.c
@@ -276,27 +276,27 @@ return( true );
     if ( RealNear(spline->from->me.x,spline->to->me.x) ) {
 	ret = RealNear(spline->from->me.x,spline->from->nextcp.x) &&
 	    RealNear(spline->from->me.x,spline->to->prevcp.x);
-	if ( ! ((spline->from->nextcp.y >= spline->from->me.y &&
-		  spline->from->nextcp.y <= spline->to->me.y &&
-		  spline->to->prevcp.y >= spline->from->me.y &&
-		  spline->to->prevcp.y <= spline->to->me.y ) ||
-		 (spline->from->nextcp.y <= spline->from->me.y &&
-		  spline->from->nextcp.y >= spline->to->me.y &&
-		  spline->to->prevcp.y <= spline->from->me.y &&
-		  spline->to->prevcp.y >= spline->to->me.y )) )
+	if ( ret && ! ((spline->from->nextcp.y >= spline->from->me.y &&
+		        spline->from->nextcp.y <= spline->to->me.y &&
+		        spline->to->prevcp.y >= spline->from->me.y &&
+		        spline->to->prevcp.y <= spline->to->me.y ) ||
+		       (spline->from->nextcp.y <= spline->from->me.y &&
+		        spline->from->nextcp.y >= spline->to->me.y &&
+		        spline->to->prevcp.y <= spline->from->me.y &&
+		        spline->to->prevcp.y >= spline->to->me.y )) )
 	    ret = MinMaxWithin(spline);
     /* Horizontal lines */
     } else if ( RealNear(spline->from->me.y,spline->to->me.y) ) {
 	ret = RealNear(spline->from->me.y,spline->from->nextcp.y) &&
 	    RealNear(spline->from->me.y,spline->to->prevcp.y);
-	if ( ! ((spline->from->nextcp.x >= spline->from->me.x &&
-		  spline->from->nextcp.x <= spline->to->me.x &&
-		  spline->to->prevcp.x >= spline->from->me.x &&
-		  spline->to->prevcp.x <= spline->to->me.x) ||
-		 (spline->from->nextcp.x <= spline->from->me.x &&
-		  spline->from->nextcp.x >= spline->to->me.x &&
-		  spline->to->prevcp.x <= spline->from->me.x &&
-		  spline->to->prevcp.x >= spline->to->me.x)) )
+	if ( ret && ! ((spline->from->nextcp.x >= spline->from->me.x &&
+		       spline->from->nextcp.x <= spline->to->me.x &&
+		       spline->to->prevcp.x >= spline->from->me.x &&
+		       spline->to->prevcp.x <= spline->to->me.x) ||
+		      (spline->from->nextcp.x <= spline->from->me.x &&
+		       spline->from->nextcp.x >= spline->to->me.x &&
+		       spline->to->prevcp.x <= spline->from->me.x &&
+		       spline->to->prevcp.x >= spline->to->me.x)) )
 	    ret = MinMaxWithin(spline);
     } else {
 	ret = true;
