Commits

Anonymous committed d6f6b4a Merge

Merge with multi_kinect_locator

  • Participants
  • Parent commits c6af75a, d7ab86c
  • Branches system_integration

Comments (0)

Files changed (2)

QuadTrack/Locator.h

 
 	// Individual marker identification functions
 	void getMarker(const Mat& image, Marker* marker, Marker::Type type = Marker::Empty);
-	//void getBlueMarker(const Mat& image, Marker* blueMarker);
-	//void getGreenMarker(const Mat& image, Marker* greenMarker);
-	//void getOrangeMarker(const Mat& image, Marker* orangeMarker);
-	//void getWhiteMarker(const Mat& image, Marker* whiteMarker);
 	
 	// Marker functions
 	void getMarkers(const Mat& image, vector<Marker>* markers);

QuadTrack/QuadTrack.vcxproj

     <IncludePath>$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;$(SolutionDir)\Sockets-2.3.9.5\Project.net\Include;$(OPEN_CV_INCLUDE);$(OPEN_NI_INCLUDE)</IncludePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LibraryPath>$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSdkDir)lib;$(FrameworkSDKDir)\lib;$(SolutionDir)\Sockets-2.3.9.5\Project.net\lib\D$(OPEN_CV_LIB);$(OPEN_NI_LIB)</LibraryPath>
+    <LibraryPath>$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSdkDir)lib;$(FrameworkSDKDir)\lib;$(SolutionDir)\Sockets-2.3.9.5\Project.net\lib\D;$(OPEN_CV_LIB);$(OPEN_NI_LIB)</LibraryPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <SourcePath>$(VCInstallDir)atlmfc\src\mfc;$(VCInstallDir)atlmfc\src\mfcm;$(VCInstallDir)atlmfc\src\atl;$(VCInstallDir)crt\src;$(SolutionDir)\Sockets-2.3.9.5;$(OPEN_CV_SRC)</SourcePath>