升级到VS2019,x64,OpenCV3416,去掉了编译产生的文件

ApplySaliencyToSurfaceInspection/ApplySaliencyToSurfaceInspection.vcxproj

@@ -27,26 +27,26 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
@@ -78,6 +78,8 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>true</LinkIncremental>
+    <IncludePath>E:\Temp\OpenCV3.4\build\include;E:\Temp\OpenCV3.4\build\include\opencv;E:\Temp\OpenCV3.4\build\include\opencv2;$(IncludePath)</IncludePath>
+    <LibraryPath>E:\Temp\OpenCV3.4\build\x64\vc14\lib;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -143,6 +145,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>opencv_world3416.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>

ApplySaliencyToSurfaceInspection/itti/itti.cpp

@@ -5,12 +5,15 @@
 #include "opencv2/imgproc/imgproc.hpp"
 #include "opencv2/imgcodecs.hpp"
 #include "opencv2/highgui/highgui.hpp"
-#include<math.h>
+#include <math.h>
 #include <opencv2/opencv.hpp>
 #include <fstream>
 #include <vector>
 #include <time.h>
-#include<algorithm>
+#include <algorithm>
+
+
+
 void ITTI::calculateSaliencyMap(const Mat* src, Mat* dst, int corlor, int scaleBase)
 {
 	createChannels(src);//Create a pyramid for 9 layers.The top is same as src img
@@ -175,23 +178,36 @@ void ITTI::createOrientationFeatureMaps(int orientation)
 	int delta[2] = { 3, 4 };
 	CvGabor *gabor = new CvGabor(orientation, 0);
 	IplImage* gbr_fineScaleImage, *gbr_coarseScaleImage;
+
+	CvSize sizeTemp;
 
 	for (int scaleIndex = 0; scaleIndex < fineScaleNumber; scaleIndex++)
 	{
 		Mat fineScaleImage = gaussianPyramid_I.at(c[scaleIndex]);
 		Size fineScaleImageSize = fineScaleImage.size();
 
-		IplImage src_fineScaleImage = IplImage(fineScaleImage);
-		gbr_fineScaleImage = cvCreateImage(fineScaleImage.size(), IPL_DEPTH_8U, 1);
+		//IplImage src_fineScaleImage = IplImage(fineScaleImage);
+		//IplImage src_fineScaleImage = cvarrToMat(fineScaleImage);
+		IplImage src_fineScaleImage = cvIplImage(fineScaleImage);
+
+		sizeTemp.width = fineScaleImage.cols; sizeTemp.height = fineScaleImage.rows;
+		//gbr_fineScaleImage = cvCreateImage(src_fineScaleImage..size(), IPL_DEPTH_8U, 1);
+		gbr_fineScaleImage = cvCreateImage(sizeTemp, IPL_DEPTH_8U, 1);
+
 		gabor->conv_img(&src_fineScaleImage, gbr_fineScaleImage, CV_GABOR_REAL);
 		Mat src_responseImg = cvarrToMat(gbr_fineScaleImage);
 
 		for (int scaleDiffIndex = 0; scaleDiffIndex<scaleDiff; scaleDiffIndex++)
 		{
 			int s = c[scaleIndex] + delta[scaleDiffIndex];
 			Mat coarseScaleImage = gaussianPyramid_I.at(s);
-			IplImage src_coarseScaleImage = IplImage(coarseScaleImage);
-			gbr_coarseScaleImage = cvCreateImage(coarseScaleImage.size(), IPL_DEPTH_8U, 1);
+			//IplImage src_coarseScaleImage = IplImage(coarseScaleImage);
+			IplImage src_coarseScaleImage = cvIplImage(coarseScaleImage);
+
+			//gbr_coarseScaleImage = cvCreateImage(coarseScaleImage.size(), IPL_DEPTH_8U, 1);
+			sizeTemp.width = coarseScaleImage.cols; sizeTemp.height = coarseScaleImage.rows;
+			gbr_coarseScaleImage = cvCreateImage(sizeTemp, IPL_DEPTH_8U, 1);
+
 			gabor->conv_img(&src_coarseScaleImage, gbr_coarseScaleImage, CV_GABOR_REAL);
 			Mat coarse_responseImg = cvarrToMat(gbr_coarseScaleImage);
 

opencv31vs2013x64r.props

@@ -8,7 +8,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup>
     <Link>
-      <AdditionalDependencies>opencv_world310.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>opencv_world3416.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup />