Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

COMP: Remove support for Video For Windows #85

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

COMP: Remove support for Video For Windows #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,6 @@ IF(PLUS_USE_BKPROFOCUS_CAMERALINK AND (NOT PLUS_USE_BKPROFOCUS_VIDEO))
ENDIF()

OPTION(PLUS_USE_ICCAPTURING_VIDEO "Provide support for the IC framegrabber device" OFF)
OPTION(PLUS_USE_VFW_VIDEO "Provide support for the Video-for-Windows video digitizer (legacy, use Microsoft Media Foundation instead)" OFF)
OPTION(PLUS_USE_MMF_VIDEO "Provide support for the Microsoft Media Foundation video digitizers (requires installation of Windows Platform SDK 7.1 or later)" OFF)
IF(PLUS_USE_MMF_VIDEO)
OPTION(PLUS_TEST_MMF_VIDEO "Enable testing of acquisition from MMF video device (webcam). Enable this only if an MMF device is connected to this computer." OFF)
Expand Down Expand Up @@ -260,7 +259,7 @@ OPTION(PLUS_USE_ANDOR_CAMERA "Provide support for the Andor cameras capture stre

# ---------- Tracking Hardware ------------
OPTION(PLUS_USE_OPTITRACK "Provide support for the OptiTrack tracking system" OFF)
IF (PLUS_USE_OPTITRACK)
IF (PLUS_USE_OPTITRACK)
IF(NOT BUILD_ARCHITECTURE MATCHES "x64")
SET(MOTIVE_VERSION_DEFAULT "1.10.3")
ELSE()
Expand Down Expand Up @@ -316,7 +315,7 @@ OPTION(PLUS_USE_LEAPMOTION "Provide support for the LeapMotion hand tracker" OFF
IF(PLUS_USE_LEAPMOTION)
OPTION(PLUS_TEST_LEAPMOTION "Enable testing of LeapMotion device" OFF)
FIND_PACKAGE(LeapSDK 4.0 REQUIRED
PATHS
PATHS
../VASSTTools/LeapMotion/LeapSDK/lib/cmake/LeapSDK # Convenience for members of the VASST lab
)
ENDIF()
Expand Down Expand Up @@ -554,7 +553,7 @@ ENDIF()
IF (PLUS_USE_ANDOR_CAMERA AND NOT PLUSBUILD_USE_OpenCV)
MESSAGE("PLUSE_USE_ANDOR_CAMERA requires openCV option enabled, enabling.")
SET(PLUSBUILD_USE_OpenCV ON CACHE BOOL "Use OpenCV for optical marker tracking and other features." FORCE)
ENDIF()
ENDIF()
#--- END ANDOR dependency on opencv

# OpenCV dependency, MUST COME AFTER VTK external inclusion
Expand Down
1 change: 0 additions & 1 deletion Docs/NewReleaseChecklist.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@ Double-check that all main features of Plus work before releasing stable build.
- [ ] Ultrasound imaging using Interson
- [ ] Ultrasound imaging using Telemed
- [ ] Image acquisition using Epiphan
- [ ] Image acquisition using webcam - Video for Windows
- [ ] Grayscale image acquisition using webcam - MMF
- [ ] Color image acquisition using webcam - MMF
- [ ] Image acquisition using ImagingControls
Expand Down
1 change: 0 additions & 1 deletion SuperBuild/External_PlusLib.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -509,7 +509,6 @@ ExternalProject_Add(PlusLib
-DPLUS_USE_INTERSONARRAYSDKCXX_VIDEO:BOOL=${PLUS_USE_INTERSONARRAYSDKCXX_VIDEO}
-DPLUS_USE_TELEMED_VIDEO:BOOL=${PLUS_USE_TELEMED_VIDEO}
-DPLUS_USE_THORLABS_VIDEO:BOOL=${PLUS_USE_THORLABS_VIDEO}
-DPLUS_USE_VFW_VIDEO:BOOL=${PLUS_USE_VFW_VIDEO}
-DPLUS_USE_EPIPHAN:BOOL=${PLUS_USE_EPIPHAN}
-DPLUS_USE_NDI:BOOL=${PLUS_USE_NDI}
-DPLUS_USE_NDI_CERTUS:BOOL=${PLUS_USE_NDI_CERTUS}
Expand Down