fix imageio on Mac ARM

core/lib/imageio/core/fetching.py

@@ -51,7 +51,8 @@ def get_remote_file(fname, directory=None, force_download=False):
     fname : str
         The path to the file on the local system.
     """
-    _url_root = 'https://github.com/imageio/imageio-binaries/raw/master/'
+    #_url_root = 'https://github.com/imageio/imageio-binaries/raw/master/'
+    _url_root = 'https://github.com/domlysz/freeimage_bin/raw/master/'
     url = _url_root + fname
     fname = op.normcase(fname)  # convert to native
     # Get dirs to look for the resource

core/lib/imageio/core/util.py

@@ -14,6 +14,7 @@
 import time
 import struct
 from warnings import warn
+import platform
 
 import numpy as np
 
@@ -516,19 +517,27 @@ def get_platform():
     
     Get a string that specifies the platform more specific than
     sys.platform does. The result can be: linux32, linux64, win32,
-    win64, osx32, osx64. Other platforms may be added in the future.
+    win64, osx32, osx64, osx-arm64. Other platforms may be added in the future.
     """
     # Get platform
     if sys.platform.startswith('linux'):
         plat = 'linux%i'
     elif sys.platform.startswith('win'):
         plat = 'win%i'
     elif sys.platform.startswith('darwin'):
-        plat = 'osx%i'
+        if platform.machine() == 'arm64':
+            plat = 'osx-arm64'
+        else:
+            plat = 'osx%i'
     else:  # pragma: no cover
         return None
 
-    return plat % (struct.calcsize('P') * 8)  # 32 or 64 bits
+    # Only perform string formatting when plat contains '%i'
+    if '%i' in plat:
+        return plat % (struct.calcsize('P') * 8)  # 32 or 64 bits
+    else:
+        return plat
+
 
 
 def has_module(module_name):

core/lib/imageio/plugins/_freeimage.py

@@ -31,8 +31,9 @@
 FNAME_PER_PLATFORM = {
     'osx32': 'libfreeimage-3.16.0-osx10.6.dylib',  # universal library
     'osx64': 'libfreeimage-3.16.0-osx10.6.dylib',
-    'win32': 'FreeImage-3.15.4-win32.dll',
-    'win64': 'FreeImage-3.15.1-win64.dll',
+    'osx-arm64': 'libfreeimage.3.18.0.dylib',
+    'win32': 'FreeImage-3.18.0-win32.dll',
+    'win64': 'FreeImage-3.18.0-win64.dll',
     'linux32': 'libfreeimage-3.16.0-linux32.so',
     'linux64': 'libfreeimage-3.16.0-linux64.so',
 }
@@ -51,7 +52,8 @@ def get_freeimage_lib():
     plat = get_platform()
     if plat and plat in FNAME_PER_PLATFORM:
         try:
-            return get_remote_file('freeimage/' + FNAME_PER_PLATFORM[plat])
+            #return get_remote_file('freeimage/' + FNAME_PER_PLATFORM[plat])
+            return get_remote_file(FNAME_PER_PLATFORM[plat])
         except InternetNotAllowedError:
             pass
         except RuntimeError as e:  # pragma: no cover