diff --git a/combineImg/__init__.py b/combineImg/__init__.py index e3ee318..2784b9b 100644 --- a/combineImg/__init__.py +++ b/combineImg/__init__.py @@ -30,10 +30,9 @@ def scaleImageIterable(args): targetWidth = args[1] targetHeight = args[2] pad=args[3] - image = image.convert('RGBA') - image = ImageOps.expand(image,20) if pad: - newImg = ImageOps.contain(image, (targetWidth, targetHeight)) + image = image.convert('RGBA') + newImg = ImageOps.pad(image, (targetWidth, targetHeight),color=(0, 0, 0, 0)) else: newImg = ImageOps.fit(image, (targetWidth, targetHeight)) # scale + crop return newImg @@ -92,12 +91,11 @@ def saveImage(image, name): def genImage(imageArray): totalSize=getTotalImgSize(imageArray) combined = combineImages(imageArray, *totalSize) - - finalImg = combined.convert('RGB') - - bbox = finalImg.getbbox() - finalImg = finalImg.crop(bbox) - + combinedBG = combineImages(imageArray, *totalSize,False) + combinedBG = blurImage(combinedBG,50) + finalImg = Image.alpha_composite(combinedBG,combined) + #finalImg = ImageOps.pad(finalImg, findImageWithMostPixels(imageArray).size,color=(0, 0, 0, 0)) + finalImg = finalImg.convert('RGB') return finalImg def downloadImage(url):