From d8600d3d13eefedf01863c836de81e39ccb42384 Mon Sep 17 00:00:00 2001 From: Anatoly Baksheev Date: Sat, 16 Nov 2013 21:27:03 +0400 Subject: [PATCH] fixed all Viz warnings moved some headers to precomp.hpp --- modules/highgui/src/cap_openni.cpp | 4 +++- modules/viz/src/interactor_style.cpp | 35 ++++++++++++++++------------ modules/viz/src/interactor_style.h | 6 +++-- modules/viz/src/precomp.hpp | 6 ++--- modules/viz/src/viz3d.cpp | 3 +-- modules/viz/src/viz3d_impl.cpp | 1 - modules/viz/src/viz3d_impl.hpp | 3 --- 7 files changed, 31 insertions(+), 27 deletions(-) diff --git a/modules/highgui/src/cap_openni.cpp b/modules/highgui/src/cap_openni.cpp index db9a518df3..22f7823bce 100644 --- a/modules/highgui/src/cap_openni.cpp +++ b/modules/highgui/src/cap_openni.cpp @@ -105,7 +105,9 @@ public: context(_context), depthGenerator(_depthGenerator), imageGenerator(_imageGenerator), maxBufferSize(_maxBufferSize), isCircleBuffer(_isCircleBuffer), maxTimeDuration(_maxTimeDuration) { +#ifdef HAVE_TBB task = 0; +#endif CV_Assert( depthGenerator.IsValid() ); CV_Assert( imageGenerator.IsValid() ); @@ -150,7 +152,7 @@ public: task = new( tbb::task::allocate_root() ) TBBApproximateSynchronizerTask( *this ); tbb::task::enqueue(*task); #else - task = new ApproximateSynchronizer( *this ); + task->reset( new ApproximateSynchronizer( *this ) ); #endif } diff --git a/modules/viz/src/interactor_style.cpp b/modules/viz/src/interactor_style.cpp index 8abc46880f..c740b248e3 100644 --- a/modules/viz/src/interactor_style.cpp +++ b/modules/viz/src/interactor_style.cpp @@ -47,7 +47,7 @@ //M*/ #include "precomp.hpp" -#include "interactor_style.h" + using namespace cv; @@ -193,6 +193,11 @@ void cv::viz::InteractorStyle::registerKeyboardCallback(void (*callback)(const K keyboard_callback_cookie_ = cookie; } +////////////////////////////////////////////////////////////////////////////////////////////// +bool cv::viz::InteractorStyle::getAltKey() { return Interactor->GetAltKey() != 0; } +bool cv::viz::InteractorStyle::getShiftKey() { return Interactor->GetShiftKey()!= 0; } +bool cv::viz::InteractorStyle::getControlKey() { return Interactor->GetControlKey()!= 0; } + ////////////////////////////////////////////////////////////////////////////////////////////// void cv::viz::InteractorStyle::OnKeyDown() @@ -216,9 +221,9 @@ cv::viz::InteractorStyle::OnKeyDown() // Get the status of special keys (Cltr+Alt+Shift) - bool shift = Interactor->GetShiftKey(); - bool ctrl = Interactor->GetControlKey(); - bool alt = Interactor->GetAltKey(); + bool shift = getShiftKey(); + bool ctrl = getControlKey(); + bool alt = getAltKey(); bool keymod = false; switch (modifier_) @@ -538,7 +543,7 @@ cv::viz::InteractorStyle::OnKeyDown() } } - KeyboardEvent event(true, Interactor->GetKeySym(), Interactor->GetKeyCode(), Interactor->GetAltKey(), Interactor->GetControlKey(), Interactor->GetShiftKey()); + KeyboardEvent event(true, Interactor->GetKeySym(), Interactor->GetKeyCode(), getAltKey(), getControlKey(), getShiftKey()); // Check if there is a keyboard callback registered if (keyboardCallback_) keyboardCallback_(event, keyboard_callback_cookie_); @@ -550,7 +555,7 @@ cv::viz::InteractorStyle::OnKeyDown() ////////////////////////////////////////////////////////////////////////////////////////////// void cv::viz::InteractorStyle::OnKeyUp() { - KeyboardEvent event(false, Interactor->GetKeySym(), Interactor->GetKeyCode(), Interactor->GetAltKey(), Interactor->GetControlKey(), Interactor->GetShiftKey()); + KeyboardEvent event(false, Interactor->GetKeySym(), Interactor->GetKeyCode(), getAltKey(), getControlKey(), getShiftKey()); // Check if there is a keyboard callback registered if (keyboardCallback_) keyboardCallback_(event, keyboard_callback_cookie_); @@ -562,7 +567,7 @@ void cv::viz::InteractorStyle::OnKeyUp() void cv::viz::InteractorStyle::OnMouseMove() { Vec2i p(Interactor->GetEventPosition()); - MouseEvent event(MouseEvent::MouseMove, MouseEvent::NoButton, p, Interactor->GetAltKey(), Interactor->GetControlKey(), Interactor->GetShiftKey()); + MouseEvent event(MouseEvent::MouseMove, MouseEvent::NoButton, p, getAltKey(), getControlKey(), getShiftKey()); if (mouseCallback_) mouseCallback_(event, mouse_callback_cookie_); Superclass::OnMouseMove(); @@ -573,7 +578,7 @@ void cv::viz::InteractorStyle::OnLeftButtonDown() { Vec2i p(Interactor->GetEventPosition()); MouseEvent::Type type = (Interactor->GetRepeatCount() == 0) ? MouseEvent::MouseButtonPress : MouseEvent::MouseDblClick; - MouseEvent event(type, MouseEvent::LeftButton, p, Interactor->GetAltKey(), Interactor->GetControlKey(), Interactor->GetShiftKey()); + MouseEvent event(type, MouseEvent::LeftButton, p, getAltKey(), getControlKey(), getShiftKey()); if (mouseCallback_) mouseCallback_(event, mouse_callback_cookie_); Superclass::OnLeftButtonDown(); @@ -583,7 +588,7 @@ void cv::viz::InteractorStyle::OnLeftButtonDown() void cv::viz::InteractorStyle::OnLeftButtonUp() { Vec2i p(Interactor->GetEventPosition()); - MouseEvent event(MouseEvent::MouseButtonRelease, MouseEvent::LeftButton, p, Interactor->GetAltKey(), Interactor->GetControlKey(), Interactor->GetShiftKey()); + MouseEvent event(MouseEvent::MouseButtonRelease, MouseEvent::LeftButton, p, getAltKey(), getControlKey(), getShiftKey()); if (mouseCallback_) mouseCallback_(event, mouse_callback_cookie_); Superclass::OnLeftButtonUp(); @@ -595,7 +600,7 @@ void cv::viz::InteractorStyle::OnMiddleButtonDown() Vec2i p(Interactor->GetEventPosition()); MouseEvent::Type type = (Interactor->GetRepeatCount() == 0) ? MouseEvent::MouseButtonPress : MouseEvent::MouseDblClick; - MouseEvent event(type, MouseEvent::MiddleButton, p, Interactor->GetAltKey(), Interactor->GetControlKey(), Interactor->GetShiftKey()); + MouseEvent event(type, MouseEvent::MiddleButton, p, getAltKey(), getControlKey(), getShiftKey()); if (mouseCallback_) mouseCallback_(event, mouse_callback_cookie_); Superclass::OnMiddleButtonDown(); @@ -605,7 +610,7 @@ void cv::viz::InteractorStyle::OnMiddleButtonDown() void cv::viz::InteractorStyle::OnMiddleButtonUp() { Vec2i p(Interactor->GetEventPosition()); - MouseEvent event(MouseEvent::MouseButtonRelease, MouseEvent::MiddleButton, p, Interactor->GetAltKey(), Interactor->GetControlKey(), Interactor->GetShiftKey()); + MouseEvent event(MouseEvent::MouseButtonRelease, MouseEvent::MiddleButton, p, getAltKey(), getControlKey(), getShiftKey()); if (mouseCallback_) mouseCallback_(event, mouse_callback_cookie_); Superclass::OnMiddleButtonUp(); @@ -617,7 +622,7 @@ void cv::viz::InteractorStyle::OnRightButtonDown() Vec2i p(Interactor->GetEventPosition()); MouseEvent::Type type = (Interactor->GetRepeatCount() == 0) ? MouseEvent::MouseButtonPress : MouseEvent::MouseDblClick; - MouseEvent event(type, MouseEvent::RightButton, p, Interactor->GetAltKey(), Interactor->GetControlKey(), Interactor->GetShiftKey()); + MouseEvent event(type, MouseEvent::RightButton, p, getAltKey(), getControlKey(), getShiftKey()); if (mouseCallback_) mouseCallback_(event, mouse_callback_cookie_); Superclass::OnRightButtonDown(); @@ -627,7 +632,7 @@ void cv::viz::InteractorStyle::OnRightButtonDown() void cv::viz::InteractorStyle::OnRightButtonUp() { Vec2i p(Interactor->GetEventPosition()); - MouseEvent event(MouseEvent::MouseButtonRelease, MouseEvent::RightButton, p, Interactor->GetAltKey(), Interactor->GetControlKey(), Interactor->GetShiftKey()); + MouseEvent event(MouseEvent::MouseButtonRelease, MouseEvent::RightButton, p, getAltKey(), getControlKey(), getShiftKey()); if (mouseCallback_) mouseCallback_(event, mouse_callback_cookie_); Superclass::OnRightButtonUp(); @@ -637,7 +642,7 @@ void cv::viz::InteractorStyle::OnRightButtonUp() void cv::viz::InteractorStyle::OnMouseWheelForward() { Vec2i p(Interactor->GetEventPosition()); - MouseEvent event(MouseEvent::MouseScrollUp, MouseEvent::VScroll, p, Interactor->GetAltKey(), Interactor->GetControlKey(), Interactor->GetShiftKey()); + MouseEvent event(MouseEvent::MouseScrollUp, MouseEvent::VScroll, p, getAltKey(), getControlKey(), getShiftKey()); // If a mouse callback registered, call it! if (mouseCallback_) mouseCallback_(event, mouse_callback_cookie_); @@ -669,7 +674,7 @@ void cv::viz::InteractorStyle::OnMouseWheelForward() void cv::viz::InteractorStyle::OnMouseWheelBackward() { Vec2i p(Interactor->GetEventPosition()); - MouseEvent event(MouseEvent::MouseScrollDown, MouseEvent::VScroll, p, Interactor->GetAltKey(), Interactor->GetControlKey(), Interactor->GetShiftKey()); + MouseEvent event(MouseEvent::MouseScrollDown, MouseEvent::VScroll, p, getAltKey(), getControlKey(), getShiftKey()); // If a mouse callback registered, call it! if (mouseCallback_) mouseCallback_(event, mouse_callback_cookie_); diff --git a/modules/viz/src/interactor_style.h b/modules/viz/src/interactor_style.h index 30d8529163..ed3f4dfbdd 100644 --- a/modules/viz/src/interactor_style.h +++ b/modules/viz/src/interactor_style.h @@ -49,8 +49,6 @@ #ifndef __OPENCV_VIZ_INTERACTOR_STYLE_H__ #define __OPENCV_VIZ_INTERACTOR_STYLE_H__ -#include "precomp.hpp" - namespace cv { namespace viz @@ -145,6 +143,10 @@ namespace cv void (*mouseCallback_)(const MouseEvent&, void*); void *mouse_callback_cookie_; + + bool getAltKey(); + bool getControlKey(); + bool getShiftKey(); }; } } diff --git a/modules/viz/src/precomp.hpp b/modules/viz/src/precomp.hpp index 5b889fdba3..beb7c5c048 100644 --- a/modules/viz/src/precomp.hpp +++ b/modules/viz/src/precomp.hpp @@ -126,6 +126,8 @@ #endif #include +#include +#include namespace cv { @@ -135,6 +137,7 @@ namespace cv } } +#include "interactor_style.h" #include "viz3d_impl.hpp" namespace cv @@ -146,8 +149,5 @@ namespace cv } } -#include -#include -#include "opencv2/viz/widget_accessor.hpp" #endif diff --git a/modules/viz/src/viz3d.cpp b/modules/viz/src/viz3d.cpp index f1714cf097..f5a0bc8895 100644 --- a/modules/viz/src/viz3d.cpp +++ b/modules/viz/src/viz3d.cpp @@ -46,8 +46,7 @@ // //M*/ -#include -#include "viz3d_impl.hpp" +#include "precomp.hpp" cv::viz::Viz3d::Viz3d(const String& window_name) : impl_(0) { create(window_name); } diff --git a/modules/viz/src/viz3d_impl.cpp b/modules/viz/src/viz3d_impl.cpp index 4ab0ddfdba..d014372428 100644 --- a/modules/viz/src/viz3d_impl.cpp +++ b/modules/viz/src/viz3d_impl.cpp @@ -47,7 +47,6 @@ //M*/ #include "precomp.hpp" -#include "viz3d_impl.hpp" #include "opencv2/core/utility.hpp" #include diff --git a/modules/viz/src/viz3d_impl.hpp b/modules/viz/src/viz3d_impl.hpp index e94b7361f9..50d642e714 100644 --- a/modules/viz/src/viz3d_impl.hpp +++ b/modules/viz/src/viz3d_impl.hpp @@ -49,9 +49,6 @@ #ifndef __OPENCV_VIZ_VIZ3D_IMPL_HPP__ #define __OPENCV_VIZ_VIZ3D_IMPL_HPP__ -#include -#include "interactor_style.h" - struct cv::viz::Viz3d::VizImpl { public: -- GitLab