fix some samples colliding with std::beta

also add comments explaining the change
This commit is contained in:
berak 2018-03-14 05:58:45 +01:00
parent 24bed38c2b
commit 182b52d23d
6 changed files with 23 additions and 5 deletions

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;

View File

@ -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 */

View File

@ -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;
/**

View File

@ -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

View File

@ -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

View File

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