Merge branch '2.4'

samples/cpp/freak_demo.cpp

@@ -73,7 +73,7 @@ int main( int argc, char** argv ) {
     }
 
     Mat imgB = imread(argv[2], IMREAD_GRAYSCALE );
-    if( !imgA.data ) {
+    if( !imgB.data ) {
         std::cout << " --(!) Error reading image " << argv[2] << std::endl;
         return -1;
     }

samples/cpp/lkdemo.cpp

@@ -12,9 +12,8 @@ static void help()
 {
     // print a welcome message, and the OpenCV version
     cout << "\nThis is a demo of Lukas-Kanade optical flow lkdemo(),\n"
-            "Using OpenCV version %s\n" << CV_VERSION << "\n"
-            << endl;
-
+            "Using OpenCV version " << CV_VERSION << endl;
+    cout << "\nIt uses camera by default, but you can provide a path to video as an argument.\n";
     cout << "\nHot keys: \n"
             "\tESC - quit the program\n"
             "\tr - auto-initialize tracking\n"
@@ -30,13 +29,15 @@ static void onMouse( int event, int x, int y, int /*flags*/, void* /*param*/ )
 {
     if( event == EVENT_LBUTTONDOWN )
     {
-        point = Point2f((float)x,(float)y);
+        point = Point2f((float)x, (float)y);
         addRemovePt = true;
     }
 }
 
 int main( int argc, char** argv )
 {
+    help();
+
     VideoCapture cap;
     TermCriteria termcrit(TermCriteria::COUNT|TermCriteria::EPS,20,0.03);
     Size subPixWinSize(10,10), winSize(31,31);
@@ -56,8 +57,6 @@ int main( int argc, char** argv )
         return 0;
     }
 
-    help();
-
     namedWindow( "LK Demo", 1 );
     setMouseCallback( "LK Demo", onMouse, 0 );
 
@@ -134,17 +133,16 @@ int main( int argc, char** argv )
             needToInit = true;
             break;
         case 'c':
+            points[0].clear();
             points[1].clear();
             break;
         case 'n':
             nightMode = !nightMode;
             break;
-        default:
-            ;
         }
 
         std::swap(points[1], points[0]);
-        swap(prevGray, gray);
+        cv::swap(prevGray, gray);
     }
 
     return 0;