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