Merge remote-tracking branch 'upstream/3.4' into merge-3.4

samples/cpp/intelligent_scissors.cpp

@@ -189,7 +189,10 @@ int main( int argc, const char** argv )
     const int EDGE_THRESHOLD_LOW = 50;
     const int EDGE_THRESHOLD_HIGH = 100;
     CommandLineParser parser(argc, argv, keys);
-    parser.about("\nThis program demonstrates implementation of 'intelligent scissors' algorithm\n"
+    parser.about("\nThis program demonstrates implementation of 'Intelligent Scissors' algorithm designed\n"
+                 "by Eric N. Mortensen and William A. Barrett, and described in article\n"
+                 "'Intelligent Scissors for Image Composition':\n"
+                 "http://citeseerx.ist.psu.edu/viewdoc/download?doi=10.1.1.138.3811&rep=rep1&type=pdf\n"
                  "To start drawing a new contour select a pixel, click LEFT mouse button.\n"
                  "To fix a path click LEFT mouse button again.\n"
                  "To finish drawing a contour click RIGHT mouse button.\n");