|
|
@@ -548,13 +548,16 @@ class GeneratePic(object):
|
|
|
else:
|
|
|
if os.path.exists(logo_path):
|
|
|
logo_im = Image.open(logo_path)
|
|
|
+ if logo_im.mode != 'RGBA':
|
|
|
+ logo_im = logo_im.convert('RGBA')
|
|
|
else:
|
|
|
logo_im = Image.new("RGBA", (1600, 1600), (0, 0, 0, 0))
|
|
|
|
|
|
try:
|
|
|
image_bg.paste(logo_im, (0, 0), logo_im)
|
|
|
- except:
|
|
|
- raise UnicornException("Logo图片错误，请更换其他logo并重试")
|
|
|
+ except Exception as e:
|
|
|
+ alpha_mask = logo_im.split()[3]
|
|
|
+ image_bg.paste(logo_im, (0, 0), alpha_mask)
|
|
|
|
|
|
# image_bg = image_bg.resize((out_pic_size, out_pic_size), Image.BICUBIC)
|
|
|
if settings.OUT_PIC_FACTOR > 1.0:
|
|
|
@@ -573,7 +576,7 @@ class GeneratePic(object):
|
|
|
new_file_path = f"{file_without_suffix}_{imageSize}.{suffix}"
|
|
|
if imageSize < 1600:
|
|
|
image_bg = image_bg.resize(
|
|
|
- (out_pic_size, out_pic_size), resample=settings.RESIZE_IMAGE_MODE
|
|
|
+ (imageSize, imageSize), resample=settings.RESIZE_IMAGE_MODE
|
|
|
)
|
|
|
if settings.OUT_PIC_MODE == ".jpg":
|
|
|
self.saver.save_image(
|
rambo