generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

VTK off by default

Browse Source
This commit is contained in:
Anatoly Baksheev 2014-01-24 21:44:59 +04:00
parent 9145985ff4
commit 3dc2dbc17e
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -128,7 +128,7 @@ OCV_OPTION(WITH_1394 "Include IEEE1394 support" ON
OCV_OPTION(WITH_AVFOUNDATION "Use AVFoundation for Video I/O" ON IF IOS)
OCV_OPTION(WITH_CARBON "Use Carbon for UI instead of Cocoa" OFF IF APPLE )
OCV_OPTION(WITH_CUDA "Include NVidia Cuda Runtime support" ON IF (CMAKE_VERSION VERSION_GREATER "2.8" AND NOT IOS) )
OCV_OPTION(WITH_VTK "Include VTK library support (and build opencv_viz module eiher)" ON IF (NOT ANDROID AND NOT IOS) )
OCV_OPTION(WITH_VTK "Include VTK library support (and build opencv_viz module eiher)" OFF IF (NOT ANDROID AND NOT IOS) )
OCV_OPTION(WITH_CUFFT "Include NVidia Cuda Fast Fourier Transform (FFT) library support" ON IF (CMAKE_VERSION VERSION_GREATER "2.8" AND NOT IOS) )
OCV_OPTION(WITH_CUBLAS "Include NVidia Cuda Basic Linear Algebra Subprograms (BLAS) library support" OFF IF (CMAKE_VERSION VERSION_GREATER "2.8" AND NOT IOS) )
OCV_OPTION(WITH_NVCUVID "Include NVidia Video Decoding library support" OFF IF (CMAKE_VERSION VERSION_GREATER "2.8" AND NOT ANDROID AND NOT IOS AND NOT APPLE) )

6
modules/viz/include/opencv2/viz/vizcore.hpp
View File

@ -43,8 +43,8 @@
//
//M*/
#ifndef __OPENCV_VIZ_HPP__
#define __OPENCV_VIZ_HPP__
#ifndef __OPENCV_VIZCORE_HPP__
#define __OPENCV_VIZCORE_HPP__
#include <opencv2/viz/types.hpp>
#include <opencv2/viz/widgets.hpp>
@ -124,4 +124,4 @@ namespace cv
} /* namespace viz */
} /* namespace cv */
#endif /* __OPENCV_VIZ_HPP__ */
#endif /* __OPENCV_VIZCORE_HPP__ */

2
modules/viz/src/vizimpl.hpp
View File

@ -55,7 +55,7 @@ public:
int ref_counter;
VizImpl(const String &name);
virtual ~VizImpl() {};
virtual ~VizImpl() {}
bool wasStopped() const;
void close();