projects
/
platform
/
upstream
/
opencv.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
6fb75c6
)
viz: eliminate warnings from tutorial code
author
Alexander Alekhin
<alexander.alekhin@intel.com>
Fri, 21 Oct 2016 15:22:07 +0000
(18:22 +0300)
committer
Alexander Alekhin
<alexander.a.alekhin@gmail.com>
Fri, 25 Nov 2016 06:07:38 +0000
(09:07 +0300)
samples/cpp/tutorial_code/viz/creating_widgets.cpp
patch
|
blob
|
history
samples/cpp/tutorial_code/viz/launching_viz.cpp
patch
|
blob
|
history
samples/cpp/tutorial_code/viz/transformations.cpp
patch
|
blob
|
history
samples/cpp/tutorial_code/viz/widget_pose.cpp
patch
|
blob
|
history
diff --git
a/samples/cpp/tutorial_code/viz/creating_widgets.cpp
b/samples/cpp/tutorial_code/viz/creating_widgets.cpp
index
9ee6c54
..
db6fb48
100644
(file)
--- a/
samples/cpp/tutorial_code/viz/creating_widgets.cpp
+++ b/
samples/cpp/tutorial_code/viz/creating_widgets.cpp
@@
-24,7
+24,7
@@
using namespace std;
* @function help
* @brief Display instructions to use this tutorial program
*/
-void help()
+
static
void help()
{
cout
<< "--------------------------------------------------------------------------" << endl
diff --git
a/samples/cpp/tutorial_code/viz/launching_viz.cpp
b/samples/cpp/tutorial_code/viz/launching_viz.cpp
index
55a3dde
..
4cc90fe
100644
(file)
--- a/
samples/cpp/tutorial_code/viz/launching_viz.cpp
+++ b/
samples/cpp/tutorial_code/viz/launching_viz.cpp
@@
-14,7
+14,7
@@
using namespace std;
* @function help
* @brief Display instructions to use this tutorial program
*/
-void help()
+
static
void help()
{
cout
<< "--------------------------------------------------------------------------" << endl
diff --git
a/samples/cpp/tutorial_code/viz/transformations.cpp
b/samples/cpp/tutorial_code/viz/transformations.cpp
index
d8713fd
..
fe26c4e
100644
(file)
--- a/
samples/cpp/tutorial_code/viz/transformations.cpp
+++ b/
samples/cpp/tutorial_code/viz/transformations.cpp
@@
-15,7
+15,7
@@
using namespace std;
* @function help
* @brief Display instructions to use this tutorial program
*/
-void help()
+
static
void help()
{
cout
<< "--------------------------------------------------------------------------" << endl
@@
-31,7
+31,7
@@
void help()
* @function cvcloud_load
* @brief load bunny.ply
*/
-Mat cvcloud_load()
+
static
Mat cvcloud_load()
{
Mat cloud(1, 1889, CV_32FC3);
ifstream ifs("bunny.ply");
diff --git
a/samples/cpp/tutorial_code/viz/widget_pose.cpp
b/samples/cpp/tutorial_code/viz/widget_pose.cpp
index
3ecead8
..
d36f4fe
100644
(file)
--- a/
samples/cpp/tutorial_code/viz/widget_pose.cpp
+++ b/
samples/cpp/tutorial_code/viz/widget_pose.cpp
@@
-15,7
+15,7
@@
using namespace std;
* @function help
* @brief Display instructions to use this tutorial program
*/
-void help()
+
static
void help()
{
cout
<< "--------------------------------------------------------------------------" << endl