Change num lines to int in hatch.

jenshnielsen · jenshnielsen · commit 5f68f646440e · 2014-07-22T11:53:33.000+01:00
Fixes numpy issues warnings
diff --git a/lib/matplotlib/hatch.py b/lib/matplotlib/hatch.py
@@ -21,7 +21,7 @@ class HatchPatternBase:
 
 class HorizontalHatch(HatchPatternBase):
     def __init__(self, hatch, density):
-        self.num_lines = (hatch.count('-') + hatch.count('+')) * density
+        self.num_lines = int((hatch.count('-') + hatch.count('+')) * density)
         self.num_vertices = self.num_lines * 2
 
     def set_vertices_and_codes(self, vertices, codes):
@@ -38,7 +38,7 @@ def set_vertices_and_codes(self, vertices, codes):
 
 class VerticalHatch(HatchPatternBase):
     def __init__(self, hatch, density):
-        self.num_lines = (hatch.count('|') + hatch.count('+')) * density
+        self.num_lines = int((hatch.count('|') + hatch.count('+')) * density)
         self.num_vertices = self.num_lines * 2
 
     def set_vertices_and_codes(self, vertices, codes):
@@ -55,8 +55,8 @@ def set_vertices_and_codes(self, vertices, codes):
 
 class NorthEastHatch(HatchPatternBase):
     def __init__(self, hatch, density):
-        self.num_lines = (hatch.count('/') + hatch.count('x') +
-                          hatch.count('X')) * density
+        self.num_lines = int((hatch.count('/') + hatch.count('x') +
+                          hatch.count('X')) * density)
         if self.num_lines:
             self.num_vertices = (self.num_lines + 1) * 2
         else:
@@ -74,8 +74,8 @@ def set_vertices_and_codes(self, vertices, codes):
 
 class SouthEastHatch(HatchPatternBase):
     def __init__(self, hatch, density):
-        self.num_lines = (hatch.count('\\') + hatch.count('x') +
-                          hatch.count('X')) * density
+        self.num_lines = int((hatch.count('\\') + hatch.count('x') +
+                          hatch.count('X')) * density)
         self.num_vertices = (self.num_lines + 1) * 2
         if self.num_lines:
             self.num_vertices = (self.num_lines + 1) * 2
@@ -100,8 +100,8 @@ def __init__(self, hatch, density):
             self.num_shapes = 0
             self.num_vertices = 0
         else:
-            self.num_shapes = ((self.num_rows / 2 + 1) * (self.num_rows + 1) +
-                               (self.num_rows / 2) * (self.num_rows))
+            self.num_shapes = ((self.num_rows // 2 + 1) * (self.num_rows + 1) +
+                               (self.num_rows // 2) * (self.num_rows))
             self.num_vertices = (self.num_shapes *
                                  len(self.shape_vertices) *
                                  (self.filled and 1 or 2))
@@ -212,6 +212,7 @@ def get_path(hatchpattern, density=6):
     cursor = 0
     for pattern in patterns:
         if pattern.num_vertices != 0:
+            num_vertices
             vertices_chunk = vertices[cursor:cursor + pattern.num_vertices]
             codes_chunk = codes[cursor:cursor + pattern.num_vertices]
             pattern.set_vertices_and_codes(vertices_chunk, codes_chunk)
