From 566a328a271c850e1cb120aad772f76d0368809e Mon Sep 17 00:00:00 2001 From: relikd Date: Wed, 13 Oct 2021 00:32:52 +0200 Subject: [PATCH] fix icp6 icon size is 48x48 not 64x64 --- icnsutil/IcnsType.py | 2 +- tests/format-support-icns.zip | Bin 351487 -> 346937 bytes tests/format-support.py | 4 ++-- tests/test_icnsutil.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/icnsutil/IcnsType.py b/icnsutil/IcnsType.py index e37104e..3998f54 100644 --- a/icnsutil/IcnsType.py +++ b/icnsutil/IcnsType.py @@ -141,7 +141,7 @@ _TYPES = {x.key: x for x in ( # Write support for these: Media('icp4', ['png', 'jp2', 'rgb'], 16, os=10.7), Media('icp5', ['png', 'jp2', 'rgb'], 32, os=10.7), - Media('icp6', ['png'], 64, os=10.7), + Media('icp6', ['png', 'jp2'], 48, os=10.7), Media('ic07', ['png', 'jp2'], 128, os=10.7), Media('ic08', ['png', 'jp2'], 256, os=10.5), Media('ic09', ['png', 'jp2'], 512, os=10.5), diff --git a/tests/format-support-icns.zip b/tests/format-support-icns.zip index 3724087df98a884217df05ed6d2947d99071400e..24e3004f16bef0162c8436c302c647e446367920 100644 GIT binary patch delta 6029 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 diff --git a/tests/format-support.py b/tests/format-support.py index b825612..e726dd9 100644 --- a/tests/format-support.py +++ b/tests/format-support.py @@ -21,8 +21,8 @@ INFO = { 24: ['sb24'], 32: ['il32', 'icp5', 'ic11', 'ic05'], 36: ['icsB'], - 48: ['ih32', 'SB24'], - 64: ['icp6', 'ic12'], + 48: ['ih32', 'icp6', 'SB24'], + 64: ['ic12'], 128: ['it32', 'ic07'], 256: ['ic08', 'ic13'], 512: ['ic09', 'ic14'], diff --git a/tests/test_icnsutil.py b/tests/test_icnsutil.py index 57e64f8..818a5a7 100644 --- a/tests/test_icnsutil.py +++ b/tests/test_icnsutil.py @@ -270,7 +270,7 @@ class TestIcnsType(unittest.TestCase): ('it32', 'rgb', '', (128, 128), 49152), # 3x8-bit ('t8mk', 'bin', 'mask', (128, 128), 16384), # 8-bit mask ('ic05', 'argb', '', (32, 32), 4096), # 4x8-bit - ('icp6', 'png', '', (64, 64), None), + ('icp6', 'png', '', (48, 48), None), ('ic14', 'png', '@2x', (512, 512), None), ('info', 'plist', '', None, None), ('sbtp', 'icns', 'template', None, None),