Merge remote-tracking branch 'origin/feature/43' into develop

kekyo · Apr 9, 2024 · 478da89 · 478da89
2 parents 76df4ad + fccb7f5
commit 478da89
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 18 deletions.
diff --git a/FlashCap.Core/Internal/NativeMethods_V4L2.cs b/FlashCap.Core/Internal/NativeMethods_V4L2.cs
@@ -40,22 +40,22 @@ static NativeMethods_V4L2()
         {
             case "x86_64":
             case "amd64":
-                Interop = new NativeMethods_V4L2_Interop_x86_64();
-                break;
             case "i686":
             case "i586":
             case "i486":
             case "i386":
-                Interop = new NativeMethods_V4L2_Interop_i686();
+                Interop = IntPtr.Size == 8 ?
+                    new NativeMethods_V4L2_Interop_x86_64() :
+                    new NativeMethods_V4L2_Interop_i686();
                 break;
             case "aarch64":
-                Interop = new NativeMethods_V4L2_Interop_aarch64();
-                break;
             case "armv9l":
             case "armv8l":
             case "armv7l":
             case "armv6l":
-                Interop = new NativeMethods_V4L2_Interop_armv7l();
+                Interop = IntPtr.Size == 8 ?
+                    new NativeMethods_V4L2_Interop_aarch64() :
+                    new NativeMethods_V4L2_Interop_armv7l();
                 break;
             case "mips":
             case "mipsel":

diff --git a/README.md b/README.md
@@ -748,22 +748,22 @@ switch (buf.machine)
 {
     case "x86_64":
     case "amd64":
-        Interop = new NativeMethods_V4L2_Interop_x86_64();
-        break;
     case "i686":
     case "i586":
     case "i486":
     case "i386":
-        Interop = new NativeMethods_V4L2_Interop_i686();
+        Interop = IntPtr.Size == 8 ?
+            new NativeMethods_V4L2_Interop_x86_64() :
+            new NativeMethods_V4L2_Interop_i686();
         break;
     case "aarch64":
-        Interop = new NativeMethods_V4L2_Interop_aarch64();
-        break;
     case "armv9l":
     case "armv8l":
     case "armv7l":
     case "armv6l":
-        Interop = new NativeMethods_V4L2_Interop_armv7l();
+        Interop = IntPtr.Size == 8 ?
+            new NativeMethods_V4L2_Interop_aarch64() :
+            new NativeMethods_V4L2_Interop_armv7l();
         break;
     case "mips":
     case "mipsel":

diff --git a/README_ja.md b/README_ja.md
@@ -683,22 +683,22 @@ switch (buf.machine)
 {
     case "x86_64":
     case "amd64":
-        Interop = new NativeMethods_V4L2_Interop_x86_64();
-        break;
     case "i686":
     case "i586":
     case "i486":
     case "i386":
-        Interop = new NativeMethods_V4L2_Interop_i686();
+        Interop = IntPtr.Size == 8 ?
+            new NativeMethods_V4L2_Interop_x86_64() :
+            new NativeMethods_V4L2_Interop_i686();
         break;
     case "aarch64":
-        Interop = new NativeMethods_V4L2_Interop_aarch64();
-        break;
     case "armv9l":
     case "armv8l":
     case "armv7l":
     case "armv6l":
-        Interop = new NativeMethods_V4L2_Interop_armv7l();
+        Interop = IntPtr.Size == 8 ?
+            new NativeMethods_V4L2_Interop_aarch64() :
+            new NativeMethods_V4L2_Interop_armv7l();
         break;
     case "mips":
     case "mipsel":