From e996bd1e476ad6d52e5aa2b190076491b474d0ae Mon Sep 17 00:00:00 2001 From: Kevin Chang Date: Thu, 15 Feb 2018 06:37:39 -0800 Subject: [PATCH] fix pillow no longer allowing RGBA JPEG --- overviewer_core/assetmanager.py | 2 ++ overviewer_core/tileset.py | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/overviewer_core/assetmanager.py b/overviewer_core/assetmanager.py index dd05b0e..f58712c 100644 --- a/overviewer_core/assetmanager.py +++ b/overviewer_core/assetmanager.py @@ -146,6 +146,8 @@ directory. # write a blank image blank = Image.new("RGBA", (1,1), tileset.options.get('bgcolor')) + if tileset.options.get('imgformat') != 'png': + blank = blank.convert("RGB") blank.save(os.path.join(self.outputdir, tileset.options.get('name'), "blank." + tileset.options.get('imgformat'))) # write out config diff --git a/overviewer_core/tileset.py b/overviewer_core/tileset.py index 5cf56f1..c3de7f6 100644 --- a/overviewer_core/tileset.py +++ b/overviewer_core/tileset.py @@ -978,7 +978,7 @@ class TileSet(object): # Save it with FileReplacer(imgpath, capabilities=self.fs_caps) as tmppath: if imgformat == 'jpg': - img.save(tmppath, "jpeg", quality=self.options['imgquality'], subsampling=0) + img.convert('RGB').save(tmppath, "jpeg", quality=self.options['imgquality'], subsampling=0) else: # png img.save(tmppath, "png") @@ -1089,7 +1089,7 @@ class TileSet(object): # Save them with FileReplacer(imgpath, capabilities=self.fs_caps) as tmppath: if self.imgextension == 'jpg': - tileimg.save(tmppath, "jpeg", quality=self.options['imgquality'], subsampling=0) + tileimg.convert('RGB').save(tmppath, "jpeg", quality=self.options['imgquality'], subsampling=0) else: # png tileimg.save(tmppath, "png")