fixed a few warnings from VS2010 express

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:
 #-----------------------------------

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;
 }