Merge pull request #11069 from berak:fix_samples_beta

This commit is contained in:
Alexander Alekhin
2018-03-16 19:30:19 +00:00
6 changed files with 23 additions and 5 deletions
+6 -1
View File
@@ -39,7 +39,12 @@
#include <iostream>
#include <stdlib.h>
using namespace std;
// we're NOT "using namespace std;" here, to avoid collisions between the beta variable and std::beta in c++17
using std::cin;
using std::cout;
using std::endl;
using std::string;
using namespace cv;
Mat img0, img1, img2, res, res1, final, final1, blend;
@@ -8,6 +8,7 @@
#include "opencv2/imgcodecs.hpp"
#include "opencv2/highgui.hpp"
// we're NOT "using namespace std;" here, to avoid collisions between the beta variable and std::beta in c++17
using namespace cv;
/** Global Variables */
@@ -8,7 +8,10 @@
#include "opencv2/highgui.hpp"
#include <iostream>
using namespace std;
// we're NOT "using namespace std;" here, to avoid collisions between the beta variable and std::beta in c++17
using std::cin;
using std::cout;
using std::endl;
using namespace cv;
/**
@@ -2,7 +2,7 @@
#include "opencv2/imgcodecs.hpp"
#include "opencv2/highgui.hpp"
using namespace std;
// we're NOT "using namespace std;" here, to avoid collisions between the beta variable and std::beta in c++17
using namespace cv;
namespace
@@ -8,7 +8,11 @@
#include <iostream>
using namespace cv;
using namespace std;
// we're NOT "using namespace std;" here, to avoid collisions between the beta variable and std::beta in c++17
using std::cin;
using std::cout;
using std::endl;
/**
* @function main
@@ -38,7 +38,12 @@
#include <iostream>
#include <stdlib.h>
using namespace std;
// we're NOT "using namespace std;" here, to avoid collisions between the beta variable and std::beta in c++17
using std::cin;
using std::cout;
using std::endl;
using std::string;
using namespace cv;
Mat img0, img1, img2, res, res1, final, final1, blend;