generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed a few warnings from VS2010 express

Browse Source
This commit is contained in:
Vadim Pisarevsky 2011-05-17 14:15:23 +00:00
parent 013b7fdc91
commit 306a11a7c5
2 changed files with 6 additions and 4 deletions

5
CMakeLists.txt

@ -1274,9 +1274,12 @@ endif()
#----------------------------------- #-----------------------------------
if(${CMAKE_VERSION} VERSION_GREATER "2.8.0") if(${CMAKE_VERSION} VERSION_GREATER "2.8.0")
set(ENABLE_SOLUTION_FOLDERS OFF CACHE BOOL "Solution folder in Visual Studio or in other IDEs")
endif()
if(ENABLE_SOLUTION_FOLDERS)
set_property(GLOBAL PROPERTY USE_FOLDERS ON) set_property(GLOBAL PROPERTY USE_FOLDERS ON)
set_property(GLOBAL PROPERTY PREDEFINED_TARGETS_FOLDER "CMakeTargets") set_property(GLOBAL PROPERTY PREDEFINED_TARGETS_FOLDER "CMakeTargets")
set(ENABLE_SOLUTION_FOLDERS OFF CACHE BOOL "Solution folder in Visual Studio or in other IDEs")
endif() endif()
#----------------------------------- #-----------------------------------

3
samples/cpp/descriptor_extractor_matcher.cpp

@ -267,7 +267,7 @@ int main(int argc, char** argv)
if( c == '\x1b' ) // esc if( c == '\x1b' ) // esc
{ {
cout << "Exiting ..." << endl; cout << "Exiting ..." << endl;
return 0; break;
} }
else if( isWarpPerspective ) else if( isWarpPerspective )
{ {
@ -276,6 +276,5 @@ int main(int argc, char** argv)
ransacReprojThreshold, rng ); ransacReprojThreshold, rng );
} }
} }
waitKey(0);
return 0; return 0;
} }