fixed a few warnings from VS2010 express

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c3a35c9..5526e85 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1274,11 +1274,14 @@ endif()
 #-----------------------------------\r
 \r
 if(${CMAKE_VERSION} VERSION_GREATER "2.8.0")\r
-       set_property(GLOBAL PROPERTY USE_FOLDERS ON)\r
-       set_property(GLOBAL PROPERTY PREDEFINED_TARGETS_FOLDER "CMakeTargets")          \r
        set(ENABLE_SOLUTION_FOLDERS OFF CACHE BOOL "Solution folder in Visual Studio or in other IDEs")\r
 endif()\r
 \r
+if(ENABLE_SOLUTION_FOLDERS)\r
+    set_property(GLOBAL PROPERTY USE_FOLDERS ON)\r
+    set_property(GLOBAL PROPERTY PREDEFINED_TARGETS_FOLDER "CMakeTargets")\r
+endif()\r
+\r
 #-----------------------------------\r
 # Subdirectories:\r
 #-----------------------------------\r

diff --git a/samples/cpp/descriptor_extractor_matcher.cpp b/samples/cpp/descriptor_extractor_matcher.cpp
index 28a2a08..834b401 100644 (file)
--- a/samples/cpp/descriptor_extractor_matcher.cpp
+++ b/samples/cpp/descriptor_extractor_matcher.cpp
@@ -267,7 +267,7 @@ int main(int argc, char** argv)
         if( c == '\x1b' ) // esc
         {
             cout << "Exiting ..." << endl;
-            return 0;
+            break;
         }
         else if( isWarpPerspective )
         {
@@ -276,6 +276,5 @@ int main(int argc, char** argv)
                          ransacReprojThreshold, rng );
         }
     }
-    waitKey(0);
     return 0;
 }