change vcxproj and filters for compatiable in windows

v1.6alpha
liuruoze 10 years ago
parent 9fc21b47f7
commit eaa6604031

@ -160,7 +160,7 @@ void libfacerec::sortMatrixColumnsByIndices(InputArray _src, InputArray _indices
vector<int> indices = _indices.getMat();
_dst.create(src.rows, src.cols, src.type());
Mat dst = _dst.getMat();
for(int idx = 0; idx < indices.size(); idx++) {
for(size_t idx = 0; idx < indices.size(); idx++) {
Mat originalCol = src.col(indices[idx]);
Mat sortedCol = dst.col(idx);
originalCol.copyTo(sortedCol);
@ -185,7 +185,7 @@ void libfacerec::sortMatrixRowsByIndices(InputArray _src, InputArray _indices, O
vector<int> indices = _indices.getMat();
_dst.create(src.rows, src.cols, src.type());
Mat dst = _dst.getMat();
for(int idx = 0; idx < indices.size(); idx++) {
for (size_t idx = 0; idx < indices.size(); idx++) {
Mat originalRow = src.row(indices[idx]);
Mat sortedRow = dst.row(idx);
originalRow.copyTo(sortedRow);
@ -216,7 +216,7 @@ Mat libfacerec::asRowMatrix(InputArrayOfArrays src, int rtype, double alpha, dou
// create data matrix
Mat data(n, d, rtype);
// now copy data
for(int i = 0; i < n; i++) {
for (size_t i = 0; i < n; i++) {
// make sure data can be reshaped, throw exception if not!
if(src.getMat(i).total() != d) {
string error_message = format("Wrong number of elements in matrix #%d! Expected %d was %d.", i, d, src.getMat(i).total());

@ -89,7 +89,7 @@
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(OPENCV)\include;$(SolutionDir)include</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(OPENCV)\include;$(SolutionDir)include;$(SolutionDir)</AdditionalIncludeDirectories>
<DisableSpecificWarnings>4819</DisableSpecificWarnings>
</ClCompile>
<Link>
@ -160,13 +160,13 @@
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\test\main.cpp" />
<ClCompile Include="..\test\xml\xmlParser.cpp" />
<ClCompile Include="..\thirdparty\xmlParser\xmlParser.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\test\accuracy.hpp" />
<ClInclude Include="..\test\chars.hpp" />
<ClInclude Include="..\test\plate.hpp" />
<ClInclude Include="..\test\xml\xmlParser.h" />
<ClInclude Include="..\thirdparty\xmlParser\xmlParser.h" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="libeasypr.vcxproj">

@ -18,7 +18,7 @@
<ClCompile Include="..\test\main.cpp">
<Filter>源文件</Filter>
</ClCompile>
<ClCompile Include="..\test\xml\xmlParser.cpp">
<ClCompile Include="..\thirdparty\xmlParser\xmlParser.cpp">
<Filter>源文件</Filter>
</ClCompile>
</ItemGroup>
@ -32,7 +32,7 @@
<ClInclude Include="..\test\plate.hpp">
<Filter>头文件</Filter>
</ClInclude>
<ClInclude Include="..\test\xml\xmlParser.h">
<ClInclude Include="..\thirdparty\xmlParser\xmlParser.h">
<Filter>头文件</Filter>
</ClInclude>
</ItemGroup>

@ -87,7 +87,7 @@
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>$(OPENCV)\include;$(SolutionDir)include</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(OPENCV)\include;$(SolutionDir)include;$(SolutionDir);</AdditionalIncludeDirectories>
<DisableSpecificWarnings>4819</DisableSpecificWarnings>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
@ -158,15 +158,15 @@
<ClCompile Include="..\src\preprocess\deface.cpp" />
<ClCompile Include="..\src\preprocess\gdts.cpp" />
<ClCompile Include="..\src\preprocess\mc_data.cpp" />
<ClCompile Include="..\src\third\erfilter.cpp" />
<ClCompile Include="..\src\third\helper.cpp" />
<ClCompile Include="..\src\third\lbp.cpp" />
<ClCompile Include="..\src\train\ann_train.cpp" />
<ClCompile Include="..\src\train\svm_train.cpp" />
<ClCompile Include="..\src\train\train.cpp" />
<ClCompile Include="..\src\util\kv.cpp" />
<ClCompile Include="..\src\util\program_options.cpp" />
<ClCompile Include="..\src\util\util.cpp" />
<ClCompile Include="..\thirdparty\erfilter.cpp" />
<ClCompile Include="..\thirdparty\helper.cpp" />
<ClCompile Include="..\thirdparty\lbp.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\include\easypr.h" />
@ -192,9 +192,9 @@
<ClInclude Include="..\include\easypr\util\program_options.h" />
<ClInclude Include="..\include\easypr\util\switch.hpp" />
<ClInclude Include="..\include\easypr\util\util.h" />
<ClInclude Include="..\include\third\erfilter.hpp" />
<ClInclude Include="..\include\third\helper.hpp" />
<ClInclude Include="..\include\third\lbp.hpp" />
<ClInclude Include="..\thirdparty\erfilter.hpp" />
<ClInclude Include="..\thirdparty\helper.hpp" />
<ClInclude Include="..\thirdparty\lbp.hpp" />
</ItemGroup>
<ItemGroup>
<None Include="..\LICENSE" />

@ -46,11 +46,11 @@
<Filter Include="源文件\experi">
<UniqueIdentifier>{94e5b7c3-7dad-4f9f-a036-25ff09d69868}</UniqueIdentifier>
</Filter>
<Filter Include="头文件\third">
<UniqueIdentifier>{4853f249-0c7a-4329-8ea7-464c7a8c85b9}</UniqueIdentifier>
<Filter Include="头文件\thirdparty">
<UniqueIdentifier>{4f5a6fd3-c541-443f-8789-d41a4e58e668}</UniqueIdentifier>
</Filter>
<Filter Include="源文件\third">
<UniqueIdentifier>{e6887e2f-ccf8-4e16-bdac-b8dc6c452855}</UniqueIdentifier>
<Filter Include="源文件\thirdparty">
<UniqueIdentifier>{53b2336b-7946-4a0d-b8ec-540d0e1e1fb2}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
@ -111,14 +111,14 @@
<ClCompile Include="..\src\core\better_mser.cpp">
<Filter>源文件\core</Filter>
</ClCompile>
<ClCompile Include="..\src\third\erfilter.cpp">
<Filter>源文件\third</Filter>
<ClCompile Include="..\thirdparty\erfilter.cpp">
<Filter>源文件\thirdparty</Filter>
</ClCompile>
<ClCompile Include="..\src\third\helper.cpp">
<Filter>源文件\third</Filter>
<ClCompile Include="..\thirdparty\helper.cpp">
<Filter>源文件\thirdparty</Filter>
</ClCompile>
<ClCompile Include="..\src\third\lbp.cpp">
<Filter>源文件\third</Filter>
<ClCompile Include="..\thirdparty\lbp.cpp">
<Filter>源文件\thirdparty</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
@ -191,14 +191,14 @@
<ClInclude Include="..\include\easypr\core\plate.hpp">
<Filter>头文件\easypr\core</Filter>
</ClInclude>
<ClInclude Include="..\include\third\erfilter.hpp">
<Filter>头文件\third</Filter>
<ClInclude Include="..\thirdparty\erfilter.hpp">
<Filter>头文件\thirdparty</Filter>
</ClInclude>
<ClInclude Include="..\include\third\helper.hpp">
<Filter>头文件\third</Filter>
<ClInclude Include="..\thirdparty\helper.hpp">
<Filter>头文件\thirdparty</Filter>
</ClInclude>
<ClInclude Include="..\include\third\lbp.hpp">
<Filter>头文件\third</Filter>
<ClInclude Include="..\thirdparty\lbp.hpp">
<Filter>头文件\thirdparty</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>

Loading…
Cancel
Save