Merge pull request #1348 from SpecLad:merge-2.4

samples/gpu/hog.cpp

@@ -458,4 +458,3 @@ inline string App::workFps() const
     ss << work_fps;
     return ss.str();
 }
-

samples/gpu/houghlines.cpp

@@ -88,4 +88,3 @@ int main(int argc, const char* argv[])
 
     return 0;
 }
-

samples/gpu/stereo_match.cpp

@@ -379,5 +379,3 @@ void App::handleKey(char key)
         break;
     }
 }
-
-

samples/gpu/super_resolution.cpp

@@ -212,7 +212,7 @@ int main(int argc, const char* argv[])
 #if defined(HAVE_OPENCV_OCL)
         cout << "Mode            : " << (useCuda ? "CUDA" : useOcl? "OpenCL" : "CPU") << endl;
 #else
-        cout << "Mode            : " << (useGpu ? "CUDA" : "CPU") << endl;
+        cout << "Mode            : " << (useCuda ? "CUDA" : "CPU") << endl;
 #endif
     }