Skip to content
Browse files

merge -> blit (thx @marienz)

  • Loading branch information...
1 parent f94d755 commit e7a22f5155db2edc4ae29482741cd7e0289ed107 @ojii committed Sep 19, 2012
Showing with 3 additions and 3 deletions.
  1. +1 −1 docs/dev/api.rst
  2. +2 −2 pymaging/image.py
View
2 docs/dev/api.rst
@@ -160,7 +160,7 @@ Internal API
This method operates **in place** and does not return a copy of this image!
- .. method:: merge(padding_top, padding_left, image):
+ .. method:: blit(padding_top, padding_left, image):
Draws the image passed in on top of this image at the location indicated with the padding.
View
4 pymaging/image.py
@@ -221,9 +221,9 @@ def draw(self, shape, color):
for x, y, pixelcolor in shape.iter_pixels(color):
self.set_color(x, y, pixelcolor)
- def merge(self, padding_top, padding_left, image):
+ def blit(self, padding_top, padding_left, image):
"""
- Merges the two images, putting the image given on top of this image with with the given padding
+ Puts the image given on top of this image with the given padding
"""
# there *must* be a better/faster way to do this:
# TODO: check that palettes etc match.

0 comments on commit e7a22f5

Please sign in to comment.
Something went wrong with that request. Please try again.