Merge remote-tracking branch 'upstream/v1.2.x'

mdboom · mdboom · commit 84dffb241717 · 2013-05-15T22:53:40.000-04:00
Conflicts:
	lib/matplotlib/backend_bases.py
	lib/matplotlib/tests/test_artist.py
	src/_backend_agg.cpp
diff --git a/lib/matplotlib/tests/test_artist.py b/lib/matplotlib/tests/test_artist.py
@@ -1,5 +1,8 @@
 from __future__ import print_function
 
+import copy
+
+
 import numpy as np
 
 
diff --git a/ttconv/pprdrv_tt2.cpp b/ttconv/pprdrv_tt2.cpp
@@ -700,7 +700,7 @@ void ttfont_add_glyph_dependencies(struct TTFONT *font, std::vector<int>& glyph_
 
                     std::vector<int>::iterator insertion =
                         std::lower_bound(glyph_ids.begin(), glyph_ids.end(), gind);
-                    if (*insertion != gind)
+                    if (insertion == glyph_ids.end() || *insertion != gind)
                     {
                         glyph_ids.insert(insertion, gind);
                         glyph_stack.push(gind);

Original file line number	Diff line number	Diff line change
`@@ -700,7 +700,7 @@ void ttfont_add_glyph_dependencies(struct TTFONT *font, std::vector<int>& glyph_`
`700`	`700`
`701`	`701`	`std::vector<int>::iterator insertion =`
`702`	`702`	`std::lower_bound(glyph_ids.begin(), glyph_ids.end(), gind);`
`703`		`- if (*insertion != gind)`
	`703`	`+ if (insertion == glyph_ids.end() \|\| *insertion != gind)`
`704`	`704`	`{`
`705`	`705`	`glyph_ids.insert(insertion, gind);`
`706`	`706`	`glyph_stack.push(gind);`