PlusToolkit · jamesobutler · Nov 22, 2022
diff --git a/src/Documentation/UserManual/DeviceVideoForWindows.dox b/src/Documentation/UserManual/DeviceVideoForWindows.dox
diff --git a/src/PlusConfigure.h.in b/src/PlusConfigure.h.in
@@ -88,7 +88,6 @@
 #cmakedefine PLUS_USE_PHIDGET_SPATIAL_TRACKER
 #cmakedefine PLUS_USE_NDI
 #cmakedefine PLUS_USE_ULTRASONIX_VIDEO
-#cmakedefine PLUS_USE_VFW_VIDEO
 #cmakedefine PLUS_USE_STEALTHLINK
 #cmakedefine PLUS_USE_IntuitiveDaVinci
 #cmakedefine PLUS_USE_PHILIPS_3D_ULTRASOUND

diff --git a/src/PlusDataCollection/CMakeLists.txt b/src/PlusDataCollection/CMakeLists.txt
@@ -35,7 +35,6 @@ OPTION(PLUS_USE_ULTRASONIX_VIDEO "Provide support for Ultrasonix ultrasound scan
 OPTION(PLUS_USE_BKPROFOCUS_VIDEO "Provide support for BK ProFocus ultrasound scanners through the OEM (TCP/IP) interface" OFF)
 OPTION(PLUS_USE_BKPROFOCUS_CAMERALINK "Provide support for BK ProFocus ultrasound scanners through CameraLink interface" OFF)
 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" OFF)
 OPTION(PLUS_USE_EPIPHAN "Provide support for the Epiphan" OFF)
 OPTION(PLUS_USE_CAPISTRANO_VIDEO "Provide support Capistrano Labs USB ultrasound probes" OFF)
 OPTION(PLUS_USE_WINPROBE_VIDEO "Provide support WinProbe ultrasound systems" OFF)
@@ -801,7 +800,7 @@ IF(PLUS_USE_PICOSCOPE)
     ${CMAKE_CURRENT_SOURCE_DIR}/PicoScope
     ${PicoScopeSDK_INCLUDE_DIR}
     )
-  
+
   IF(WIN32)
     LIST(APPEND ${PROJECT_NAME}_LIBS
       ${PicoScopeSDK_LIBRARY_DIR}/ps2000${CMAKE_STATIC_LIBRARY_SUFFIX}
@@ -815,7 +814,7 @@ IF(PLUS_USE_PICOSCOPE)
   LIST(APPEND External_Libraries_Install
     ${PicoScopeSDK_BINARY_DIR}/ps2000${CMAKE_SHARED_LIBRARY_SUFFIX}
     )
-    
+
 ENDIF()
 
 #--------------------------------------------------------------------------
@@ -935,7 +934,7 @@ IF(PLUS_USE_CLARIUS_OEM)
   LIST(APPEND ${PROJECT_NAME}_PRIVATE_LIBS
     ClariusOEM
     )
-    
+
   LIST(APPEND External_Libraries_Install
     ${ClariusOEM_BINARY_PATH}
   )
@@ -1489,35 +1488,6 @@ IF(PLUS_USE_IntuitiveDaVinci)
     )
 ENDIF()
 
-# --------------------------------------------------------------------------
-# Video-for-Windows video digitizer support
-IF(PLUS_USE_VFW_VIDEO)
-  SET(Vfw_SRCS
-    VideoForWindows/vtkPlusWin32VideoSource2.cxx
-    )
-  SET(Vfw_HDRS
-    VideoForWindows/vtkPlusWin32VideoSource2.h
-    )
-
-  LIST(APPEND ${PROJECT_NAME}_HDRS
-    ${Vfw_HDRS}
-    )
-
-  LIST(APPEND ${PROJECT_NAME}_SRCS
-    ${Vfw_SRCS}
-    )
-
-  LIST(APPEND ${PROJECT_NAME}_LIBS
-    ws2_32
-    )
-  LIST(APPEND ${PROJECT_NAME}_INCLUDE_DIRS
-    ${CMAKE_CURRENT_SOURCE_DIR}/VideoForWindows
-    )
-  LIST(APPEND ${PROJECT_NAME}_LIBS
-    Vfw32.lib
-    )
-ENDIF()
-
 # --------------------------------------------------------------------------
 # Microsoft Media Foundation video digitizer support
 IF(PLUS_USE_MMF_VIDEO)
@@ -2346,16 +2316,16 @@ IF(PLUS_USE_ANDOR_CAMERA)
   SET(Andor_HDRS
     Andor/vtkPlusAndorVideoSource.h
     )
-  
+
   LIST(APPEND ${PROJECT_NAME}_HDRS
     ${Andor_HDRS}
     )
 
   LIST(APPEND ${PROJECT_NAME}_SRCS
     ${Andor_SRCS}
     )
-  
-  LIST(APPEND ${PROJECT_NAME}_LIBS 
+
+  LIST(APPEND ${PROJECT_NAME}_LIBS
     ${ANDOR_LIBRARY_DIR}/${ANDOR_LIBRARY}${CMAKE_STATIC_LIBRARY_SUFFIX}
     )
   LIST(APPEND ${PROJECT_NAME}_INCLUDE_DIRS
@@ -2634,7 +2604,6 @@ source_group("Capistrano" FILES ${Capistrano_HDRS} ${Capistrano_SRCS})
 source_group("WinProbe" FILES ${WinProbe_HDRS} ${WinProbe_SRCS})
 source_group("Epiphan" FILES ${Epiphan_HDRS} ${Epiphan_SRCS})
 source_group("MicrosoftMediaFoundation" FILES ${Mmf_HDRS} ${Mmf_SRCS})
-source_group("VideoForWindows" FILES ${Vfw_HDRS} ${Vfw_SRCS})
 source_group("daVinci" FILES ${daVinci_HDRS} ${daVinci_SRCS})
 source_group("StealthLink" FILES ${StealthLink_HDRS} ${StealthLink_SRCS})
 source_group("ICCapturing" FILES ${ICCapturing_HDRS} ${ICCapturing_SRCS})

diff --git a/src/PlusDataCollection/Testing/CMakeLists.txt b/src/PlusDataCollection/Testing/CMakeLists.txt
@@ -192,9 +192,9 @@ IF(PLUS_USE_INTERSONSDKCXX_VIDEO AND PLUS_RENDERING_ENABLED)
   ADD_EXECUTABLE(vtkIntersonSDKCxxVideoSourceTest vtkintersonSDKCxxVideoSourceTest.cxx)
   SET_TARGET_PROPERTIES(vtkIntersonSDKCxxVideoSourceTest PROPERTIES FOLDER Tests)
   TARGET_LINK_LIBRARIES(vtkIntersonSDKCxxVideoSourceTest vtkPlusDataCollection vtkPlusCommon ${PLUSLIB_VTK_PREFIX}InteractionImage)
-  ADD_TEST(NAME vtkIntersonSDKCxxVideoSourceTest 
+  ADD_TEST(NAME vtkIntersonSDKCxxVideoSourceTest
     COMMAND $<TARGET_FILE:vtkIntersonSDKCxxVideoSourceTest>
-    --rendering-off 
+    --rendering-off
     --config-file=${ConfigFilesDir}/Testing/PlusDeviceSet_IntersonSDKCxxVideoSourceTest.xml
     )
   ADD_TEST(NAME vtkIntersonSDKCxxVideoSourceScanConvertTest
@@ -295,7 +295,7 @@ IF(PLUS_USE_ICCAPTURING_VIDEO AND PLUS_RENDERING_ENABLED)
   ADD_EXECUTABLE(vtkICCapturingSourceTest1 vtkICCapturingSourceTest1.cxx )
   SET_TARGET_PROPERTIES(vtkICCapturingSourceTest1 PROPERTIES FOLDER Tests)
   TARGET_LINK_LIBRARIES(vtkICCapturingSourceTest1 vtkPlusDataCollection ${PLUSLIB_VTK_PREFIX}InteractionImage)
-  # ADD_TEST(vtkICCapturingSourceTest1 
+  # ADD_TEST(vtkICCapturingSourceTest1
   #   ${PLUS_EXECUTABLE_OUTPUT_PATH}/vtkICCapturingSourceTest1
   #   --rendering-off
   #   )
@@ -334,8 +334,8 @@ ENDIF()
 IF(PLUS_USE_CAPISTRANO_VIDEO AND PLUS_RENDERING_ENABLED)
   ADD_EXECUTABLE(vtkCapistranoVideoSourceTest vtkCapistranoVideoSourceTest.cxx )
   SET_TARGET_PROPERTIES(vtkCapistranoVideoSourceTest PROPERTIES FOLDER Tests)
-  TARGET_LINK_LIBRARIES(vtkCapistranoVideoSourceTest vtkPlusDataCollection ${PLUSLIB_VTK_PREFIX}InteractionImage) 
-  ADD_TEST(NAME vtkCapistranoVideoSourceTest 
+  TARGET_LINK_LIBRARIES(vtkCapistranoVideoSourceTest vtkPlusDataCollection ${PLUSLIB_VTK_PREFIX}InteractionImage)
+  ADD_TEST(NAME vtkCapistranoVideoSourceTest
     COMMAND $<TARGET_FILE:vtkCapistranoVideoSourceTest>
     --rendering-off
     --config-file=${ConfigFilesDir}/Testing/PlusDeviceSet_CapistranoVideoSourceTest.xml
@@ -346,8 +346,8 @@ ENDIF()
 IF(PLUS_USE_WINPROBE_VIDEO AND PLUS_RENDERING_ENABLED)
   ADD_EXECUTABLE(vtkWinProbeVideoSourceTest vtkWinProbeVideoSourceTest.cxx )
   SET_TARGET_PROPERTIES(vtkWinProbeVideoSourceTest PROPERTIES FOLDER Tests)
-  TARGET_LINK_LIBRARIES(vtkWinProbeVideoSourceTest vtkPlusDataCollection ${PLUSLIB_VTK_PREFIX}InteractionImage) 
-  ADD_TEST(NAME vtkWinProbeVideoSourceTest 
+  TARGET_LINK_LIBRARIES(vtkWinProbeVideoSourceTest vtkPlusDataCollection ${PLUSLIB_VTK_PREFIX}InteractionImage)
+  ADD_TEST(NAME vtkWinProbeVideoSourceTest
     COMMAND $<TARGET_FILE:vtkWinProbeVideoSourceTest>
     --rendering-off
     --output-seq-file=${TEST_OUTPUT_PATH}/WinProbeTest.igs.nrrd
@@ -361,7 +361,7 @@ ENDIF()
 IF(PLUS_USE_INTERSON_VIDEO AND PLUS_RENDERING_ENABLED)
   ADD_EXECUTABLE(vtkIntersonVideoSourceTest vtkIntersonVideoSourceTest.cxx )
   SET_TARGET_PROPERTIES(vtkIntersonVideoSourceTest PROPERTIES FOLDER Tests)
-  TARGET_LINK_LIBRARIES(vtkIntersonVideoSourceTest vtkPlusDataCollection ${PLUSLIB_VTK_PREFIX}InteractionImage) 
+  TARGET_LINK_LIBRARIES(vtkIntersonVideoSourceTest vtkPlusDataCollection ${PLUSLIB_VTK_PREFIX}InteractionImage)
 ENDIF()
 
 #*************************** vtkTelemedVideoSourceTest.cxx ***************************
@@ -396,7 +396,7 @@ IF(PLUS_USE_ULTRASONIX_VIDEO AND PLUS_RENDERING_ENABLED)
   ADD_EXECUTABLE(vtkSonixPortaVideoSourceTest vtkSonixPortaVideoSourceTest.cxx )
   SET_TARGET_PROPERTIES(vtkSonixPortaVideoSourceTest PROPERTIES FOLDER Tests)
   TARGET_LINK_LIBRARIES(vtkSonixPortaVideoSourceTest vtkPlusDataCollection vtkPlusCommon ${PLUSLIB_VTK_PREFIX}InteractionImage)
-  # ADD_TEST(vtkSonixPortaVideoSourceTest 
+  # ADD_TEST(vtkSonixPortaVideoSourceTest
   # ${PLUS_EXECUTABLE_OUTPUT_PATH}/vtkSonixPortaVideoSourceTest
   # To be added if the 3D probe is attached to the machine
   # --setting-path=${ULTRASONIX_SDK_DIR}/porta/dat/
@@ -416,21 +416,14 @@ IF(PLUS_USE_ULTRASONIX_VIDEO AND PLUS_RENDERING_ENABLED)
 ENDIF()
 #Test is to be added.
 
-#*************************** vtkWin32VideoSourceTest.cxx ***************************
-IF(PLUS_USE_VFW_VIDEO AND PLUS_RENDERING_ENABLED)
-  ADD_EXECUTABLE(vtkWin32VideoSourceTest vtkWin32VideoSourceTest.cxx)
-  SET_TARGET_PROPERTIES(vtkWin32VideoSourceTest PROPERTIES FOLDER Tests)
-  TARGET_LINK_LIBRARIES(vtkWin32VideoSourceTest vtkPlusDataCollection ${PLUSLIB_VTK_PREFIX}InteractionImage)
-ENDIF()
-
 #*************************** vtkMmfVideoSourceTest.cxx ***************************
 IF(PLUS_USE_MMF_VIDEO AND PLUS_RENDERING_ENABLED)
   ADD_EXECUTABLE(vtkMmfVideoSourceTest vtkMmfVideoSourceTest.cxx )
   SET_TARGET_PROPERTIES(vtkMmfVideoSourceTest PROPERTIES FOLDER Tests)
   TARGET_LINK_LIBRARIES(vtkMmfVideoSourceTest vtkPlusDataCollection ${PLUSLIB_VTK_PREFIX}InteractionImage)
 
   IF(PLUS_TEST_MMF_VIDEO)
-    ADD_TEST(MmfVideoSourceTest 
+    ADD_TEST(MmfVideoSourceTest
       ${PLUS_EXECUTABLE_OUTPUT_PATH}/vtkMmfVideoSourceTest
       --rendering-off
       --frame-size 640 480
@@ -449,8 +442,8 @@ ENDIF()
 IF(PLUS_USE_MICRONTRACKER AND PLUS_RENDERING_ENABLED)
   ADD_EXECUTABLE(vtkMicronTrackerTest vtkMicronTrackerTest.cxx)
   SET_TARGET_PROPERTIES(vtkMicronTrackerTest PROPERTIES FOLDER Tests)
-  TARGET_LINK_LIBRARIES(vtkMicronTrackerTest vtkPlusDataCollection vtkPlusCommon ${PLUSLIB_VTK_PREFIX}InteractionImage)    
-ENDIF() 
+  TARGET_LINK_LIBRARIES(vtkMicronTrackerTest vtkPlusDataCollection vtkPlusCommon ${PLUSLIB_VTK_PREFIX}InteractionImage)
+ENDIF()
 
 #*************************** IntelRealSenseTrackerTest ***************************
 IF(PLUS_USE_INTELREALSENSE AND PLUS_RENDERING_ENABLED)
@@ -582,10 +575,10 @@ ENDIF()
 IF(PLUS_USE_ANDOR_CAMERA)
   ADD_EXECUTABLE(vtkAndorVideoSourceTest vtkAndorVideoSourceTest.cxx )
   SET_TARGET_PROPERTIES(vtkAndorVideoSourceTest PROPERTIES FOLDER Tests)
-  TARGET_LINK_LIBRARIES(vtkAndorVideoSourceTest vtkPlusDataCollection vtkInteractionImage) 
-  ADD_TEST(NAME vtkAndorVideoSourceTest 
+  TARGET_LINK_LIBRARIES(vtkAndorVideoSourceTest vtkPlusDataCollection vtkInteractionImage)
+  ADD_TEST(NAME vtkAndorVideoSourceTest
     COMMAND $<TARGET_FILE:vtkAndorVideoSourceTest>
-    --rendering-off 
+    --rendering-off
     --config-file=${ConfigFilesDir}/Testing/PlusDeviceSet_AndorVideoSourceTest.xml
     --flat-correction-image=${TestDataDir}/AndorTestFlat.png
     --bias-correction-image=${TestDataDir}/AndorTestBias.png
@@ -613,7 +606,7 @@ IF(PLUS_USE_GENERIC_SENSOR_TRACKER)
     SET_TARGET_PROPERTIES(GenericSensorTrackerTest1 PROPERTIES FOLDER Tests)
     TARGET_LINK_LIBRARIES(GenericSensorTrackerTest1 vtkPlusDataCollection)
 
-    ADD_TEST(GenericSensorTrackerTest1 
+    ADD_TEST(GenericSensorTrackerTest1
       ${PLUS_EXECUTABLE_OUTPUT_PATH}/GenericSensorTrackerTest1
       --config-file=${ConfigFilesDir}/Testing/PlusDeviceSet_DataCollectionOnly_GenericSensor.xml
       )
@@ -627,10 +620,10 @@ IF(PLUS_USE_AZUREKINECT)
   SET_TARGET_PROPERTIES(AzureKinectTest1 PROPERTIES FOLDER Tests)
   TARGET_LINK_LIBRARIES(AzureKinectTest1 vtkPlusDataCollection) # add any other dependencies to the test executable
 
-  ADD_TEST(AzureKinectTest1 
+  ADD_TEST(AzureKinectTest1
     ${PLUS_EXECUTABLE_OUTPUT_PATH}/AzureKinectTest1
     --rendering-off
-    --config-file=${ConfigFilesDir}/Testing/PlusDeviceSet_DataCollectionOnly_AzureKinect.xml 
+    --config-file=${ConfigFilesDir}/Testing/PlusDeviceSet_DataCollectionOnly_AzureKinect.xml
     )
   SET_TESTS_PROPERTIES(AzureKinectTest1 PROPERTIES FAIL_REGULAR_EXPRESSION "ERROR")
 ENDIF()