pass word, not word frequency to color_func in recolor.

wordcloud/color_from_image.py

@@ -19,7 +19,7 @@ class ImageColorGenerator(object):
         transposed_font = ImageFont.TransposedFont(font,
                                                    orientation=orientation)
         # get size of resulting text
-        box_size = transposed_font.getsize(word[0])
+        box_size = transposed_font.getsize(word)
         x = position[0]
         y = position[1]
         # cut out patch under word box

wordcloud/wordcloud.py

@@ -411,11 +411,11 @@ class WordCloud(object):
 
         if color_func is None:
             color_func = self.color_func
-        self.layout_ = [(word, font_size, position, orientation,
-                         color_func(word=word, font_size=font_size,
+        self.layout_ = [(word_freq, font_size, position, orientation,
+                         color_func(word=word_freq[0], font_size=font_size,
                                     position=position, orientation=orientation,
                                     random_state=random_state, font_path=self.font_path))
-                        for word, font_size, position, orientation, _ in self.layout_]
+                        for word_freq, font_size, position, orientation, _ in self.layout_]
         return self
 
     def to_file(self, filename):