From 306a11a7c5d87448236d53d3400a900f370a9637 Mon Sep 17 00:00:00 2001
From: Vadim Pisarevsky <no@email>
Date: Tue, 17 May 2011 14:15:23 +0000
Subject: [PATCH] fixed a few warnings from VS2010 express

---
 CMakeLists.txt                               | 7 +++++--
 samples/cpp/descriptor_extractor_matcher.cpp | 3 +--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c3a35c937c..5526e85bae 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1274,11 +1274,14 @@ endif()
 #-----------------------------------
 
 if(${CMAKE_VERSION} VERSION_GREATER "2.8.0")
-	set_property(GLOBAL PROPERTY USE_FOLDERS ON)
-	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()
 
+if(ENABLE_SOLUTION_FOLDERS)
+    set_property(GLOBAL PROPERTY USE_FOLDERS ON)
+    set_property(GLOBAL PROPERTY PREDEFINED_TARGETS_FOLDER "CMakeTargets")
+endif()
+
 #-----------------------------------
 # Subdirectories:
 #-----------------------------------
diff --git a/samples/cpp/descriptor_extractor_matcher.cpp b/samples/cpp/descriptor_extractor_matcher.cpp
index 28a2a082df..834b401798 100644
--- 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;
 }