Merge pull request #1955 from paroj:ovisup

alalek · alalek · commit 29f61bfcf7c6 · 2019-01-04T12:14:21.000Z
diff --git a/modules/ovis/CMakeLists.txt b/modules/ovis/CMakeLists.txt
@@ -16,6 +16,10 @@ elseif(OGRE_VERSION VERSION_GREATER 1.10) # we need C++11 for OGRE 1.11
   endif()
 endif()
 
+if(OGRE_VERSION VERSION_LESS 1.10.10)
+    message(WARNING "opencv_ovis: Ogre >= 1.10.10 recommended for interactive windows")
+endif()
+
 include_directories(${OGRE_INCLUDE_DIRS})
 link_directories(${OGRE_LIBRARY_DIRS})
 
diff --git a/modules/ovis/src/ovis.cpp b/modules/ovis/src/ovis.cpp
@@ -181,7 +181,7 @@ struct Application : public OgreBites::ApplicationContext, public OgreBites::Inp
     int flags;
 
     Application(const Ogre::String& _title, const Size& sz, int _flags)
-        : OgreBites::ApplicationContext("ovis", false), sceneMgr(NULL), title(_title), w(sz.width),
+        : OgreBites::ApplicationContext("ovis"), sceneMgr(NULL), title(_title), w(sz.width),
           h(sz.height), key_pressed(-1), flags(_flags)
     {
         if(utils::getConfigurationParameterBool("OPENCV_OVIS_VERBOSE_LOG", false))

Original file line number	Diff line number	Diff line change
`@@ -181,7 +181,7 @@ struct Application : public OgreBites::ApplicationContext, public OgreBites::Inp`
`181`	`181`	`int flags;`
`182`	`182`
`183`	`183`	`Application(const Ogre::String& _title, const Size& sz, int _flags)`
`184`		`- : OgreBites::ApplicationContext("ovis", false), sceneMgr(NULL), title(_title), w(sz.width),`
	`184`	`+ : OgreBites::ApplicationContext("ovis"), sceneMgr(NULL), title(_title), w(sz.width),`
`185`	`185`	`h(sz.height), key_pressed(-1), flags(_flags)`
`186`	`186`	`{`
`187`	`187`	`if(utils::getConfigurationParameterBool("OPENCV_OVIS_VERBOSE_LOG", false))`