From 9d4fe6984b694596003e809d84808a7c646f1d6c Mon Sep 17 00:00:00 2001 From: Ozan Tonkal Date: Sun, 1 Sep 2013 14:59:14 +0200 Subject: [PATCH] remove setWindowName method to avoid complications --- modules/viz/include/opencv2/viz/viz3d.hpp | 1 - modules/viz/src/viz3d.cpp | 1 - modules/viz/src/viz3d_impl.cpp | 6 ------ modules/viz/src/viz3d_impl.hpp | 1 - 4 files changed, 9 deletions(-) diff --git a/modules/viz/include/opencv2/viz/viz3d.hpp b/modules/viz/include/opencv2/viz/viz3d.hpp index a544936..988f7ed 100644 --- a/modules/viz/include/opencv2/viz/viz3d.hpp +++ b/modules/viz/include/opencv2/viz/viz3d.hpp @@ -50,7 +50,6 @@ namespace cv void saveScreenshot (const String &file); void setWindowPosition (int x, int y); void setFullScreen (bool mode); - void setWindowName (const String &name); void setBackgroundColor(const Color& color = Color::black()); void spin(); diff --git a/modules/viz/src/viz3d.cpp b/modules/viz/src/viz3d.cpp index 61911ca..1b45f3a 100644 --- a/modules/viz/src/viz3d.cpp +++ b/modules/viz/src/viz3d.cpp @@ -79,7 +79,6 @@ cv::String cv::viz::Viz3d::getWindowName() const { return impl_->getWindowName() void cv::viz::Viz3d::saveScreenshot (const String &file) { impl_->saveScreenshot(file); } void cv::viz::Viz3d::setWindowPosition (int x, int y) { impl_->setWindowPosition(x,y); } void cv::viz::Viz3d::setFullScreen (bool mode) { impl_->setFullScreen(mode); } -void cv::viz::Viz3d::setWindowName (const String &name) { impl_->setWindowName(name); } void cv::viz::Viz3d::setBackgroundColor(const Color& color) { impl_->setBackgroundColor(color); } void cv::viz::Viz3d::setRenderingProperty(int property, double value, const String &id) { getWidget(id).setRenderingProperty(property, value); } diff --git a/modules/viz/src/viz3d_impl.cpp b/modules/viz/src/viz3d_impl.cpp index 00a5cae..f99fd8e 100644 --- a/modules/viz/src/viz3d_impl.cpp +++ b/modules/viz/src/viz3d_impl.cpp @@ -542,12 +542,6 @@ void cv::viz::Viz3d::VizImpl::setFullScreen (bool mode) } ////////////////////////////////////////////////////////////////////////////////////////////// -void cv::viz::Viz3d::VizImpl::setWindowName (const std::string &name) -{ - if (window_) - window_->SetWindowName (name.c_str ()); -} - cv::String cv::viz::Viz3d::VizImpl::getWindowName() const { return (window_ ? window_->GetWindowName() : ""); diff --git a/modules/viz/src/viz3d_impl.hpp b/modules/viz/src/viz3d_impl.hpp index 0eab85b..7e31501 100644 --- a/modules/viz/src/viz3d_impl.hpp +++ b/modules/viz/src/viz3d_impl.hpp @@ -69,7 +69,6 @@ public: Size getWindowSize() const; void setWindowSize (int xw, int yw); void setFullScreen (bool mode); - void setWindowName (const String &name); String getWindowName() const; void setBackgroundColor (const Color& color); -- 2.7.4