diff --git a/scripts/icons_update.py b/scripts/icons_update.py index c152f55be..0cf73f2b7 100644 --- 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 @@ if toupdate: 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 @@ if toadd: 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 index dfe88e448..5ddf39b90 100644 --- 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 @@ if toupdate: 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 @@ if toadd: 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 index acfee9db3..c50a2e99c 100644 Binary files a/staticdata/icons/icon01_08.png and b/staticdata/icons/icon01_08.png differ diff --git a/staticdata/icons/icon02_11.png b/staticdata/icons/icon02_11.png index d73f2d5f6..940505449 100644 Binary files a/staticdata/icons/icon02_11.png and b/staticdata/icons/icon02_11.png differ diff --git a/staticdata/icons/icon105_46.png b/staticdata/icons/icon105_46.png index 0a14c8189..5f128f018 100644 Binary files a/staticdata/icons/icon105_46.png and b/staticdata/icons/icon105_46.png differ diff --git a/staticdata/icons/icon105_47.png b/staticdata/icons/icon105_47.png index 85239a53a..0dcdaebbd 100644 Binary files a/staticdata/icons/icon105_47.png and b/staticdata/icons/icon105_47.png differ diff --git a/staticdata/icons/icon105_48.png b/staticdata/icons/icon105_48.png index 00dee8f20..214454aac 100644 Binary files a/staticdata/icons/icon105_48.png and b/staticdata/icons/icon105_48.png differ diff --git a/staticdata/icons/icon105_49.png b/staticdata/icons/icon105_49.png index 085331780..175ff15a9 100644 Binary files a/staticdata/icons/icon105_49.png and b/staticdata/icons/icon105_49.png differ diff --git a/staticdata/icons/icon107_1.png b/staticdata/icons/icon107_1.png index 5bdcbda55..d96c6ae9c 100644 Binary files a/staticdata/icons/icon107_1.png and b/staticdata/icons/icon107_1.png differ diff --git a/staticdata/icons/icon107_2.png b/staticdata/icons/icon107_2.png index 90ce2cd0a..a0977931f 100644 Binary files a/staticdata/icons/icon107_2.png and b/staticdata/icons/icon107_2.png differ diff --git a/staticdata/icons/icon107_3.png b/staticdata/icons/icon107_3.png index d70c59fb8..e6d1f1fc9 100644 Binary files a/staticdata/icons/icon107_3.png and b/staticdata/icons/icon107_3.png differ diff --git a/staticdata/icons/icon108_1.png b/staticdata/icons/icon108_1.png index 956260537..bd4f25b9d 100644 Binary files a/staticdata/icons/icon108_1.png and b/staticdata/icons/icon108_1.png differ diff --git a/staticdata/icons/icon108_10.png b/staticdata/icons/icon108_10.png index c703e4d99..a3e968220 100644 Binary files a/staticdata/icons/icon108_10.png and b/staticdata/icons/icon108_10.png differ diff --git a/staticdata/icons/icon108_11.png b/staticdata/icons/icon108_11.png index ae5978b60..8e7237443 100644 Binary files a/staticdata/icons/icon108_11.png and b/staticdata/icons/icon108_11.png differ diff --git a/staticdata/icons/icon108_12.png b/staticdata/icons/icon108_12.png index 951655dc8..6fa9fc3df 100644 Binary files a/staticdata/icons/icon108_12.png and b/staticdata/icons/icon108_12.png differ diff --git a/staticdata/icons/icon108_13.png b/staticdata/icons/icon108_13.png index 8b11794f5..eae33079e 100644 Binary files a/staticdata/icons/icon108_13.png and b/staticdata/icons/icon108_13.png differ diff --git a/staticdata/icons/icon108_14.png b/staticdata/icons/icon108_14.png index 51a91a0c3..28aa09805 100644 Binary files a/staticdata/icons/icon108_14.png and b/staticdata/icons/icon108_14.png differ diff --git a/staticdata/icons/icon108_15.png b/staticdata/icons/icon108_15.png index cef54cad9..9ef8422a6 100644 Binary files a/staticdata/icons/icon108_15.png and b/staticdata/icons/icon108_15.png differ diff --git a/staticdata/icons/icon108_16.png b/staticdata/icons/icon108_16.png index 4f347cd98..a5a7ca5bd 100644 Binary files a/staticdata/icons/icon108_16.png and b/staticdata/icons/icon108_16.png differ diff --git a/staticdata/icons/icon108_17.png b/staticdata/icons/icon108_17.png index 3207e1d58..ade62fe73 100644 Binary files a/staticdata/icons/icon108_17.png and b/staticdata/icons/icon108_17.png differ diff --git a/staticdata/icons/icon108_18.png b/staticdata/icons/icon108_18.png index e5e54a340..2b27853a6 100644 Binary files a/staticdata/icons/icon108_18.png and b/staticdata/icons/icon108_18.png differ diff --git a/staticdata/icons/icon108_19.png b/staticdata/icons/icon108_19.png index 00e17b419..85e19a1f6 100644 Binary files a/staticdata/icons/icon108_19.png and b/staticdata/icons/icon108_19.png differ diff --git a/staticdata/icons/icon108_2.png b/staticdata/icons/icon108_2.png index 32f0cea32..7d622e167 100644 Binary files a/staticdata/icons/icon108_2.png and b/staticdata/icons/icon108_2.png differ diff --git a/staticdata/icons/icon108_20.png b/staticdata/icons/icon108_20.png index e83f0782d..d5a7ad2b7 100644 Binary files a/staticdata/icons/icon108_20.png and b/staticdata/icons/icon108_20.png differ diff --git a/staticdata/icons/icon108_21.png b/staticdata/icons/icon108_21.png index 083848e56..de5104a69 100644 Binary files a/staticdata/icons/icon108_21.png and b/staticdata/icons/icon108_21.png differ diff --git a/staticdata/icons/icon108_3.png b/staticdata/icons/icon108_3.png index f303c38fd..a68abee8d 100644 Binary files a/staticdata/icons/icon108_3.png and b/staticdata/icons/icon108_3.png differ diff --git a/staticdata/icons/icon108_4.png b/staticdata/icons/icon108_4.png index e559fe0f6..e98d57430 100644 Binary files a/staticdata/icons/icon108_4.png and b/staticdata/icons/icon108_4.png differ diff --git a/staticdata/icons/icon108_5.png b/staticdata/icons/icon108_5.png index 8771e6a9c..662fcaf5e 100644 Binary files a/staticdata/icons/icon108_5.png and b/staticdata/icons/icon108_5.png differ diff --git a/staticdata/icons/icon108_6.png b/staticdata/icons/icon108_6.png index f33e4b32b..001c315ce 100644 Binary files a/staticdata/icons/icon108_6.png and b/staticdata/icons/icon108_6.png differ diff --git a/staticdata/icons/icon108_64_22.png b/staticdata/icons/icon108_64_22.png index c67d4e601..d3cfa6aed 100644 Binary files a/staticdata/icons/icon108_64_22.png and b/staticdata/icons/icon108_64_22.png differ diff --git a/staticdata/icons/icon108_7.png b/staticdata/icons/icon108_7.png index 8e746ff5c..f78447b2c 100644 Binary files a/staticdata/icons/icon108_7.png and b/staticdata/icons/icon108_7.png differ diff --git a/staticdata/icons/icon108_8.png b/staticdata/icons/icon108_8.png index 32efa4c3c..91ac80270 100644 Binary files a/staticdata/icons/icon108_8.png and b/staticdata/icons/icon108_8.png differ diff --git a/staticdata/icons/icon113_64_1.png b/staticdata/icons/icon113_64_1.png index 45b5f69dd..f2def6839 100644 Binary files a/staticdata/icons/icon113_64_1.png and b/staticdata/icons/icon113_64_1.png differ diff --git a/staticdata/icons/icon113_64_2.png b/staticdata/icons/icon113_64_2.png index 97d082041..6cfcead58 100644 Binary files a/staticdata/icons/icon113_64_2.png and b/staticdata/icons/icon113_64_2.png differ diff --git a/staticdata/icons/icon113_64_3.png b/staticdata/icons/icon113_64_3.png index 02d987d94..e91832585 100644 Binary files a/staticdata/icons/icon113_64_3.png and b/staticdata/icons/icon113_64_3.png differ diff --git a/staticdata/icons/icon118_64_7.png b/staticdata/icons/icon118_64_7.png index 4c1185f39..42ef21230 100644 Binary files a/staticdata/icons/icon118_64_7.png and b/staticdata/icons/icon118_64_7.png differ diff --git a/staticdata/icons/icon119_1.png b/staticdata/icons/icon119_1.png index f1a7fb1e7..c64901566 100644 Binary files a/staticdata/icons/icon119_1.png and b/staticdata/icons/icon119_1.png differ diff --git a/staticdata/icons/icon1337_21.png b/staticdata/icons/icon1337_21.png index c9133cbb8..7277c51fe 100644 Binary files a/staticdata/icons/icon1337_21.png and b/staticdata/icons/icon1337_21.png differ diff --git a/staticdata/icons/icon1337_22.png b/staticdata/icons/icon1337_22.png index 84ce0dcf8..08d350194 100644 Binary files a/staticdata/icons/icon1337_22.png and b/staticdata/icons/icon1337_22.png differ diff --git a/staticdata/icons/icon34_16.png b/staticdata/icons/icon34_16.png index b8a2478c0..0e29f9d24 100644 Binary files a/staticdata/icons/icon34_16.png and b/staticdata/icons/icon34_16.png differ diff --git a/staticdata/icons/iconIcon_64px_Fireworks.png b/staticdata/icons/iconIcon_64px_Fireworks.png index 7bd17da63..2e8a27c3d 100644 Binary files a/staticdata/icons/iconIcon_64px_Fireworks.png and b/staticdata/icons/iconIcon_64px_Fireworks.png differ diff --git a/staticdata/icons/iconMarketIcon_16px_Amarr.png b/staticdata/icons/iconMarketIcon_16px_Amarr.png index 96aa92cea..fdb721f65 100644 Binary files a/staticdata/icons/iconMarketIcon_16px_Amarr.png and b/staticdata/icons/iconMarketIcon_16px_Amarr.png differ diff --git a/staticdata/icons/iconMarketIcon_16px_Caldari.png b/staticdata/icons/iconMarketIcon_16px_Caldari.png index 420f4e0dd..edd49286e 100644 Binary files a/staticdata/icons/iconMarketIcon_16px_Caldari.png and b/staticdata/icons/iconMarketIcon_16px_Caldari.png differ diff --git a/staticdata/icons/iconMarketIcon_16px_Gallente.png b/staticdata/icons/iconMarketIcon_16px_Gallente.png index 8debc4fd7..4039ba05c 100644 Binary files a/staticdata/icons/iconMarketIcon_16px_Gallente.png and b/staticdata/icons/iconMarketIcon_16px_Gallente.png differ diff --git a/staticdata/icons/iconMarketIcon_16px_Minmatar.png b/staticdata/icons/iconMarketIcon_16px_Minmatar.png index f8379a89c..dba4a2726 100644 Binary files a/staticdata/icons/iconMarketIcon_16px_Minmatar.png and b/staticdata/icons/iconMarketIcon_16px_Minmatar.png differ diff --git a/staticdata/icons/iconremote_hull_repairer.png b/staticdata/icons/iconremote_hull_repairer.png index 2360bfb28..5899ec386 100644 Binary files a/staticdata/icons/iconremote_hull_repairer.png and b/staticdata/icons/iconremote_hull_repairer.png differ