From 8a365096bd18cdc28f4a80b5f5b37ef062c9ef2e Mon Sep 17 00:00:00 2001
From: Tad Hardesty <tad@platymuus.com>
Date: Wed, 3 Jul 2019 00:38:10 -0700
Subject: [PATCH] Convert icons to RGBA in the icon merger (#44890)

* Mark dmi.merge and pre-commit.hook executable

* Convert icons to RGBA when merging
---
 tools/hooks/dmi.merge       | 0
 tools/hooks/pre-commit.hook | 0
 tools/mapmerge2/dmi.py      | 2 ++
 3 files changed, 2 insertions(+)
 mode change 100644 => 100755 tools/hooks/dmi.merge
 mode change 100644 => 100755 tools/hooks/pre-commit.hook

diff --git a/tools/hooks/dmi.merge b/tools/hooks/dmi.merge
old mode 100644
new mode 100755
diff --git a/tools/hooks/pre-commit.hook b/tools/hooks/pre-commit.hook
old mode 100644
new mode 100755
diff --git a/tools/mapmerge2/dmi.py b/tools/mapmerge2/dmi.py
index f0a8182c9f0..7e1c75cf8d5 100644
--- a/tools/mapmerge2/dmi.py
+++ b/tools/mapmerge2/dmi.py
@@ -45,6 +45,8 @@ class Dmi:
     @classmethod
     def from_file(cls, fname):
         image = Image.open(fname)
+        if image.mode != 'RGBA':
+            image = image.convert('RGBA')
 
         # no metadata = regular image file
         if 'Description' not in image.info: