From: Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
Date: Thu, 2 Mar 2017 11:18:26 +0000 (+0000)
Subject: Merge pull request #8282 from vskarlsruhe:patch-3
X-Git-Tag: accepted/tizen/6.0/unified/20201030.111113~1166
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8e8da3f5b0e78105dfab8c8505168060d36831d6;p=platform%2Fupstream%2Fopencv.git

Merge pull request #8282 from vskarlsruhe:patch-3
---

8e8da3f5b0e78105dfab8c8505168060d36831d6
diff --cc samples/cpp/tutorial_code/core/AddingImages/AddingImages.cpp
index d8024cd,54134f4..4ddb6f0
--- a/samples/cpp/tutorial_code/core/AddingImages/AddingImages.cpp
+++ b/samples/cpp/tutorial_code/core/AddingImages/AddingImages.cpp
@@@ -21,13 -22,13 +22,13 @@@ int main( void 
     Mat src1, src2, dst;
  
     /// Ask the user enter alpha
-    std::cout<<" Simple Linear Blender "<<std::endl;
-    std::cout<<"-----------------------"<<std::endl;
-    std::cout<<"* Enter alpha [0-1]: ";
-    std::cin>>input;
+    cout << " Simple Linear Blender " << endl;
+    cout << "-----------------------" << endl;
+    cout << "* Enter alpha [0-1]: ";
+    cin >> input;
  
     // We use the alpha provided by the user if it is between 0 and 1
 -   if( alpha >= 0 && alpha <= 1 )
 +   if( input >= 0 && input <= 1 )
       { alpha = input; }
  
     //![load]