Merge pull request #7 from justis/upstream_patches1

thanks for your additions

pytagcloud/__init__.py

@@ -97,8 +97,7 @@ def rotate(self, angle):
         self._update_mask()
 
     def update_fontsize(self):
-        self.font = font.Font(os.path.join(FONT_DIR, self.font_spec['ttf']),
-                              self.tag['size'])
+        self.font = get_font(self.font_spec, self.tag['size'])
 
 def load_font(name):
     for font in FONT_CACHE:
@@ -349,8 +348,11 @@ def create_tag_image(
                                       fontname=fontname,
                                       rectangular=rectangular)
 
-    image_surface = Surface((sizeRect.w, sizeRect.h), SRCALPHA, 32)
-    image_surface.fill(background)
+    if type(output) == pygame.Surface:
+        image_surface = output
+    else:
+        image_surface = Surface((sizeRect.w, sizeRect.h), SRCALPHA, 32)
+        image_surface.fill(background)
     for tag in tag_store:
         image_surface.blit(tag.image, tag.rect)
     pygame.image.save(image_surface, output)