Strip ICC color profile data

Fixes pyfa-org#337
HarukaMa · Jul 23, 2015 · 8c19a95 · 8c19a95
1 parent cd7579a
commit 8c19a95
Show file tree

Hide file tree

Showing 46 changed files with 10 additions and 4 deletions.
diff --git a/scripts/icons_update.py b/scripts/icons_update.py
@@ -209,6 +209,9 @@ def get_icon_file(request):
         img.thumbnail(ICON_SIZE, Image.ANTIALIAS)
     else:
         img = Image.open(fullpath)
+    # Strip all additional image info (mostly for ICC color
+    # profiles, see issue #337)
+    img.info = {}
     return img
 
 
@@ -235,7 +238,7 @@ def get_icon_file(request):
             continue
         fullname = 'icon{}.png'.format(fname)
         fullpath = os.path.join(icons_dir, fullname)
-        icon.save(fullpath, 'PNG')
+        icon.save(fullpath, 'png')
     if missing:
         print('  {} icons are missing in export:'.format(len(missing)))
         for fname in sorted(missing):
@@ -251,7 +254,7 @@ def get_icon_file(request):
             continue
         fullname = 'icon{}.png'.format(fname)
         fullpath = os.path.join(icons_dir, fullname)
-        icon.save(fullpath, 'PNG')
+        icon.save(fullpath, 'png')
     if missing:
         print('  {} icons are missing in export:'.format(len(missing)))
         for fname in sorted(missing):

diff --git a/scripts/renders_update.py b/scripts/renders_update.py
@@ -80,6 +80,9 @@ def get_render(type_id):
     if img.size != RENDER_SIZE:
         img = crop_image(img)
         img.thumbnail(RENDER_SIZE, Image.ANTIALIAS)
+    # Strip all additional image info (mostly for ICC color
+    # profiles, see issue #337)
+    img.info = {}
     return img
 
 
@@ -99,7 +102,7 @@ def get_render(type_id):
         render = get_render(type_id)
         fname = '{}.png'.format(type_id)
         fullpath = os.path.join(icons_dir, fname)
-        render.save(fullpath, 'PNG')
+        render.save(fullpath, 'png')
     if missing:
         print('  {} renders are missing in export:'.format(len(missing)))
         for type_id in sorted(missing):
@@ -113,7 +116,7 @@ def get_render(type_id):
         render = get_render(type_id)
         fname = '{}.png'.format(type_id)
         fullpath = os.path.join(icons_dir, fname)
-        render.save(fullpath, 'PNG')
+        render.save(fullpath, 'png')
     if missing:
         print('  {} renders are missing in export:'.format(len(missing)))
         for type_id in sorted(missing):

diff --git a/staticdata/icons/icon01_08.png b/staticdata/icons/icon01_08.png
diff --git a/staticdata/icons/icon02_11.png b/staticdata/icons/icon02_11.png
diff --git a/staticdata/icons/icon105_46.png b/staticdata/icons/icon105_46.png
diff --git a/staticdata/icons/icon105_47.png b/staticdata/icons/icon105_47.png
diff --git a/staticdata/icons/icon105_48.png b/staticdata/icons/icon105_48.png
diff --git a/staticdata/icons/icon105_49.png b/staticdata/icons/icon105_49.png
diff --git a/staticdata/icons/icon107_1.png b/staticdata/icons/icon107_1.png
diff --git a/staticdata/icons/icon107_2.png b/staticdata/icons/icon107_2.png
diff --git a/staticdata/icons/icon107_3.png b/staticdata/icons/icon107_3.png
diff --git a/staticdata/icons/icon108_1.png b/staticdata/icons/icon108_1.png
diff --git a/staticdata/icons/icon108_10.png b/staticdata/icons/icon108_10.png
diff --git a/staticdata/icons/icon108_11.png b/staticdata/icons/icon108_11.png
diff --git a/staticdata/icons/icon108_12.png b/staticdata/icons/icon108_12.png
diff --git a/staticdata/icons/icon108_13.png b/staticdata/icons/icon108_13.png
diff --git a/staticdata/icons/icon108_14.png b/staticdata/icons/icon108_14.png
diff --git a/staticdata/icons/icon108_15.png b/staticdata/icons/icon108_15.png
diff --git a/staticdata/icons/icon108_16.png b/staticdata/icons/icon108_16.png
diff --git a/staticdata/icons/icon108_17.png b/staticdata/icons/icon108_17.png
diff --git a/staticdata/icons/icon108_18.png b/staticdata/icons/icon108_18.png
diff --git a/staticdata/icons/icon108_19.png b/staticdata/icons/icon108_19.png
diff --git a/staticdata/icons/icon108_2.png b/staticdata/icons/icon108_2.png
diff --git a/staticdata/icons/icon108_20.png b/staticdata/icons/icon108_20.png
diff --git a/staticdata/icons/icon108_21.png b/staticdata/icons/icon108_21.png
diff --git a/staticdata/icons/icon108_3.png b/staticdata/icons/icon108_3.png
diff --git a/staticdata/icons/icon108_4.png b/staticdata/icons/icon108_4.png
diff --git a/staticdata/icons/icon108_5.png b/staticdata/icons/icon108_5.png
diff --git a/staticdata/icons/icon108_6.png b/staticdata/icons/icon108_6.png
diff --git a/staticdata/icons/icon108_64_22.png b/staticdata/icons/icon108_64_22.png
diff --git a/staticdata/icons/icon108_7.png b/staticdata/icons/icon108_7.png
diff --git a/staticdata/icons/icon108_8.png b/staticdata/icons/icon108_8.png
diff --git a/staticdata/icons/icon113_64_1.png b/staticdata/icons/icon113_64_1.png
diff --git a/staticdata/icons/icon113_64_2.png b/staticdata/icons/icon113_64_2.png
diff --git a/staticdata/icons/icon113_64_3.png b/staticdata/icons/icon113_64_3.png
diff --git a/staticdata/icons/icon118_64_7.png b/staticdata/icons/icon118_64_7.png
diff --git a/staticdata/icons/icon119_1.png b/staticdata/icons/icon119_1.png
diff --git a/staticdata/icons/icon1337_21.png b/staticdata/icons/icon1337_21.png
diff --git a/staticdata/icons/icon1337_22.png b/staticdata/icons/icon1337_22.png
diff --git a/staticdata/icons/icon34_16.png b/staticdata/icons/icon34_16.png
diff --git a/staticdata/icons/iconIcon_64px_Fireworks.png b/staticdata/icons/iconIcon_64px_Fireworks.png
diff --git a/staticdata/icons/iconMarketIcon_16px_Amarr.png b/staticdata/icons/iconMarketIcon_16px_Amarr.png
diff --git a/staticdata/icons/iconMarketIcon_16px_Caldari.png b/staticdata/icons/iconMarketIcon_16px_Caldari.png
diff --git a/staticdata/icons/iconMarketIcon_16px_Gallente.png b/staticdata/icons/iconMarketIcon_16px_Gallente.png
diff --git a/staticdata/icons/iconMarketIcon_16px_Minmatar.png b/staticdata/icons/iconMarketIcon_16px_Minmatar.png
diff --git a/staticdata/icons/iconremote_hull_repairer.png b/staticdata/icons/iconremote_hull_repairer.png