[opencv] 42/89: Revert "Fix for VTK6.2 issue."
Nobuhiro Iwamatsu
iwamatsu at moszumanska.debian.org
Sat May 13 09:57:24 UTC 2017
This is an automated email from the git hooks/post-receive script.
iwamatsu pushed a commit to annotated tag 2.4.13.2
in repository opencv.
commit 4a759abe393f85bbcfcc79171c73a3c98fdfb810
Author: Alexander Alekhin <alexander.alekhin at intel.com>
Date: Fri Oct 21 17:57:33 2016 +0300
Revert "Fix for VTK6.2 issue."
This reverts commit f45da9866a94dbf52f5fb955bea67fce913ca515.
---
modules/viz/src/vtk/vtkCocoaInteractorFix.mm | 235 ++++++++-------------------
1 file changed, 68 insertions(+), 167 deletions(-)
diff --git a/modules/viz/src/vtk/vtkCocoaInteractorFix.mm b/modules/viz/src/vtk/vtkCocoaInteractorFix.mm
index 481baf9..dad41b0 100644
--- a/modules/viz/src/vtk/vtkCocoaInteractorFix.mm
+++ b/modules/viz/src/vtk/vtkCocoaInteractorFix.mm
@@ -1,54 +1,48 @@
/*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>
@@ -124,14 +118,14 @@
[application stop:application];
NSEvent *event = [NSEvent otherEventWithType:NSApplicationDefined
- location:NSMakePoint(0.0,0.0)
- modifierFlags:0
- timestamp:0
- windowNumber:-1
- context:nil
- subtype:0
- data1:0
- data2:0];
+ location:NSMakePoint(0.0,0.0)
+ modifierFlags:0
+ timestamp:0
+ windowNumber:-1
+ context:nil
+ subtype:0
+ data1:0
+ data2:0];
[application postEvent:event atStart:YES];
}
@@ -160,121 +154,30 @@
//----------------------------------------------------------------------------
-#if VTK_MAJOR_VERSION >= 6 && VTK_MINOR_VERSION >=2
-
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)
+ class vtkCocoaRenderWindowInteractorFix : public vtkCocoaRenderWindowInteractor
{
- 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:
- static vtkCocoaRenderWindowInteractorFix *New ();
- vtkTypeMacro (vtkCocoaRenderWindowInteractorFix, vtkCocoaRenderWindowInteractor)
+ public:
+ static vtkCocoaRenderWindowInteractorFix *New ();
+ vtkTypeMacro (vtkCocoaRenderWindowInteractorFix, vtkCocoaRenderWindowInteractor)
- virtual void Start ();
- virtual void TerminateApp ();
+ virtual void Start ();
+ virtual void TerminateApp ();
- protected:
- vtkCocoaRenderWindowInteractorFix () {}
- ~vtkCocoaRenderWindowInteractorFix () {}
+ protected:
+ vtkCocoaRenderWindowInteractorFix () {}
+ ~vtkCocoaRenderWindowInteractorFix () {}
- private:
- vtkCocoaRenderWindowInteractorFix (const vtkCocoaRenderWindowInteractorFix&); // Not implemented.
- void operator = (const vtkCocoaRenderWindowInteractorFix&); // Not implemented.
- };
+ private:
+ vtkCocoaRenderWindowInteractorFix (const vtkCocoaRenderWindowInteractorFix&); // Not implemented.
+ void operator = (const vtkCocoaRenderWindowInteractorFix&); // Not implemented.
+ };
- vtkStandardNewMacro (vtkCocoaRenderWindowInteractorFix)
+ vtkStandardNewMacro (vtkCocoaRenderWindowInteractorFix)
- vtkSmartPointer<vtkRenderWindowInteractor> vtkCocoaRenderWindowInteractorNew();
- }}
+ vtkSmartPointer<vtkRenderWindowInteractor> vtkCocoaRenderWindowInteractorNew();
+}}
void cv::viz::vtkCocoaRenderWindowInteractorFix::Start ()
{
@@ -306,5 +209,3 @@ vtkSmartPointer<vtkRenderWindowInteractor> cv::viz::vtkCocoaRenderWindowInteract
{
return vtkSmartPointer<vtkCocoaRenderWindowInteractorFix>::New();
}
-
-#endif
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/opencv.git
More information about the debian-science-commits
mailing list