Fix for Windows Store build. Exclude WebDynamicImage project from the solution. Seems to cause problem when loading the solution. Updated opencv_contrib module with cuda fix.

11 years ago · b586cc261f
14 changed files with 185 additions and 177 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -547,7 +547,7 @@ ELSEIF (WIN32)
  # ----------------------------------------------------------------------------
  #  Bundle MSCVRT into deployment package
  # ----------------------------------------------------------------------------
-  IF(MSVC)
+  IF(MSVC AND (NOT NETFX_CORE))
    IF(MSVC12)
 	  SET(MSVC_REDIST_FOLDER "${CMAKE_CURRENT_SOURCE_DIR}/miscellaneous/msvc12_redist")
    ELSEIF(MSVC11)
@ -587,6 +587,7 @@ ELSEIF (WIN32)
 	    MESSAGE(FATAL_ERROR "Unable to find MSVC reistributable. Please verify that the following file exist: ${MSVC_REDIST_FOLDER}/${VCRT_REDIST_NAME}")
      ENDIF()
 	ENDIF()
+	
  ENDIF()

  IF(DEFINED UNIVERSAL_BUILD)
--- a/Emgu.CV.Example/FaceDetection/DetectFace.cs
+++ b/Emgu.CV.Example/FaceDetection/DetectFace.cs
@ -16,12 +16,16 @@ namespace FaceDetection
 {
   public static class DetectFace
   {
-      public static void Detect(Image<Bgr, Byte> image, String faceFileName, String eyeFileName, List<Rectangle> faces, List<Rectangle> eyes, out long detectionTime)
+      public static void Detect(
+        Mat image, String faceFileName, String eyeFileName, 
+        List<Rectangle> faces, List<Rectangle> eyes, 
+        bool tryUseCuda, bool tryUseOpenCL,
+        out long detectionTime)
      {
         Stopwatch watch;
-
+         
         #if !IOS
-         if (CudaInvoke.HasCuda)
+         if (tryUseCuda && CudaInvoke.HasCuda)
         {
            using (CudaCascadeClassifier face = new CudaCascadeClassifier(faceFileName))
            using (CudaCascadeClassifier eye = new CudaCascadeClassifier(eyeFileName))
@ -58,7 +62,6 @@ namespace FaceDetection
         else
         #endif
         {
-            bool tryUseOpenCL = true;
            //Many opencl functions require opencl compatible gpu devices. 
            //As of opencv 3.0-alpha, opencv will crash if opencl is enable and only opencv compatible cpu device is presented
            //So we need to call CvInvoke.HaveOpenCLCompatibleGpuDevice instead of CvInvoke.HaveOpenCL (which also returns true on a system that only have cpu opencl devices).
--- a/Emgu.CV.Example/FaceDetection/Program.cs
+++ b/Emgu.CV.Example/FaceDetection/Program.cs
@ -9,6 +9,7 @@ using System.Drawing;
 using System.Runtime.InteropServices;
 using System.Windows.Forms;
 using Emgu.CV;
+using Emgu.CV.CvEnum;
 using Emgu.CV.Structure;
 using Emgu.CV.UI;
 using Emgu.CV.Cuda;
@ -30,20 +31,34 @@ namespace FaceDetection

      static void Run()
      {
-         Image<Bgr, Byte> image = new Image<Bgr, byte>("lena.jpg"); //Read the files as an 8-bit Bgr image  
+         Mat image = new Mat("lena.jpg", LoadImageType.Color); //Read the files as an 8-bit Bgr image  
         long detectionTime;
         List<Rectangle> faces = new List<Rectangle>();
         List<Rectangle> eyes = new List<Rectangle>();
-         DetectFace.Detect(image, "haarcascade_frontalface_default.xml", "haarcascade_eye.xml", faces, eyes, out detectionTime);
+
+         //The cuda cascade classifier doesn't seem to be able to load "haarcascade_frontalface_default.xml" file in this release
+         //disabling CUDA module for now
+         bool tryUseCuda = false;
+         bool tryUseOpenCL = true;
+
+         DetectFace.Detect(
+           image, "haarcascade_frontalface_default.xml", "haarcascade_eye.xml", 
+           faces, eyes,
+           tryUseCuda,
+           tryUseOpenCL,
+           out detectionTime);
+
         foreach (Rectangle face in faces)
-            image.Draw(face, new Bgr(Color.Red), 2);
+            CvInvoke.Rectangle(image, face, new Bgr(Color.Red).MCvScalar, 2);
         foreach (Rectangle eye in eyes)
-            image.Draw(eye, new Bgr(Color.Blue), 2);
+            CvInvoke.Rectangle(image, eye, new Bgr(Color.Blue).MCvScalar, 2);

         //display the image 
         ImageViewer.Show(image, String.Format(
            "Completed face and eye detection using {0} in {1} milliseconds", 
-            CudaInvoke.HasCuda ? "GPU": "CPU", 
+            (tryUseCuda && CudaInvoke.HasCuda) ? "GPU"
+            : (tryUseOpenCL && CvInvoke.HaveOpenCLCompatibleGpuDevice) ? "OpenCL" 
+            : "CPU",
            detectionTime));
      }

--- a/Emgu.CV.Example/PedestrianDetection/FindPedestrian.cs
+++ b/Emgu.CV.Example/PedestrianDetection/FindPedestrian.cs
@ -23,14 +23,14 @@ namespace PedestrianDetection
      /// <param name="image">The image</param>
      /// <param name="processingTime">The pedestrian detection time in milliseconds</param>
      /// <returns>The region where pedestrians are detected</returns>
-      public static Rectangle[] Find(Mat image, out long processingTime)
+      public static Rectangle[] Find(Mat image, bool tryUseCuda, bool tryUseOpenCL, out long processingTime)
      {
         Stopwatch watch;
         Rectangle[] regions;

         #if !IOS
         //check if there is a compatible Cuda device to run pedestrian detection
-         if (CudaInvoke.HasCuda)
+         if (tryUseCuda && CudaInvoke.HasCuda)
         {  //this is the Cuda version
            using (CudaHOGDescriptor des = new CudaHOGDescriptor())
            {
@ -48,7 +48,6 @@ namespace PedestrianDetection
         else
         #endif
         {  
-            bool tryUseOpenCL = true;
            //Many opencl functions require opencl compatible gpu devices. 
            //As of opencv 3.0-alpha, opencv will crash if opencl is enable and only opencv compatible cpu device is presented
            //So we need to call CvInvoke.HaveOpenCLCompatibleGpuDevice instead of CvInvoke.HaveOpenCL (which also returns true on a system that only have cpu opencl devices).
--- a/Emgu.CV.Example/PedestrianDetection/Program.cs
+++ b/Emgu.CV.Example/PedestrianDetection/Program.cs
@ -9,7 +9,8 @@ using System.Drawing;
 using System.Runtime.InteropServices;
 using System.Windows.Forms;
 using Emgu.CV;
-using Emgu.CV.Structure;
+using Emgu.CV.CvEnum;
+using Emgu.CV.Structure;
 using Emgu.CV.UI;
 using Emgu.CV.Cuda;

@ -26,20 +27,22 @@ namespace PedestrianDetection
         Application.EnableVisualStyles();
         Application.SetCompatibleTextRenderingDefault(false);

-         using (Image<Bgr, byte> image = new Image<Bgr, byte>("pedestrian.png"))
+         using (Mat image = new Mat("pedestrian.png", LoadImageType.Color))
         {
+            bool tryUseCuda = false;
+            bool tryuseOpenCL = false;
            long processingTime;
-            Rectangle[] results = FindPedestrian.Find(image.Mat, out processingTime);
+            Rectangle[] results = FindPedestrian.Find(image, tryUseCuda, tryuseOpenCL, out processingTime);
            foreach (Rectangle rect in results)
            {
-               CvInvoke.Rectangle(image, rect, new MCvScalar(0, 0, 255, 255));
+               CvInvoke.Rectangle(image, rect, new Bgr(Color.Red).MCvScalar);
            }
            ImageViewer.Show(
               image,
               String.Format("Pedestrain detection using {0} in {1} milliseconds.",
-                  CudaInvoke.HasCuda ? "GPU" : 
-                  (CvInvoke.HaveOpenCL ? "OpenCL":
-                  "CPU"),
+                  (tryUseCuda && CudaInvoke.HasCuda) ? "GPU" : 
+                  (tryuseOpenCL && CvInvoke.HaveOpenCLCompatibleGpuDevice) ? "OpenCL":
+                  "CPU",
                  processingTime));
         }
      }
--- a/Emgu.CV.Example/Simple3DReconstruction/Simple3DReconstruction.cs
+++ b/Emgu.CV.Example/Simple3DReconstruction/Simple3DReconstruction.cs
@ -33,10 +33,10 @@ namespace Simlpe3DReconstruction
         InitializeComponent();
         _left = new Image<Bgr, byte>("imL.png");
         _right = new Image<Bgr, byte>("imR.png");
-         Image<Gray, short> disparityMap;
+         Mat disparityMap = new Mat();

         Stopwatch watch = Stopwatch.StartNew();
-         Computer3DPointsFromStereoPair(_left.Convert<Gray, Byte>(), _right.Convert<Gray, Byte>(), out disparityMap, out _points);
+         Computer3DPointsFromStereoPair(_left.Convert<Gray, Byte>(), _right.Convert<Gray, Byte>(), disparityMap, out _points);
         watch.Stop();
         long disparityComputationTime = watch.ElapsedMilliseconds;

@ -51,19 +51,17 @@ namespace Simlpe3DReconstruction
      /// </summary>
      /// <param name="left">The left image</param>
      /// <param name="right">The right image</param>
-      /// <param name="disparityMap">The left disparity map</param>
+      /// <param name="outputDisparityMap">The left disparity map</param>
      /// <param name="points">The 3D point cloud within a [-0.5, 0.5] cube</param>
-      private static void Computer3DPointsFromStereoPair(Image<Gray, Byte> left, Image<Gray, Byte> right, out Image<Gray, short> disparityMap, out MCvPoint3D32f[] points)
+      private static void Computer3DPointsFromStereoPair(Image<Gray, Byte> left, Image<Gray, Byte> right, Mat outputDisparityMap, out MCvPoint3D32f[] points)
      {
         Size size = left.Size;
-
-         disparityMap = new Image<Gray, short>(size);
         
         //using (StereoSGBM stereoSolver = new StereoSGBM(5, 64, 0))
         using (StereoBM stereoSolver = new StereoBM())
         //using (Mat dm = new Mat())
         {
-            stereoSolver.Compute(left, right, disparityMap);
+            stereoSolver.Compute(left, right, outputDisparityMap);

            float scale = Math.Max(size.Width, size.Height);

@ -74,7 +72,7 @@ namespace Simlpe3DReconstruction
                  {0.0, -1.0, 0.0, size.Height/2}, //shift the y origin to image center and flip it upside down
                  {0.0, 0.0, -1.0, 0.0}, //Multiply the z value by -1.0, 
                  {0.0, 0.0, 0.0, scale}})) //scale the object's corrdinate to within a [-0.5, 0.5] cube
-               points = PointCollection.ReprojectImageTo3D(disparityMap, q);
+               points = PointCollection.ReprojectImageTo3D(outputDisparityMap, q);
         }
      }

--- a/Emgu.CV.Example/Stitching/StitchingMainForm.cs
+++ b/Emgu.CV.Example/Stitching/StitchingMainForm.cs
@ -48,7 +48,9 @@ namespace Stitching
            }
            try
            {
-               using (Stitcher stitcher = new Stitcher(true))
+               //using (Stitcher stitcher = new Stitcher(true))
+               //CUDA bruteforce matcher seems to cause issue in this release, not using CUDA for matching for this reason
+               using (Stitcher stitcher = new Stitcher(false))
               {
                  using (VectorOfMat vm = new VectorOfMat())
                  {
--- a/Emgu.CV.Extern/CMakeLists.txt
+++ b/Emgu.CV.Extern/CMakeLists.txt
@ -203,8 +203,7 @@ IF(ANDROID)
    SET(TESSERACT_INCLUDE_DIRS "${PROJECT_SOURCE_DIR}/tesseract/libtesseract/tesseract-ocr/ccutil" "${PROJECT_SOURCE_DIR}/tesseract/libtesseract/tesseract-ocr/api" "${PROJECT_SOURCE_DIR}/tesseract/libtesseract/tesseract-ocr/ccmain" "${PROJECT_SOURCE_DIR}/tesseract/libtesseract/tesseract-ocr/ccstruct" "${PROJECT_SOURCE_DIR}/tesseract")
    SET(TESSERACT_LIBRARY tesseract_ccstruct tesseract_ccutil tesseract_classify tesseract_cube tesseract_cutil tesseract_dict tesseract_opencl tesseract_neural_networks tesseract_api tesseract_textord tesseract_viewer tesseract_wordrec libleptonica tesseract_ccmain)
  ENDIF()
-ELSE()
-IF(WIN32 OR APPLE)
+ELSEIF(WIN32 OR APPLE)
  IF(NETFX_CORE)
    SET(EMGU_CV_WITH_TESSERACT OFF CACHE BOOL "BUILD OCR")
  ELSE()
@ -227,7 +226,6 @@ ELSE()
    SET(TESSERACT_LIBRARY "")
  ENDIF()
 ENDIF()
-ENDIF()

 IF(EMGU_CV_WITH_TESSERACT)
  INCLUDE_DIRECTORIES(${TESSERACT_INCLUDE_DIRS})
@ -479,8 +477,12 @@ ADD_DEPENDENCIES(${the_target}
  ${OPENCL_PROJ}
  ${ZLIB_LIBRARY} 
 #  xtiff
-  ${TIFF_LIBRARY} ${GEOTIFF_LIBRARY} ${TESSERACT_LIBRARY} ${CVBLOB_LIBRARY} )
+  ${TIFF_LIBRARY} ${GEOTIFF_LIBRARY} ${CVBLOB_LIBRARY} )

+IF(EMGU_CV_WITH_TESSERACT)
+  ADD_DEPENDENCIES(${TESSERACT_LIBRARY})
+ENDIF()
+  
 FOREACH(CVEXTERN_OPTIONAL_DEP ${OPENCV_MODULE_NAMES})
 #  INCLUDE_DIRECTORIES("${OPENCV_MODULES_DIR}/${CVEXTERN_OPTIONAL_DEP}/include")
 #  MESSAGE("Included:  ${OPENCV_MODULES_DIR}/${CVEXTERN_OPTIONAL_DEP}/include")
@ -508,8 +510,12 @@ ENDIF()
 target_link_libraries(${the_target} ${OPENCV_LINKER_LIBS} 
  ${ZLIB_LIBRARY} 
 #  xtiff 
-  ${TESSERACT_LIBRARY} ${CVBLOB_LIBRARY})
+  ${CVBLOB_LIBRARY})

+IF(EMGU_CV_WITH_TESSERACT)
+  ADD_DEPENDENCIES(${TESSERACT_LIBRARY})
+ENDIF()
+  
 IF(DEFINED EMGUCV_PLATFORM_TOOLSET)
  set_target_properties(${the_target} PROPERTIES PLATFORM_TOOLSET ${EMGUCV_PLATFORM_TOOLSET})
 ENDIF()
--- a/Emgu.CV/CMakeLists.txt
+++ b/Emgu.CV/CMakeLists.txt
@ -11,7 +11,7 @@ LIST(APPEND SRC_CV ${CMAKE_CURRENT_SOURCE_DIR}/../CommonAssemblyInfo.cs)

 IF (NETFX_CORE)
  #Remove android, ios or unity related files
-  FILE(GLOB_RECURSE SRC_CV_EXCLUDES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "PInvoke/iOS/*.cs" "PInvoke/Android/*.cs" "PInvoke/Unity/*.cs" "PInvoke/System.Drawing/*.cs"  "StringTable.Designer.cs" )
+  FILE(GLOB_RECURSE SRC_CV_EXCLUDES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "PInvoke/iOS/*.cs" "PInvoke/Android/*.cs" "PInvoke/Unity/*.cs"  "StringTable.Designer.cs" )
 ELSE()
  #Remove android, ios, windows store or unity related files
  FILE(GLOB_RECURSE SRC_CV_EXCLUDES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "PInvoke/iOS/*.cs" "PInvoke/Android/*.cs" "PInvoke/Unity/*.cs" "PInvoke/System.Drawing/*.cs" "PInvoke/Windows.Store/*.cs")
--- a/Emgu.CV/PInvoke/CvInvokeImgproc.cs
+++ b/Emgu.CV/PInvoke/CvInvokeImgproc.cs
@ -1384,7 +1384,7 @@ namespace Emgu.CV
              System.Drawing.Imaging.ImageLockMode.WriteOnly,
             format);
         using (Mat bmpMat = new Mat(size.Height, size.Width, CvEnum.DepthType.Cv8U, numberOfChannels, data.Scan0, data.Stride))
-         using (Mat dataMat = new Mat(size.Height, size.Width, CvEnum.DepthType.Cv8U, numberOfChannels, scan0, step))
+         using (Mat dataMat = new Mat(size.Height, size.Width, CvInvoke.GetDepthType(srcDepthType), numberOfChannels, scan0, step))
         {
            if (srcDepthType == typeof(Byte))
               dataMat.CopyTo(bmpMat);
--- a/Emgu.CV/PointAndLine/PointCollection.cs
+++ b/Emgu.CV/PointAndLine/PointCollection.cs
@ -236,7 +236,7 @@ namespace Emgu.CV
      /// <param name="disparity">Disparity map</param>
      /// <param name="Q">The re-projection 4x4 matrix, can be arbitrary, e.g. the one, computed by cvStereoRectify</param>
      /// <returns>The reprojected 3D points</returns>
-      public static MCvPoint3D32f[] ReprojectImageTo3D(Image<Gray, Int16> disparity, Matrix<double> Q)
+      public static MCvPoint3D32f[] ReprojectImageTo3D(Mat disparity, IInputArray Q)
      {
         Size size = disparity.Size;
         MCvPoint3D32f[] points3D = new MCvPoint3D32f[size.Width * size.Height];
@ -249,6 +249,7 @@ namespace Emgu.CV
         return points3D;
      }

+      /*
      /// <summary>
      /// Re-project pixels on a 1-channel disparity map to array of 3D points.
      /// </summary>
@ -266,7 +267,7 @@ namespace Emgu.CV

         handle.Free();
         return points3D;
-      }
+      }*/

      
      /// <summary>
--- a/Solution/VS2010_2012_2013/Emgu.CV.Example.sln
+++ b/Solution/VS2010_2012_2013/Emgu.CV.Example.sln
@ -3,32 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2012
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HelloWorld", "..\..\Emgu.CV.Example\HelloWorld\HelloWorld.csproj", "{28682DB8-9662-452D-A5AD-646EA7BC8AD0}"
 EndProject
-Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "", "..\..\Emgu.CV.Example\WebDynamicImage", "{CCE4F066-0E44-45FD-A1F3-E4A29C3690A1}"
-	ProjectSection(WebsiteProperties) = preProject
-		SccProjectName = ""
-		SccAuxPath = ""
-		SccLocalPath = ""
-		SccProvider = ""
-		Frontpage = "false"
-		TargetFrameworkMoniker = ".NETFramework,Version%3Dv3.5"
-		ProjectReferences = "{9A1A77FE-F01B-495E-87B7-4B16E4F8C908}|Emgu.CV.dll;{7C2C5325-8235-4A24-9C67-6BD79A4679E2}|Emgu.Util.dll;{FDA79B5F-80C6-41FA-A1D6-82DE69DBB4A1}|Emgu.CV.OCR.dll;"
-		Debug.AspNetCompiler.VirtualPath = "/WebDynamicImage"
-		Debug.AspNetCompiler.PhysicalPath = "..\..\Emgu.CV.Example\WebDynamicImage\"
-		Debug.AspNetCompiler.TargetPath = "PrecompiledWeb\WebDynamicImage\"
-		Debug.AspNetCompiler.Updateable = "true"
-		Debug.AspNetCompiler.ForceOverwrite = "true"
-		Debug.AspNetCompiler.FixedNames = "false"
-		Debug.AspNetCompiler.Debug = "True"
-		Release.AspNetCompiler.VirtualPath = "/WebDynamicImage"
-		Release.AspNetCompiler.PhysicalPath = "..\..\Emgu.CV.Example\WebDynamicImage\"
-		Release.AspNetCompiler.TargetPath = "PrecompiledWeb\WebDynamicImage\"
-		Release.AspNetCompiler.Updateable = "true"
-		Release.AspNetCompiler.ForceOverwrite = "true"
-		Release.AspNetCompiler.FixedNames = "false"
-		Release.AspNetCompiler.Debug = "False"
-		VWDPort = "4336"
-	EndProjectSection
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FaceDetection", "..\..\Emgu.CV.Example\FaceDetection\FaceDetection.csproj", "{B2C15B1D-BF04-4CBC-AF22-0ECF38591B09}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Webservice_Host", "..\..\Emgu.CV.Example\Webservice_Host\Webservice_Host.csproj", "{BDCC078C-8D14-47DC-850D-9D5731503AEC}"
@ -93,30 +67,42 @@ Global
 		{28682DB8-9662-452D-A5AD-646EA7BC8AD0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{28682DB8-9662-452D-A5AD-646EA7BC8AD0}.Release|Any CPU.Build.0 = Release|Any CPU
 		{28682DB8-9662-452D-A5AD-646EA7BC8AD0}.Release|x86.ActiveCfg = Release|Any CPU
-		{288B46AF-CD8E-4503-BBEF-7D295A5D9E13}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{288B46AF-CD8E-4503-BBEF-7D295A5D9E13}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{288B46AF-CD8E-4503-BBEF-7D295A5D9E13}.Debug|x86.ActiveCfg = Release|Any CPU
-		{288B46AF-CD8E-4503-BBEF-7D295A5D9E13}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{288B46AF-CD8E-4503-BBEF-7D295A5D9E13}.Release|Any CPU.Build.0 = Release|Any CPU
-		{288B46AF-CD8E-4503-BBEF-7D295A5D9E13}.Release|x86.ActiveCfg = Release|Any CPU
-		{2E4D76A0-B239-4E48-8E9C-3A936CBD1DF1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2E4D76A0-B239-4E48-8E9C-3A936CBD1DF1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2E4D76A0-B239-4E48-8E9C-3A936CBD1DF1}.Debug|x86.ActiveCfg = Release|Any CPU
-		{2E4D76A0-B239-4E48-8E9C-3A936CBD1DF1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2E4D76A0-B239-4E48-8E9C-3A936CBD1DF1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2E4D76A0-B239-4E48-8E9C-3A936CBD1DF1}.Release|x86.ActiveCfg = Release|Any CPU
-		{32BFC19B-AE74-413F-90FC-345CBCE13B69}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{32BFC19B-AE74-413F-90FC-345CBCE13B69}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{32BFC19B-AE74-413F-90FC-345CBCE13B69}.Debug|x86.ActiveCfg = Release|Any CPU
-		{32BFC19B-AE74-413F-90FC-345CBCE13B69}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{32BFC19B-AE74-413F-90FC-345CBCE13B69}.Release|Any CPU.Build.0 = Release|Any CPU
-		{32BFC19B-AE74-413F-90FC-345CBCE13B69}.Release|x86.ActiveCfg = Release|Any CPU
-		{331F904E-E7E8-42E0-8C82-22539C35E8F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{331F904E-E7E8-42E0-8C82-22539C35E8F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{331F904E-E7E8-42E0-8C82-22539C35E8F3}.Debug|x86.ActiveCfg = Release|Any CPU
-		{331F904E-E7E8-42E0-8C82-22539C35E8F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{331F904E-E7E8-42E0-8C82-22539C35E8F3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{331F904E-E7E8-42E0-8C82-22539C35E8F3}.Release|x86.ActiveCfg = Release|Any CPU
+		{B2C15B1D-BF04-4CBC-AF22-0ECF38591B09}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B2C15B1D-BF04-4CBC-AF22-0ECF38591B09}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B2C15B1D-BF04-4CBC-AF22-0ECF38591B09}.Debug|x86.ActiveCfg = Release|Any CPU
+		{B2C15B1D-BF04-4CBC-AF22-0ECF38591B09}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B2C15B1D-BF04-4CBC-AF22-0ECF38591B09}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B2C15B1D-BF04-4CBC-AF22-0ECF38591B09}.Release|x86.ActiveCfg = Release|Any CPU
+		{BDCC078C-8D14-47DC-850D-9D5731503AEC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BDCC078C-8D14-47DC-850D-9D5731503AEC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BDCC078C-8D14-47DC-850D-9D5731503AEC}.Debug|x86.ActiveCfg = Release|Any CPU
+		{BDCC078C-8D14-47DC-850D-9D5731503AEC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BDCC078C-8D14-47DC-850D-9D5731503AEC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BDCC078C-8D14-47DC-850D-9D5731503AEC}.Release|x86.ActiveCfg = Release|Any CPU
+		{94C0C68E-E46F-4228-9DFF-148F9498BC0E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{94C0C68E-E46F-4228-9DFF-148F9498BC0E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{94C0C68E-E46F-4228-9DFF-148F9498BC0E}.Debug|x86.ActiveCfg = Release|Any CPU
+		{94C0C68E-E46F-4228-9DFF-148F9498BC0E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{94C0C68E-E46F-4228-9DFF-148F9498BC0E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{94C0C68E-E46F-4228-9DFF-148F9498BC0E}.Release|x86.ActiveCfg = Release|Any CPU
+		{5F6B97F8-7EA6-4B5D-9A5D-F5581505C303}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5F6B97F8-7EA6-4B5D-9A5D-F5581505C303}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5F6B97F8-7EA6-4B5D-9A5D-F5581505C303}.Debug|x86.ActiveCfg = Release|Any CPU
+		{5F6B97F8-7EA6-4B5D-9A5D-F5581505C303}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5F6B97F8-7EA6-4B5D-9A5D-F5581505C303}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5F6B97F8-7EA6-4B5D-9A5D-F5581505C303}.Release|x86.ActiveCfg = Release|Any CPU
+		{9A1A77FE-F01B-495E-87B7-4B16E4F8C908}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9A1A77FE-F01B-495E-87B7-4B16E4F8C908}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9A1A77FE-F01B-495E-87B7-4B16E4F8C908}.Debug|x86.ActiveCfg = Release|Any CPU
+		{9A1A77FE-F01B-495E-87B7-4B16E4F8C908}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9A1A77FE-F01B-495E-87B7-4B16E4F8C908}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9A1A77FE-F01B-495E-87B7-4B16E4F8C908}.Release|x86.ActiveCfg = Release|Any CPU
+		{7C2C5325-8235-4A24-9C67-6BD79A4679E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7C2C5325-8235-4A24-9C67-6BD79A4679E2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7C2C5325-8235-4A24-9C67-6BD79A4679E2}.Debug|x86.ActiveCfg = Release|Any CPU
+		{7C2C5325-8235-4A24-9C67-6BD79A4679E2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7C2C5325-8235-4A24-9C67-6BD79A4679E2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7C2C5325-8235-4A24-9C67-6BD79A4679E2}.Release|x86.ActiveCfg = Release|Any CPU
 		{3EC66D5C-1B05-4B4F-BB13-82BD76C992EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3EC66D5C-1B05-4B4F-BB13-82BD76C992EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3EC66D5C-1B05-4B4F-BB13-82BD76C992EE}.Debug|x86.ActiveCfg = Release|Any CPU
@ -129,119 +115,113 @@ Global
 		{4220DDC1-A966-4BB3-BD36-5A0110819E84}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4220DDC1-A966-4BB3-BD36-5A0110819E84}.Release|Any CPU.Build.0 = Release|Any CPU
 		{4220DDC1-A966-4BB3-BD36-5A0110819E84}.Release|x86.ActiveCfg = Release|Any CPU
-		{47BEBAD5-35F2-45D9-A1AF-78F240DCA7FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{47BEBAD5-35F2-45D9-A1AF-78F240DCA7FE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{47BEBAD5-35F2-45D9-A1AF-78F240DCA7FE}.Debug|x86.ActiveCfg = Release|Any CPU
-		{47BEBAD5-35F2-45D9-A1AF-78F240DCA7FE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{47BEBAD5-35F2-45D9-A1AF-78F240DCA7FE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{47BEBAD5-35F2-45D9-A1AF-78F240DCA7FE}.Release|x86.ActiveCfg = Release|Any CPU
+		{F42D1B92-5722-41F4-B8F1-98185CD09D87}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F42D1B92-5722-41F4-B8F1-98185CD09D87}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F42D1B92-5722-41F4-B8F1-98185CD09D87}.Debug|x86.ActiveCfg = Release|Any CPU
+		{F42D1B92-5722-41F4-B8F1-98185CD09D87}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F42D1B92-5722-41F4-B8F1-98185CD09D87}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F42D1B92-5722-41F4-B8F1-98185CD09D87}.Release|x86.ActiveCfg = Release|Any CPU
 		{56AFFD9E-A27E-43BA-AAB5-8FEED098384D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{56AFFD9E-A27E-43BA-AAB5-8FEED098384D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{56AFFD9E-A27E-43BA-AAB5-8FEED098384D}.Debug|x86.ActiveCfg = Release|Any CPU
 		{56AFFD9E-A27E-43BA-AAB5-8FEED098384D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{56AFFD9E-A27E-43BA-AAB5-8FEED098384D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{56AFFD9E-A27E-43BA-AAB5-8FEED098384D}.Release|x86.ActiveCfg = Release|Any CPU
-		{5F6B97F8-7EA6-4B5D-9A5D-F5581505C303}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5F6B97F8-7EA6-4B5D-9A5D-F5581505C303}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5F6B97F8-7EA6-4B5D-9A5D-F5581505C303}.Debug|x86.ActiveCfg = Release|Any CPU
-		{5F6B97F8-7EA6-4B5D-9A5D-F5581505C303}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5F6B97F8-7EA6-4B5D-9A5D-F5581505C303}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5F6B97F8-7EA6-4B5D-9A5D-F5581505C303}.Release|x86.ActiveCfg = Release|Any CPU
-		{787D75D2-FE4D-4739-B9A5-2FB2617A42CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{787D75D2-FE4D-4739-B9A5-2FB2617A42CC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{787D75D2-FE4D-4739-B9A5-2FB2617A42CC}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{787D75D2-FE4D-4739-B9A5-2FB2617A42CC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{787D75D2-FE4D-4739-B9A5-2FB2617A42CC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{787D75D2-FE4D-4739-B9A5-2FB2617A42CC}.Release|x86.ActiveCfg = Release|Any CPU
-		{7C2C5325-8235-4A24-9C67-6BD79A4679E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7C2C5325-8235-4A24-9C67-6BD79A4679E2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7C2C5325-8235-4A24-9C67-6BD79A4679E2}.Debug|x86.ActiveCfg = Release|Any CPU
-		{7C2C5325-8235-4A24-9C67-6BD79A4679E2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7C2C5325-8235-4A24-9C67-6BD79A4679E2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7C2C5325-8235-4A24-9C67-6BD79A4679E2}.Release|x86.ActiveCfg = Release|Any CPU
-		{7F6AA856-B9EF-4F86-BDD4-1D9DB596C8FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7F6AA856-B9EF-4F86-BDD4-1D9DB596C8FF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7F6AA856-B9EF-4F86-BDD4-1D9DB596C8FF}.Debug|x86.ActiveCfg = Release|Any CPU
-		{7F6AA856-B9EF-4F86-BDD4-1D9DB596C8FF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7F6AA856-B9EF-4F86-BDD4-1D9DB596C8FF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7F6AA856-B9EF-4F86-BDD4-1D9DB596C8FF}.Release|x86.ActiveCfg = Release|Any CPU
-		{8728CB1F-F193-4F75-AEA9-221AA85A3E80}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8728CB1F-F193-4F75-AEA9-221AA85A3E80}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8728CB1F-F193-4F75-AEA9-221AA85A3E80}.Debug|x86.ActiveCfg = Release|Any CPU
-		{8728CB1F-F193-4F75-AEA9-221AA85A3E80}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8728CB1F-F193-4F75-AEA9-221AA85A3E80}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8728CB1F-F193-4F75-AEA9-221AA85A3E80}.Release|x86.ActiveCfg = Release|Any CPU
-		{89E9015F-DECF-4774-95DA-7F7D22B0A12F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{89E9015F-DECF-4774-95DA-7F7D22B0A12F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{89E9015F-DECF-4774-95DA-7F7D22B0A12F}.Debug|x86.ActiveCfg = Release|Any CPU
-		{89E9015F-DECF-4774-95DA-7F7D22B0A12F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{89E9015F-DECF-4774-95DA-7F7D22B0A12F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{89E9015F-DECF-4774-95DA-7F7D22B0A12F}.Release|x86.ActiveCfg = Release|Any CPU
 		{90E78BBF-C7FE-4D8E-ADE1-75448E866FDB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{90E78BBF-C7FE-4D8E-ADE1-75448E866FDB}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{90E78BBF-C7FE-4D8E-ADE1-75448E866FDB}.Debug|x86.ActiveCfg = Release|Any CPU
 		{90E78BBF-C7FE-4D8E-ADE1-75448E866FDB}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{90E78BBF-C7FE-4D8E-ADE1-75448E866FDB}.Release|Any CPU.Build.0 = Release|Any CPU
 		{90E78BBF-C7FE-4D8E-ADE1-75448E866FDB}.Release|x86.ActiveCfg = Release|Any CPU
-		{94C0C68E-E46F-4228-9DFF-148F9498BC0E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{94C0C68E-E46F-4228-9DFF-148F9498BC0E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{94C0C68E-E46F-4228-9DFF-148F9498BC0E}.Debug|x86.ActiveCfg = Release|Any CPU
-		{94C0C68E-E46F-4228-9DFF-148F9498BC0E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{94C0C68E-E46F-4228-9DFF-148F9498BC0E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{94C0C68E-E46F-4228-9DFF-148F9498BC0E}.Release|x86.ActiveCfg = Release|Any CPU
-		{9A1A77FE-F01B-495E-87B7-4B16E4F8C908}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9A1A77FE-F01B-495E-87B7-4B16E4F8C908}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9A1A77FE-F01B-495E-87B7-4B16E4F8C908}.Debug|x86.ActiveCfg = Release|Any CPU
-		{9A1A77FE-F01B-495E-87B7-4B16E4F8C908}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9A1A77FE-F01B-495E-87B7-4B16E4F8C908}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9A1A77FE-F01B-495E-87B7-4B16E4F8C908}.Release|x86.ActiveCfg = Release|Any CPU
-		{B2C15B1D-BF04-4CBC-AF22-0ECF38591B09}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B2C15B1D-BF04-4CBC-AF22-0ECF38591B09}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B2C15B1D-BF04-4CBC-AF22-0ECF38591B09}.Debug|x86.ActiveCfg = Release|Any CPU
-		{B2C15B1D-BF04-4CBC-AF22-0ECF38591B09}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B2C15B1D-BF04-4CBC-AF22-0ECF38591B09}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B2C15B1D-BF04-4CBC-AF22-0ECF38591B09}.Release|x86.ActiveCfg = Release|Any CPU
-		{BDCC078C-8D14-47DC-850D-9D5731503AEC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BDCC078C-8D14-47DC-850D-9D5731503AEC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BDCC078C-8D14-47DC-850D-9D5731503AEC}.Debug|x86.ActiveCfg = Release|Any CPU
-		{BDCC078C-8D14-47DC-850D-9D5731503AEC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BDCC078C-8D14-47DC-850D-9D5731503AEC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BDCC078C-8D14-47DC-850D-9D5731503AEC}.Release|x86.ActiveCfg = Release|Any CPU
-		{D9C9B824-2B7A-48C0-A7D3-484410288CD2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D9C9B824-2B7A-48C0-A7D3-484410288CD2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D9C9B824-2B7A-48C0-A7D3-484410288CD2}.Debug|x86.ActiveCfg = Release|Any CPU
-		{D9C9B824-2B7A-48C0-A7D3-484410288CD2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D9C9B824-2B7A-48C0-A7D3-484410288CD2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D9C9B824-2B7A-48C0-A7D3-484410288CD2}.Release|x86.ActiveCfg = Release|Any CPU
-		{E5902195-9FC7-4A96-BA4B-5AFE17E13EC8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E5902195-9FC7-4A96-BA4B-5AFE17E13EC8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E5902195-9FC7-4A96-BA4B-5AFE17E13EC8}.Debug|x86.ActiveCfg = Release|Any CPU
-		{E5902195-9FC7-4A96-BA4B-5AFE17E13EC8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E5902195-9FC7-4A96-BA4B-5AFE17E13EC8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E5902195-9FC7-4A96-BA4B-5AFE17E13EC8}.Release|x86.ActiveCfg = Release|Any CPU
+		{288B46AF-CD8E-4503-BBEF-7D295A5D9E13}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{288B46AF-CD8E-4503-BBEF-7D295A5D9E13}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{288B46AF-CD8E-4503-BBEF-7D295A5D9E13}.Debug|x86.ActiveCfg = Release|Any CPU
+		{288B46AF-CD8E-4503-BBEF-7D295A5D9E13}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{288B46AF-CD8E-4503-BBEF-7D295A5D9E13}.Release|Any CPU.Build.0 = Release|Any CPU
+		{288B46AF-CD8E-4503-BBEF-7D295A5D9E13}.Release|x86.ActiveCfg = Release|Any CPU
 		{E8A4DE5C-BE26-445F-BEBD-8C99C80857E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E8A4DE5C-BE26-445F-BEBD-8C99C80857E1}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E8A4DE5C-BE26-445F-BEBD-8C99C80857E1}.Debug|x86.ActiveCfg = Release|Any CPU
 		{E8A4DE5C-BE26-445F-BEBD-8C99C80857E1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E8A4DE5C-BE26-445F-BEBD-8C99C80857E1}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E8A4DE5C-BE26-445F-BEBD-8C99C80857E1}.Release|x86.ActiveCfg = Release|Any CPU
-		{F42D1B92-5722-41F4-B8F1-98185CD09D87}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F42D1B92-5722-41F4-B8F1-98185CD09D87}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F42D1B92-5722-41F4-B8F1-98185CD09D87}.Debug|x86.ActiveCfg = Release|Any CPU
-		{F42D1B92-5722-41F4-B8F1-98185CD09D87}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F42D1B92-5722-41F4-B8F1-98185CD09D87}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F42D1B92-5722-41F4-B8F1-98185CD09D87}.Release|x86.ActiveCfg = Release|Any CPU
+		{2E4D76A0-B239-4E48-8E9C-3A936CBD1DF1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2E4D76A0-B239-4E48-8E9C-3A936CBD1DF1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2E4D76A0-B239-4E48-8E9C-3A936CBD1DF1}.Debug|x86.ActiveCfg = Release|Any CPU
+		{2E4D76A0-B239-4E48-8E9C-3A936CBD1DF1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2E4D76A0-B239-4E48-8E9C-3A936CBD1DF1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2E4D76A0-B239-4E48-8E9C-3A936CBD1DF1}.Release|x86.ActiveCfg = Release|Any CPU
+		{E5902195-9FC7-4A96-BA4B-5AFE17E13EC8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E5902195-9FC7-4A96-BA4B-5AFE17E13EC8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E5902195-9FC7-4A96-BA4B-5AFE17E13EC8}.Debug|x86.ActiveCfg = Release|Any CPU
+		{E5902195-9FC7-4A96-BA4B-5AFE17E13EC8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E5902195-9FC7-4A96-BA4B-5AFE17E13EC8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E5902195-9FC7-4A96-BA4B-5AFE17E13EC8}.Release|x86.ActiveCfg = Release|Any CPU
+		{47BEBAD5-35F2-45D9-A1AF-78F240DCA7FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{47BEBAD5-35F2-45D9-A1AF-78F240DCA7FE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{47BEBAD5-35F2-45D9-A1AF-78F240DCA7FE}.Debug|x86.ActiveCfg = Release|Any CPU
+		{47BEBAD5-35F2-45D9-A1AF-78F240DCA7FE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{47BEBAD5-35F2-45D9-A1AF-78F240DCA7FE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{47BEBAD5-35F2-45D9-A1AF-78F240DCA7FE}.Release|x86.ActiveCfg = Release|Any CPU
+		{89E9015F-DECF-4774-95DA-7F7D22B0A12F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{89E9015F-DECF-4774-95DA-7F7D22B0A12F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{89E9015F-DECF-4774-95DA-7F7D22B0A12F}.Debug|x86.ActiveCfg = Release|Any CPU
+		{89E9015F-DECF-4774-95DA-7F7D22B0A12F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{89E9015F-DECF-4774-95DA-7F7D22B0A12F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{89E9015F-DECF-4774-95DA-7F7D22B0A12F}.Release|x86.ActiveCfg = Release|Any CPU
+		{B1D43BE6-AF83-41E5-990E-3E163CE42C79}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B1D43BE6-AF83-41E5-990E-3E163CE42C79}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B1D43BE6-AF83-41E5-990E-3E163CE42C79}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B1D43BE6-AF83-41E5-990E-3E163CE42C79}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B1D43BE6-AF83-41E5-990E-3E163CE42C79}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B1D43BE6-AF83-41E5-990E-3E163CE42C79}.Release|x86.ActiveCfg = Release|Any CPU
+		{8728CB1F-F193-4F75-AEA9-221AA85A3E80}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8728CB1F-F193-4F75-AEA9-221AA85A3E80}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8728CB1F-F193-4F75-AEA9-221AA85A3E80}.Debug|x86.ActiveCfg = Release|Any CPU
+		{8728CB1F-F193-4F75-AEA9-221AA85A3E80}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8728CB1F-F193-4F75-AEA9-221AA85A3E80}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8728CB1F-F193-4F75-AEA9-221AA85A3E80}.Release|x86.ActiveCfg = Release|Any CPU
+		{7F6AA856-B9EF-4F86-BDD4-1D9DB596C8FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7F6AA856-B9EF-4F86-BDD4-1D9DB596C8FF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7F6AA856-B9EF-4F86-BDD4-1D9DB596C8FF}.Debug|x86.ActiveCfg = Release|Any CPU
+		{7F6AA856-B9EF-4F86-BDD4-1D9DB596C8FF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7F6AA856-B9EF-4F86-BDD4-1D9DB596C8FF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7F6AA856-B9EF-4F86-BDD4-1D9DB596C8FF}.Release|x86.ActiveCfg = Release|Any CPU
 		{FDA79B5F-80C6-41FA-A1D6-82DE69DBB4A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{FDA79B5F-80C6-41FA-A1D6-82DE69DBB4A1}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{FDA79B5F-80C6-41FA-A1D6-82DE69DBB4A1}.Debug|x86.ActiveCfg = Release|Any CPU
 		{FDA79B5F-80C6-41FA-A1D6-82DE69DBB4A1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FDA79B5F-80C6-41FA-A1D6-82DE69DBB4A1}.Release|Any CPU.Build.0 = Release|Any CPU
 		{FDA79B5F-80C6-41FA-A1D6-82DE69DBB4A1}.Release|x86.ActiveCfg = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(MonoDevelopProperties) = preSolution
-		StartupItem = ..\..\Emgu.CV.Example\PedestrianDetection\PedestrianDetection.csproj
+		{32BFC19B-AE74-413F-90FC-345CBCE13B69}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{32BFC19B-AE74-413F-90FC-345CBCE13B69}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{32BFC19B-AE74-413F-90FC-345CBCE13B69}.Debug|x86.ActiveCfg = Release|Any CPU
+		{32BFC19B-AE74-413F-90FC-345CBCE13B69}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{32BFC19B-AE74-413F-90FC-345CBCE13B69}.Release|Any CPU.Build.0 = Release|Any CPU
+		{32BFC19B-AE74-413F-90FC-345CBCE13B69}.Release|x86.ActiveCfg = Release|Any CPU
+		{331F904E-E7E8-42E0-8C82-22539C35E8F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{331F904E-E7E8-42E0-8C82-22539C35E8F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{331F904E-E7E8-42E0-8C82-22539C35E8F3}.Debug|x86.ActiveCfg = Release|Any CPU
+		{331F904E-E7E8-42E0-8C82-22539C35E8F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{331F904E-E7E8-42E0-8C82-22539C35E8F3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{331F904E-E7E8-42E0-8C82-22539C35E8F3}.Release|x86.ActiveCfg = Release|Any CPU
+		{D9C9B824-2B7A-48C0-A7D3-484410288CD2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D9C9B824-2B7A-48C0-A7D3-484410288CD2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D9C9B824-2B7A-48C0-A7D3-484410288CD2}.Debug|x86.ActiveCfg = Release|Any CPU
+		{D9C9B824-2B7A-48C0-A7D3-484410288CD2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D9C9B824-2B7A-48C0-A7D3-484410288CD2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D9C9B824-2B7A-48C0-A7D3-484410288CD2}.Release|x86.ActiveCfg = Release|Any CPU
+		{787D75D2-FE4D-4739-B9A5-2FB2617A42CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{787D75D2-FE4D-4739-B9A5-2FB2617A42CC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{787D75D2-FE4D-4739-B9A5-2FB2617A42CC}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{787D75D2-FE4D-4739-B9A5-2FB2617A42CC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{787D75D2-FE4D-4739-B9A5-2FB2617A42CC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{787D75D2-FE4D-4739-B9A5-2FB2617A42CC}.Release|x86.ActiveCfg = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(MonoDevelopProperties) = preSolution
+		StartupItem = ..\..\Emgu.CV.Example\PedestrianDetection\PedestrianDetection.csproj
+	EndGlobalSection
 EndGlobal
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 4d03e91b0e4f5c3dda746e2d02464cae05809a4f
+Subproject commit 50ac3936759cea85145cb8d73f27fe610bfdfeab
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 468d3ecc49046bacc8cd9fa9cca38f44d9d880fd
+Subproject commit 71b1b965bb68a884ad88aeef36dd09d313005ed7