Commit 182b52d2 authored by berak's avatar berak

fix some samples colliding with std::beta

also add comments explaining the change
parent 24bed38c
...@@ -39,7 +39,12 @@ ...@@ -39,7 +39,12 @@
#include <iostream> #include <iostream>
#include <stdlib.h> #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; using namespace cv;
Mat img0, img1, img2, res, res1, final, final1, blend; Mat img0, img1, img2, res, res1, final, final1, blend;
......
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
#include "opencv2/imgcodecs.hpp" #include "opencv2/imgcodecs.hpp"
#include "opencv2/highgui.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; using namespace cv;
/** Global Variables */ /** Global Variables */
......
...@@ -8,7 +8,10 @@ ...@@ -8,7 +8,10 @@
#include "opencv2/highgui.hpp" #include "opencv2/highgui.hpp"
#include <iostream> #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; using namespace cv;
/** /**
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
#include "opencv2/imgcodecs.hpp" #include "opencv2/imgcodecs.hpp"
#include "opencv2/highgui.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; using namespace cv;
namespace namespace
......
...@@ -8,7 +8,11 @@ ...@@ -8,7 +8,11 @@
#include <iostream> #include <iostream>
using namespace cv; 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 * @function main
......
...@@ -38,7 +38,12 @@ ...@@ -38,7 +38,12 @@
#include <iostream> #include <iostream>
#include <stdlib.h> #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; using namespace cv;
Mat img0, img1, img2, res, res1, final, final1, blend; Mat img0, img1, img2, res, res1, final, final1, blend;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment