matplotlib
diff --git a/‎lib/matplotlib/tests/baseline_images/test_simplification/fft_peaks.pdf‎
72 Bytes b/‎lib/matplotlib/tests/baseline_images/test_simplification/fft_peaks.pdf‎
72 Bytes
diff --git a/‎lib/matplotlib/tests/baseline_images/test_simplification/fft_peaks.png‎
-33 Bytes b/‎lib/matplotlib/tests/baseline_images/test_simplification/fft_peaks.png‎
-33 Bytes
diff --git a/‎lib/matplotlib/tests/baseline_images/test_simplification/fft_peaks.svg‎
Lines changed: 6 additions & 5 deletions b/‎lib/matplotlib/tests/baseline_images/test_simplification/fft_peaks.svg‎
Lines changed: 6 additions & 5 deletions
diff --git a/‎lib/matplotlib/tests/test_simplification.py‎
Lines changed: 3 additions & 3 deletions b/‎lib/matplotlib/tests/test_simplification.py‎
Lines changed: 3 additions & 3 deletions
diff --git a/‎src/path_converters.h‎
Lines changed: 15 additions & 29 deletions b/‎src/path_converters.h‎
Lines changed: 15 additions & 29 deletions
@@ -141,7 +141,7 @@ def test_fft_peaks():
 
     print len(simplified)
 
-    assert len(simplified) == 17
+    assert len(simplified) == 20
 
 def test_start_with_moveto():
     # Should be entirely clipped away to a single MOVETO
@@ -212,8 +212,8 @@ def test_clipper():
 
 @image_comparison(baseline_images=['para_equal_perp'])
 def test_para_equal_perp():
-    x = np.array([0, 1, 2, 1, 0, -1, 0, 1])
-    y = np.array([1, 1, 2, 1, 0, -1, 0, 0])
+    x = np.array([0, 1, 2, 1, 0, -1, 0, 1] + [1] * 128)
+    y = np.array([1, 1, 2, 1, 0, -1, 0, 0] + [0] * 128)
 
     fig = plt.figure()
     ax = fig.add_subplot(111)
 
@@ -520,7 +520,7 @@ class PathSimplifier : protected EmbeddedQueue<9>
         m_moveto(true), m_after_moveto(false),
         m_lastx(0.0), m_lasty(0.0), m_clipped(false),
         m_origdx(0.0), m_origdy(0.0),
-        m_origdNorm2(0.0), m_dnorm2Max(0.0), m_dnorm2Min(0.0),
+        m_origdNorm2(0.0), m_dnorm2Max(0.0),
         m_lastMax(false), m_nextX(0.0), m_nextY(0.0),
         m_lastWrittenX(0.0), m_lastWrittenY(0.0)
     {
@@ -637,7 +637,6 @@ class PathSimplifier : protected EmbeddedQueue<9>
 
                 //set all the variables to reflect this new orig vector
                 m_dnorm2Max = m_origdNorm2;
-                m_dnorm2Min = 0.0;
                 m_lastMax = true;
 
                 m_nextX = m_lastWrittenX = m_lastx = *x;
@@ -677,36 +676,25 @@ class PathSimplifier : protected EmbeddedQueue<9>
                 /* check if the current vector is parallel or
                    anti-parallel to the orig vector. If it is
                    parallel, test if it is the longest of the vectors
-                   we are merging in that direction. If anti-p, test
-                   if it is the longest in the opposite direction (the
-                   min of our final line) */
+                   we are merging in that direction. */
                 double paradNorm2 = paradx * paradx + parady * parady;
 
-                if (perpdNorm2 == paradNorm2) {
+                m_lastMax = false;
+                if (totdot > 0.0)
+                {
+                    if (paradNorm2 > m_dnorm2Max)
+                    {
+                        m_lastMax = true;
+                        m_dnorm2Max = paradNorm2;
+                        m_nextX = *x;
+                        m_nextY = *y;
+                    }
+                }
+                else
+                {
                     _push(&m_lastx, &m_lasty);
                     _push(x, y);
                     break;
-                } else {
-                    m_lastMax = false;
-                    if (totdot >= 0.0)
-                    {
-                        if (paradNorm2 > m_dnorm2Max)
-                        {
-                            m_lastMax = true;
-                            m_dnorm2Max = paradNorm2;
-                            m_nextX = *x;
-                            m_nextY = *y;
-                        }
-                    }
-                    else
-                    {
-                        if (paradNorm2 < m_dnorm2Min)
-                        {
-                            m_dnorm2Min = paradNorm2;
-                            m_nextX = *x;
-                            m_nextY = *y;
-                        }
-                    }
                 }
 
                 m_lastx = *x;
@@ -770,7 +758,6 @@ class PathSimplifier : protected EmbeddedQueue<9>
     double m_origdy;
     double m_origdNorm2;
     double m_dnorm2Max;
-    double m_dnorm2Min;
     bool   m_lastMax;
     double m_nextX;
     double m_nextY;
@@ -805,7 +792,6 @@ class PathSimplifier : protected EmbeddedQueue<9>
         m_origdNorm2 = m_origdx * m_origdx + m_origdy * m_origdy;
 
         m_dnorm2Max = m_origdNorm2;
-        m_dnorm2Min = 0.0;
         m_lastMax = true;
         m_lastWrittenX = m_queue[m_queue_write-1].x;
         m_lastWrittenY = m_queue[m_queue_write-1].y;