Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
opencv
Commits
182b52d2
Commit
182b52d2
authored
Mar 14, 2018
by
berak
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix some samples colliding with std::beta
also add comments explaining the change
parent
24bed38c
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
23 additions
and
5 deletions
+23
-5
cloning_gui.cpp
samples/cpp/cloning_gui.cpp
+6
-1
BasicLinearTransformsTrackbar.cpp
...p/tutorial_code/HighGUI/BasicLinearTransformsTrackbar.cpp
+1
-0
BasicLinearTransforms.cpp
samples/cpp/tutorial_code/ImgProc/BasicLinearTransforms.cpp
+4
-1
changing_contrast_brightness_image.cpp
...t_brightness_image/changing_contrast_brightness_image.cpp
+1
-1
AddingImages.cpp
samples/cpp/tutorial_code/core/AddingImages/AddingImages.cpp
+5
-1
cloning_gui.cpp
.../cpp/tutorial_code/photo/seamless_cloning/cloning_gui.cpp
+6
-1
No files found.
samples/cpp/cloning_gui.cpp
View file @
182b52d2
...
...
@@ -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
;
...
...
samples/cpp/tutorial_code/HighGUI/BasicLinearTransformsTrackbar.cpp
View file @
182b52d2
...
...
@@ -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 */
...
...
samples/cpp/tutorial_code/ImgProc/BasicLinearTransforms.cpp
View file @
182b52d2
...
...
@@ -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
;
/**
...
...
samples/cpp/tutorial_code/ImgProc/changing_contrast_brightness_image/changing_contrast_brightness_image.cpp
View file @
182b52d2
...
...
@@ -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
...
...
samples/cpp/tutorial_code/core/AddingImages/AddingImages.cpp
View file @
182b52d2
...
...
@@ -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
...
...
samples/cpp/tutorial_code/photo/seamless_cloning/cloning_gui.cpp
View file @
182b52d2
...
...
@@ -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
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment