Merge pull request #7536 from alalek:viz_warn

modules/viz/src/vtk/vtkCocoaInteractorFix.mm

 /*M///////////////////////////////////////////////////////////////////////////////////////
- //
- //  IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING.
- //
- //  By downloading, copying, installing or using the software you agree to this license.
- //  If you do not agree to this license, do not download, install,
- //  copy or use the software.
- //
- //
- //                           License Agreement
- //                For Open Source Computer Vision Library
- //
- // Copyright (C) 2013, OpenCV Foundation, all rights reserved.
- // Third party copyrights are property of their respective owners.
- //
- // Redistribution and use in source and binary forms, with or without modification,
- // are permitted provided that the following conditions are met:
- //
- //   * Redistribution's of source code must retain the above copyright notice,
- //     this list of conditions and the following disclaimer.
- //
- //   * Redistribution's in binary form must reproduce the above copyright notice,
- //     this list of conditions and the following disclaimer in the documentation
- //     and/or other materials provided with the distribution.
- //
- //   * The name of the copyright holders may not be used to endorse or promote products
- //     derived from this software without specific prior written permission.
- //
- // This software is provided by the copyright holders and contributors "as is" and
- // any express or implied warranties, including, but not limited to, the implied
- // warranties of merchantability and fitness for a particular purpose are disclaimed.
- // In no event shall the Intel Corporation or contributors be liable for any direct,
- // indirect, incidental, special, exemplary, or consequential damages
- // (including, but not limited to, procurement of substitute goods or services;
- // loss of use, data, or profits; or business interruption) however caused
- // and on any theory of liability, whether in contract, strict liability,
- // or tort (including negligence or otherwise) arising in any way out of
- // the use of this software, even if advised of the possibility of such damage.
- //
- // Authors:
- //  * Anatoly Baksheev, Itseez Inc.  myname.mysurname <> mycompany.com
- //
- //  This workaround code was taken from PCL library(www.pointclouds.org)
- //
- //  Modified by Jasper Shemilt to work with VTK 6.2
- //  The fix was needed because GetCocoaServer has been moved from
- //  vtkCocoaRenderWindowInteractor to vtkCocoaRenderWindow in VTK 6.2.
- //  This alteration to VTK happened almost a year ago according to the gitHub
- //  commit a3e9fc9.
- //
- //M*/
+//
+//  IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING.
+//
+//  By downloading, copying, installing or using the software you agree to this license.
+//  If you do not agree to this license, do not download, install,
+//  copy or use the software.
+//
+//
+//                           License Agreement
+//                For Open Source Computer Vision Library
+//
+// Copyright (C) 2013, OpenCV Foundation, all rights reserved.
+// Third party copyrights are property of their respective owners.
+//
+// Redistribution and use in source and binary forms, with or without modification,
+// are permitted provided that the following conditions are met:
+//
+//   * Redistribution's of source code must retain the above copyright notice,
+//     this list of conditions and the following disclaimer.
+//
+//   * Redistribution's in binary form must reproduce the above copyright notice,
+//     this list of conditions and the following disclaimer in the documentation
+//     and/or other materials provided with the distribution.
+//
+//   * The name of the copyright holders may not be used to endorse or promote products
+//     derived from this software without specific prior written permission.
+//
+// This software is provided by the copyright holders and contributors "as is" and
+// any express or implied warranties, including, but not limited to, the implied
+// warranties of merchantability and fitness for a particular purpose are disclaimed.
+// In no event shall the Intel Corporation or contributors be liable for any direct,
+// indirect, incidental, special, exemplary, or consequential damages
+// (including, but not limited to, procurement of substitute goods or services;
+// loss of use, data, or profits; or business interruption) however caused
+// and on any theory of liability, whether in contract, strict liability,
+// or tort (including negligence or otherwise) arising in any way out of
+// the use of this software, even if advised of the possibility of such damage.
+//
+// Authors:
+//  * Anatoly Baksheev, Itseez Inc.  myname.mysurname <> mycompany.com
+//
+//  This workaround code was taken from PCL library(www.pointclouds.org)
+//
+//M*/
 
 #import <Cocoa/Cocoa.h>
 #include <vtkCocoaRenderWindow.h>
@@ -56,6 +50,13 @@
 #include <vtkObjectFactory.h>
 #include <vtkSmartPointer.h>
 
+namespace cv { namespace viz {
+    vtkSmartPointer<vtkRenderWindowInteractor> vtkCocoaRenderWindowInteractorNew();
+}} // namespace
+
+#if ((VTK_MAJOR_VERSION < 6) || ((VTK_MAJOR_VERSION == 6) && (VTK_MINOR_VERSION < 2)))
+
+
 //----------------------------------------------------------------------------
 @interface vtkCocoaServerFix : NSObject
 {
@@ -160,99 +161,8 @@
 
 //----------------------------------------------------------------------------
 
-#if VTK_MAJOR_VERSION >= 6 && VTK_MINOR_VERSION >=2 || VTK_MAJOR_VERSION >=7
-
 namespace cv { namespace viz
-    {
-        class vtkCocoaRenderWindowInteractorFix : public vtkCocoaRenderWindowInteractor
-        {
-        public:
-            static vtkCocoaRenderWindowInteractorFix *New ();
-            vtkTypeMacro (vtkCocoaRenderWindowInteractorFix, vtkCocoaRenderWindowInteractor)
-
-            virtual void Start ();
-            virtual void TerminateApp ();
-
-        protected:
-            vtkCocoaRenderWindowInteractorFix () {}
-            ~vtkCocoaRenderWindowInteractorFix () {}
-
-        private:
-            vtkCocoaRenderWindowInteractorFix (const vtkCocoaRenderWindowInteractorFix&);  // Not implemented.
-            void operator = (const vtkCocoaRenderWindowInteractorFix&);  // Not implemented.
-        };
-
-        vtkStandardNewMacro (vtkCocoaRenderWindowInteractorFix)
-
-        vtkSmartPointer<vtkRenderWindowInteractor> vtkCocoaRenderWindowInteractorNew();
-
-        class vtkCocoaRenderWindowFix : public vtkCocoaRenderWindow
-        {
-        public:
-            static vtkCocoaRenderWindowFix *New ();
-            vtkTypeMacro ( vtkCocoaRenderWindowFix, vtkCocoaRenderWindow)
-
-            virtual vtkCocoaServerFix * GetCocoaServer ();
-            virtual void SetCocoaServer (void* );
-
-        protected:
-            vtkCocoaRenderWindowFix () {}
-            ~vtkCocoaRenderWindowFix () {}
-
-        private:
-            vtkCocoaRenderWindowFix (const vtkCocoaRenderWindowInteractorFix&);  // Not implemented.
-            void operator = (const vtkCocoaRenderWindowFix&);  // Not implemented.
-        };
-
-        vtkStandardNewMacro (vtkCocoaRenderWindowFix)
-
-        vtkSmartPointer<vtkRenderWindow> vtkCocoaRenderWindowNew();
-    }}
-
-vtkCocoaServerFix * cv::viz::vtkCocoaRenderWindowFix::GetCocoaServer ()
 {
-    return reinterpret_cast<vtkCocoaServerFix*> (this->GetCocoaServer ());
-}
-
-void cv::viz::vtkCocoaRenderWindowFix::SetCocoaServer (void* server)
-{
-    this->SetCocoaServer (server);
-}
-
-void cv::viz::vtkCocoaRenderWindowInteractorFix::Start ()
-{
-    vtkCocoaRenderWindowFix* renWin = vtkCocoaRenderWindowFix::SafeDownCast(this->GetRenderWindow ());
-    if (renWin != NULL)
-    {
-        vtkCocoaServerFix *server = reinterpret_cast<vtkCocoaServerFix*> (renWin->GetCocoaServer ());
-        if (!renWin->GetCocoaServer ())
-        {
-            server = [vtkCocoaServerFix cocoaServerWithRenderWindow:renWin];
-            renWin->SetCocoaServer (reinterpret_cast<void*> (server));
-        }
-
-        [server start];
-    }
-}
-
-void cv::viz::vtkCocoaRenderWindowInteractorFix::TerminateApp ()
-{
-    vtkCocoaRenderWindowFix *renWin = vtkCocoaRenderWindowFix::SafeDownCast (this->RenderWindow);
-    if (renWin)
-    {
-        vtkCocoaServerFix *server = reinterpret_cast<vtkCocoaServerFix*> (renWin->GetCocoaServer ());
-        [server stop];
-    }
-}
-
-vtkSmartPointer<vtkRenderWindowInteractor> cv::viz::vtkCocoaRenderWindowInteractorNew()
-{
-    return vtkSmartPointer<vtkCocoaRenderWindowInteractorFix>::New();
-}
-
-#else
-namespace cv { namespace viz
-    {
     class vtkCocoaRenderWindowInteractorFix : public vtkCocoaRenderWindowInteractor
     {
     public:
@@ -272,9 +182,7 @@ namespace cv { namespace viz
     };
 
     vtkStandardNewMacro (vtkCocoaRenderWindowInteractorFix)
-
-        vtkSmartPointer<vtkRenderWindowInteractor> vtkCocoaRenderWindowInteractorNew();
-    }}
+}}
 
 void cv::viz::vtkCocoaRenderWindowInteractorFix::Start ()
 {
@@ -307,4 +215,12 @@ vtkSmartPointer<vtkRenderWindowInteractor> cv::viz::vtkCocoaRenderWindowInteract
     return vtkSmartPointer<vtkCocoaRenderWindowInteractorFix>::New();
 }
 
+
+#else
+
+vtkSmartPointer<vtkRenderWindowInteractor> cv::viz::vtkCocoaRenderWindowInteractorNew()
+{
+    return vtkSmartPointer<vtkCocoaRenderWindowInteractor>::New();
+}
+
 #endif

samples/cpp/tutorial_code/viz/creating_widgets.cpp

@@ -32,7 +32,7 @@ using namespace std;
  * @function help
  * @brief Display instructions to use this tutorial program
  */
-void help()
+static void help()
 {
     cout
     << "--------------------------------------------------------------------------"   << endl

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

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");

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