From c8ce19e9580592be9f4043dda0797a59ed9955b8 Mon Sep 17 00:00:00 2001 From: James Butler Date: Tue, 22 Nov 2022 17:25:02 -0500 Subject: [PATCH] COMP: Remove support for Video For Windows This device has been marked as deprecated since 2014 in https://github.com/PlusToolkit/PlusLib/commit/92c5c70460801aee551b14fb20e7f78af4e6b975. The MmfVideoDevice should be used instead. --- CMakeLists.txt | 7 +++---- Docs/NewReleaseChecklist.md | 1 - SuperBuild/External_PlusLib.cmake | 1 - 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0ed11e018..e80977712 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) @@ -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() @@ -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() @@ -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 diff --git a/Docs/NewReleaseChecklist.md b/Docs/NewReleaseChecklist.md index a0fb0583e..40f067044 100644 --- a/Docs/NewReleaseChecklist.md +++ b/Docs/NewReleaseChecklist.md @@ -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 diff --git a/SuperBuild/External_PlusLib.cmake b/SuperBuild/External_PlusLib.cmake index ea3835480..0537133a7 100644 --- a/SuperBuild/External_PlusLib.cmake +++ b/SuperBuild/External_PlusLib.cmake @@ -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}