Przeglądaj źródła

1、重新在outputWnd定义max为Max,避免与cv::max冲突;

Jeff 6 lat temu
rodzic
commit
e010406db0
3 zmienionych plików z 20 dodań i 1 usunięć
  1. 6 0
      IDE/IDE/IDE.vcxproj
  2. 3 1
      IDE/IDE/OutputWnd.cpp
  3. 11 0
      IDE/IDE/stdafx.h

+ 6 - 0
IDE/IDE/IDE.vcxproj

@@ -67,6 +67,7 @@
       <PrecompiledHeader>Use</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <AdditionalIncludeDirectories>..\include</AdditionalIncludeDirectories>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -77,6 +78,8 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
+      <AdditionalLibraryDirectories>..\lib\Debug\</AdditionalLibraryDirectories>
+      <AdditionalDependencies>opencv_core342d.lib;opencv_imgproc342d.lib;opencv_highgui342d.lib;opencv_ml342d.lib;opencv_video342d.lib;opencv_features2d342d.lib;opencv_calib3d342d.lib;opencv_objdetect342d.lib;opencv_flann342d.lib;opencv_dnn342d.lib;opencv_imgcodecs342d.lib;opencv_photo342d.lib;opencv_shape342d.lib;opencv_stitching342d.lib;opencv_superres342d.lib;opencv_videoio342d.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -95,6 +98,7 @@
       <PrecompiledHeader>Use</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <AdditionalIncludeDirectories>..\include</AdditionalIncludeDirectories>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -107,6 +111,8 @@
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <TargetMachine>MachineX86</TargetMachine>
+      <AdditionalLibraryDirectories>..\lib\Release\</AdditionalLibraryDirectories>
+      <AdditionalDependencies>opencv_core342.lib;opencv_imgproc342.lib;opencv_highgui342.lib;opencv_ml342.lib;opencv_video342.lib;opencv_features2d342.lib;opencv_calib3d342.lib;opencv_objdetect342.lib;opencv_flann342.lib;opencv_dnn342.lib;opencv_imgcodecs342.lib;opencv_photo342.lib;opencv_shape342.lib;opencv_stitching342.lib;opencv_superres342.lib;opencv_videoio342.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>

+ 3 - 1
IDE/IDE/OutputWnd.cpp

@@ -15,6 +15,8 @@
 #include "Resource.h"
 #include "MainFrm.h"
 
+#define Max(a,b) (((a) > (b)) ? (a) : (b))
+
 #ifdef _DEBUG
 #define new DEBUG_NEW
 #undef THIS_FILE
@@ -111,7 +113,7 @@ void COutputWnd::AdjustHorzScroll(CListBox& wndListBox)
 		CString strItem;
 		wndListBox.GetText(i, strItem);
 
-		cxExtentMax = max(cxExtentMax, dc.GetTextExtent(strItem).cx);
+		cxExtentMax = Max(cxExtentMax, dc.GetTextExtent(strItem).cx);
 	}
 
 	wndListBox.SetHorizontalExtent(cxExtentMax);

+ 11 - 0
IDE/IDE/stdafx.h

@@ -58,6 +58,17 @@
 #define __STYLE__ 0
 
 
+//////////////////////////////////////////////////////////////////////////
+// Opencv͡ÎÄźţ;
+#include <opencv2/imgproc/imgproc.hpp>  // Gaussian Blur
+#include <opencv2/core/core.hpp>        // Basic OpenCV structures (cv::Mat, Scalar)
+#include <opencv2/highgui/highgui.hpp>  // OpenCV window I/O
+
+using namespace std;
+using namespace cv;
+// Opencv͡ÎÄźţ;
+//////////////////////////////////////////////////////////////////////////
+
 
 
 #ifdef _UNICODE