Mirror
/
EmguCV
mirror of https://github.com/emgucv/emgucv.git
1
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

Search multiple paths for native subfolders.

pull/348/merge
Canming Huang 5 years ago
parent
45ea631490
commit
6eeb6ea8a1
2 changed files with 40 additions and 20 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      Emgu.CV.Runtime/Windows/Emgu.CV.Runtime.Windows.projitems
  2. 48
      Emgu.CV/PInvoke/CvInvoke.cs

12
Emgu.CV.Runtime/Windows/Emgu.CV.Runtime.Windows.projitems
View File

@ -24,29 +24,29 @@
</PropertyGroup>
<ItemGroup Condition="'$(EmguCVWindowsBuildX86)'=='True' AND Exists('$(EmguCVWindowsNativeFileX86)')">
<Content Include="$(EmguCVWindowsBinaryDir)\x86\*.dll">
<Link>x86\%(RecursiveDir)%(Filename)%(Extension)</Link>
<Link>runtimes\win-x86\native\%(RecursiveDir)%(Filename)%(Extension)</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>
<ItemGroup Condition="'$(EmguCVWindowsBuildX64)'=='True' AND Exists('$(EmguCVWindowsNativeFileX64)')">
<Content Include="$(EmguCVWindowsBinaryDir)\x64\*.dll">
<Link>x64\%(RecursiveDir)%(Filename)%(Extension)</Link>
<Link>runtimes\win-x64\native\%(RecursiveDir)%(Filename)%(Extension)</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="$(EmguCVWindowsBinaryDir)\x64\*.json">
<Link>x64\%(RecursiveDir)%(Filename)%(Extension)</Link>
<Link>runtimes\win-x64\native\%(RecursiveDir)%(Filename)%(Extension)</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="$(EmguCVWindowsBinaryDir)\x64\*.xml">
<Link>x64\%(RecursiveDir)%(Filename)%(Extension)</Link>
<Link>runtimes\win-x64\native\%(RecursiveDir)%(Filename)%(Extension)</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="$(EmguCVWindowsBinaryDir)\x64\*.elf">
<Link>x64\%(RecursiveDir)%(Filename)%(Extension)</Link>
<Link>runtimes\win-x64\native\%(RecursiveDir)%(Filename)%(Extension)</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="$(EmguCVWindowsBinaryDir)\x64\*.mvcmd">
<Link>x64\%(RecursiveDir)%(Filename)%(Extension)</Link>
<Link>runtimes\win-x64\native\%(RecursiveDir)%(Filename)%(Extension)</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>

48
Emgu.CV/PInvoke/CvInvoke.cs
View File

@ -49,6 +49,18 @@ namespace Emgu.CV
/// </summary>
public const CallingConvention CvCallingConvention = CallingConvention.Cdecl;
private static String FindValidSubfolders(String baseFolder, List<String> subfolderOptions)
{
foreach (String sfo in subfolderOptions)
{
if (Directory.Exists(Path.Combine(baseFolder, sfo)))
{
return sfo;
}
}
return String.Empty;
}
/// <summary>
/// Attempts to load opencv modules from the specific location
/// </summary>
@ -69,23 +81,31 @@ namespace Emgu.CV
String oldDir = String.Empty;
if (loadDirectory == null)
{
String subfolder = String.Empty;
List<String> subfolderOptions = new List<string>();
if (Platform.OperationSystem == Emgu.Util.Platform.OS.Windows
|| Platform.OperationSystem == Emgu.Util.Platform.OS.Linux)
{
//var fd = RuntimeInformation.FrameworkDescription;
if (RuntimeInformation.ProcessArchitecture == Architecture.X86)
subfolder = "x86";
{
subfolderOptions.Add("x86");
subfolderOptions.Add( Path.Combine( "runtimes", "win-x86", "native"));
}
else if (RuntimeInformation.ProcessArchitecture == Architecture.X64)
subfolder = "x64";
{
subfolderOptions.Add("x64");
subfolderOptions.Add(Path.Combine("runtimes", "win-x64", "native"));
}
else if (RuntimeInformation.ProcessArchitecture == Architecture.Arm)
subfolder = "arm";
subfolderOptions.Add("arm");
else if (RuntimeInformation.ProcessArchitecture == Architecture.Arm64)
subfolder = "arm64";
subfolderOptions.Add("arm64");
}
String subfolder = String.Empty;
System.Reflection.Assembly asm = typeof(CvInvoke).Assembly; //System.Reflection.Assembly.GetExecutingAssembly();
if ((String.IsNullOrEmpty(asm.Location) || !File.Exists(asm.Location)))
{
@ -103,23 +123,22 @@ namespace Emgu.CV
debuggerVisualizerPath = Path.Combine(baseDirectoryInfo.Parent.FullName, "Packages", "Debugger", "Visualizers");
if (!debuggerVisualizerPath.Equals(String.Empty) && Directory.Exists(debuggerVisualizerPath))
{
loadDirectory = debuggerVisualizerPath;
}
else
{
loadDirectory = baseDirectoryInfo.FullName;
if (!Directory.Exists(Path.Combine(baseDirectoryInfo.FullName, subfolder)))
{
subfolder = String.Empty;
}
}
subfolder = FindValidSubfolders(loadDirectory, subfolderOptions);
}
}
else
{
loadDirectory = Path.GetDirectoryName(asm.Location);
if ((loadDirectory != null) && (!Directory.Exists(Path.Combine(loadDirectory, subfolder))))
if (loadDirectory != null)
{
subfolder = String.Empty;
subfolder = FindValidSubfolders(loadDirectory, subfolderOptions);
}
}
@ -147,11 +166,11 @@ namespace Emgu.CV
{
FileInfo file = new FileInfo(asm.Location);
DirectoryInfo directory = file.Directory;
if (!String.IsNullOrEmpty(subfolder) && Directory.Exists(Path.Combine(directory.FullName, subfolder)))
if ((directory != null) && (!String.IsNullOrEmpty(subfolder)) && Directory.Exists(Path.Combine(directory.FullName, subfolder)))
{
loadDirectory = Path.Combine(directory.FullName, subfolder);
}
else if (Directory.Exists(directory.FullName))
else if (directory != null && Directory.Exists(directory.FullName))
{
loadDirectory = directory.FullName;
}
@ -238,8 +257,9 @@ namespace Emgu.CV
else
System.Diagnostics.Trace.WriteLine(String.Format("Failed to load {0} from {1}.", mName, fullPath));
}
if (loaded)
if (!loaded)
{
//Try to load without the full path
System.Diagnostics.Trace.WriteLine(String.Format("Trying to load {0} using default path.", mName));
loaded = !IntPtr.Zero.Equals(Toolbox.LoadLibrary(mName));
if (loaded)

Write Preview
Loading…
Cancel
Save