Merge pull request #4148 from mdboom/minus-sign

tacaswell · tacaswell · commit 461572023e67 · 2015-02-24T20:44:13.000-05:00
FIX :  mathtext image bounding box
diff --git a/lib/matplotlib/mathtext.py b/lib/matplotlib/mathtext.py
@@ -178,7 +178,7 @@ def _update_bbox(self, x1, y1, x2, y2):
     def set_canvas_size(self, w, h, d):
         MathtextBackend.set_canvas_size(self, w, h, d)
         if self.mode != 'bbox':
-            self.image = FT2Image(ceil(w), ceil(h + d))
+            self.image = FT2Image(ceil(w), ceil(h + max(d, 0)))
 
     def render_glyph(self, ox, oy, info):
         if self.mode == 'bbox':
diff --git a/lib/matplotlib/tests/test_mathtext.py b/lib/matplotlib/tests/test_mathtext.py
@@ -3,9 +3,11 @@
 
 import six
 
+import io
+
 import numpy as np
 import matplotlib
-from matplotlib.testing.decorators import image_comparison, knownfailureif
+from matplotlib.testing.decorators import image_comparison, knownfailureif, cleanup
 import matplotlib.pyplot as plt
 from matplotlib import mathtext
 
@@ -210,6 +212,22 @@ def test_mathtext_exceptions():
         else:
             assert False, "Expected '%s', but didn't get it" % msg
 
+@cleanup
+def test_single_minus_sign():
+    plt.figure(figsize=(0.3, 0.3))
+    plt.text(0.5, 0.5, '$-$')
+    for spine in plt.gca().spines.values():
+        spine.set_visible(False)
+    plt.gca().set_xticks([])
+    plt.gca().set_yticks([])
+
+    buff = io.BytesIO()
+    plt.savefig(buff, format="rgba", dpi=1000)
+    array = np.fromstring(buff.getvalue(), dtype=np.uint8)
+
+    # If this fails, it would be all white
+    assert not np.all(array == 0xff)
+
 
 if __name__ == '__main__':
     import nose
diff --git a/src/ft2font.cpp b/src/ft2font.cpp
@@ -55,10 +55,10 @@ FT2Image::~FT2Image()
 
 void FT2Image::resize(long width, long height)
 {
-    if (width < 0) {
+    if (width <= 0) {
         width = 1;
     }
-    if (height < 0) {
+    if (height <= 0) {
         height = 1;
     }
     size_t numBytes = width * height;
@@ -146,11 +146,11 @@ FT2Image::draw_rect_filled(unsigned long x0, unsigned long y0, unsigned long x1,
 {
     x0 = std::min(x0, m_width);
     y0 = std::min(y0, m_height);
-    x1 = std::min(x1, m_width);
-    y1 = std::min(y1, m_height);
+    x1 = std::min(x1 + 1, m_width);
+    y1 = std::min(y1 + 1, m_height);
 
-    for (size_t j = y0; j < y1 + 1; j++) {
-        for (size_t i = x0; i < x1 + 1; i++) {
+    for (size_t j = y0; j < y1; j++) {
+        for (size_t i = x0; i < x1; i++) {
             m_buffer[i + j * m_width] = 255;
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -55,10 +55,10 @@ FT2Image::~FT2Image()`
`55`	`55`
`56`	`56`	`void FT2Image::resize(long width, long height)`
`57`	`57`	`{`
`58`		`- if (width < 0) {`
	`58`	`+ if (width <= 0) {`
`59`	`59`	`width = 1;`
`60`	`60`	`}`
`61`		`- if (height < 0) {`
	`61`	`+ if (height <= 0) {`
`62`	`62`	`height = 1;`
`63`	`63`	`}`
`64`	`64`	`size_t numBytes = width * height;`
`@@ -146,11 +146,11 @@ FT2Image::draw_rect_filled(unsigned long x0, unsigned long y0, unsigned long x1,`
`146`	`146`	`{`
`147`	`147`	`x0 = std::min(x0, m_width);`
`148`	`148`	`y0 = std::min(y0, m_height);`
`149`		`- x1 = std::min(x1, m_width);`
`150`		`- y1 = std::min(y1, m_height);`
	`149`	`+ x1 = std::min(x1 + 1, m_width);`
	`150`	`+ y1 = std::min(y1 + 1, m_height);`
`151`	`151`
`152`		`- for (size_t j = y0; j < y1 + 1; j++) {`
`153`		`- for (size_t i = x0; i < x1 + 1; i++) {`
	`152`	`+ for (size_t j = y0; j < y1; j++) {`
	`153`	`+ for (size_t i = x0; i < x1; i++) {`
`154`	`154`	`m_buffer[i + j * m_width] = 255;`
`155`	`155`	`}`
`156`	`156`	`}`