utils/watermark_utils.py

@@ -17,7 +17,7 @@ def reduce_opacity(im, opacity):

                     return im
              

                 
              

                 
              

                -def watermark(im, mark, position, opacity=1, maxsize=(0, 0), possize=(0, 0)):
              

                +def watermark(im, mark, position, opacity=1, maxsize=(0, 0), possize=(0, 0, None, None)):
              

                     """ Add watermark to image """
              

                     if opacity < 1:
              

                         mark = reduce_opacity(mark, opacity)
              
@@ -39,7 +39,12 @@ def watermark(im, mark, position, opacity=1, maxsize=(0, 0), possize=(0, 0)):

                         w, h = int(mark.size[0] * ratio), int(mark.size[1] * ratio)
              

                         w, h = int(min(w, maxsize[0]) if maxsize[0] else w), int(min(h, maxsize[1]) if maxsize[1] else h)
              

                         mark = mark.resize((w, h))
              

                -        layer.paste(mark, ((im.size[0] - possize[0] or w) / 2, (im.size[1] - possize[1] or h) / 2))
              

                +        possize += (None, ) * (4 - len(possize))
              

                +        lx, ly, rx, ry = possize
              

                +        if rx is None or ry is None:
              

                +            layer.paste(mark, ((im.size[0] - (lx or w)) / 2, (im.size[1] - (ly or h)) / 2))
              

                +        else:
              

                +            layer.paste(mark, ((im.size[0] - rx - w), ry))
              

                     else:
              

                         layer.paste(mark, position)
              

                     # Composite the watermark with the layer
              
@@ -49,7 +54,8 @@ def watermark(im, mark, position, opacity=1, maxsize=(0, 0), possize=(0, 0)):

                 def watermark_wrap(im_path, mark_path, save_path=''):
              

                     im, mark = Image.open(im_path), Image.open(mark_path)
              

                     # new_im = watermark(im, mark, (50, 50), 0.5)
              

                -    new_im = watermark(im, mark, position='scale', opacity=1.0, maxsize=(400, 505.2), possize=(400, 400))
              

                +    # new_im = watermark(im, mark, position='scale', opacity=1.0, maxsize=(400, 505.2), possize=(400, 400))
              

                +    new_im = watermark(im, mark, position='scale', opacity=1.0, maxsize=(200, 247.1875), possize=(0, 0, 15, 15))
              

                     new_im.save(save_path or im_path)
              

                 
              

                 
              
@@ -57,6 +63,7 @@ def watermark_test():

                     im, mark = Image.open('original_CGzC_10a50000c8811190.jpg'), Image.open('paiai_water_mark.png')
              

                     watermark(im, mark, position='tile', opacity=0.5, maxsize=(40, 49.4375)).show()
              

                     watermark(im, mark, position='scale', opacity=1.0, maxsize=(400, 494.375), possize=(400, 400)).show()
              

                +    watermark(im, mark, position='scale', opacity=1.0, maxsize=(200, 247.1875), possize=(0, 0, 10, 10)).show()
              

                     watermark(im, mark, position=(50, 50), opacity=0.5, maxsize=(40, 49.4375)).show()