From 29362c86c1047b79e42747a934bc2f6a39d7bfb0 Mon Sep 17 00:00:00 2001 From: Canming Huang Date: Sun, 21 Jun 2015 19:05:47 -0400 Subject: [PATCH] Better handling of CvInvoke module loading. Do not build python2 wrapper on Windows. Fix documentation build. --- Emgu.CV/PInvoke/CvInvoke.cs | 6 ++++-- miscellaneous/Emgu.CV.html.shfbproj | 2 +- platforms/windows/Build_Binary_x86.bat | 1 + 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Emgu.CV/PInvoke/CvInvoke.cs b/Emgu.CV/PInvoke/CvInvoke.cs index 2e651f0f1..454e9bec7 100644 --- a/Emgu.CV/PInvoke/CvInvoke.cs +++ b/Emgu.CV/PInvoke/CvInvoke.cs @@ -134,14 +134,16 @@ namespace Emgu.CV subfolder = ".."; }*/ - System.Reflection.Assembly asm = System.Reflection.Assembly.GetExecutingAssembly(); + System.Reflection.Assembly asm = typeof (CvInvoke).Assembly; //System.Reflection.Assembly.GetExecutingAssembly(); + if (!File.Exists(asm.Location)) + return false; FileInfo file = new FileInfo(asm.Location); //FileInfo file = new FileInfo(asm.CodeBase); DirectoryInfo directory = file.Directory; loadDirectory = directory.FullName; if (!String.IsNullOrEmpty(subfolder)) - loadDirectory = Path.Combine(loadDirectory, subfolder); + loadDirectory = Path.Combine(loadDirectory, subfolder); #if (UNITY_STANDALONE_WIN && !UNITY_EDITOR_WIN) if (directory.Parent != null) diff --git a/miscellaneous/Emgu.CV.html.shfbproj b/miscellaneous/Emgu.CV.html.shfbproj index 1019495ce..4565d098a 100644 --- a/miscellaneous/Emgu.CV.html.shfbproj +++ b/miscellaneous/Emgu.CV.html.shfbproj @@ -40,7 +40,7 @@ For questions and discussions please visit http://www.emgu.com/forum VS2013 - + Emgu CV is a cross platform .Net wrapper to the OpenCV image processing library. Allowing OpenCV functions to be called from .NET compatible languages such as C#, VB, VC++, IronPython etc. The wrapper can be compiled in Mono and run on Windows, Linux, Mac OS X, iPhone, iPad and Android devices. diff --git a/platforms/windows/Build_Binary_x86.bat b/platforms/windows/Build_Binary_x86.bat index b443e2026..3ec3dbbb8 100644 --- a/platforms/windows/Build_Binary_x86.bat +++ b/platforms/windows/Build_Binary_x86.bat @@ -65,6 +65,7 @@ SET CMAKE_CONF_FLAGS= -G %CMAKE_CONF% ^ -DBUILD_opencv_apps:BOOL=FALSE ^ -DBUILD_opencv_adas:BOOL=FALSE ^ -DBUILD_opencv_bioinspired:BOOL=FALSE ^ +-DBUILD_opencv_python2:BOOL=FALSE ^ -DEMGU_ENABLE_SSE:BOOL=TRUE ^ -DCMAKE_INSTALL_PREFIX="%TEMP%" ^ -DBUILD_WITH_DEBUG_INFO:BOOL=FALSE ^