Merge branch 'T19348-SupportOpenCV3'
aaccb9a7de5f
Actions

Description

Merge branch 'T19348-SupportOpenCV3'

Details

Provenance

seitela	Authored on Apr 13 2018, 6:58 PM
seitela	Pushed on Apr 13 2018, 7:26 PM

Parents

rMITK3872109bab9e: Fixed T24429
rMITKabb8177f6cdf: Remove OpenCV2 related CMake code

Branches

Unknown

Tags

Unknown

Event Timeline

seitela committed rMITKaaccb9a7de5f: Merge branch 'T19348-SupportOpenCV3' (authored by seitela).Apr 13 2018, 6:58 PM

Merged Changes

abb8177f6cdf Remove OpenCV2 related CMake code
Author
seitela
Browse Repository
No Builds
No Audits
77c308cf5c5f Enable C++11 to build OpenCV using Linux
Author
eisenman
Browse Repository
No Builds
No Audits
df535ad6c650 Only add specific OpenCV search path for windows
Author
seitela
Browse Repository
No Builds
No Audits
f277e6b60789 Removed patch that is not necessary anymore
Author
seitela
Browse Repository
No Builds
No Audits
24319b282f2f Use correct OpenCV path variables to find search dirs
Author
seitela
Browse Repository
No Builds
No Audits
f01d9e8a280f Changed OpenCV download
Author
seitela
Browse Repository
No Builds
No Audits
dedbb6428fa3 Adapt indentation
Author
eisenman
Browse Repository
No Builds
No Audits
2035e0069fdf Apply minimal changes in order to migrate from OpenCV 2 to 3 (working with…
Author
eisenman
Browse Repository
No Builds
No Audits

Changes (23)

Path

Size

Packages

CMake/

PackageDepends/

MITK_OpenCV_Config.cmake

O1: MITK Reviewer Group I

mitkFunctionGetLibrarySearchPaths.cmake

O1: MITK Reviewer Group I

CMakeExternals/

OpenCV.cmake

O1: MITK Reviewer Group I

Modules/

CameraCalibration/

mitkEndoMacros.h

mitkTransform.h

mitkVnlMatrixFromCvMat.h

OpenCVVideoSupport/

Commands/

mitkConvertGrayscaleOpenCVImageFilter.cpp

mitkGrabCutOpenCVImageFilter.cpp

mitkGrabCutOpenCVImageFilter.h

Testing/

mitkBasicCombinationOpenCVImageFilterTest.cpp

mitkConvertGrayscaleOpenCVImageFilterTest.cpp

mitkCropOpenCVImageFilterTest.cpp

mitkGrabCutOpenCVImageFilterTest.cpp

mitkOpenCVToMitkImageFilterTest.cpp

mitkImageToOpenCVImageFilter.cpp

mitkImageToOpenCVImageFilter.h

mitkOpenCVToMitkImageFilter.cpp

mitkOpenCVToMitkImageFilter.h

mitkOpenCVVideoSource.cpp

mitkOpenCVVideoSource.h

ToFHardware/

mitkToFOpenCVImageGrabber.cpp

US/

USFilters/

mitkUSImageVideoSource.h

Plugins/

org.mitk.gui.qt.ultrasound/

src/

internal/

QmitkUltrasoundSupport.cpp

rMITKaaccb9a7de5f

View Options

CMake/PackageDepends/MITK_OpenCV_Config.cmake

View Options

CMake/mitkFunctionGetLibrarySearchPaths.cmake

View Options

CMakeExternals/OpenCV.cmake

View Options

Modules/CameraCalibration/mitkEndoMacros.h

View Options

Modules/CameraCalibration/mitkTransform.h

View Options

Modules/CameraCalibration/mitkVnlMatrixFromCvMat.h

View Options

Modules/OpenCVVideoSupport/Commands/mitkConvertGrayscaleOpenCVImageFilter.cpp

View Options

Modules/OpenCVVideoSupport/Commands/mitkGrabCutOpenCVImageFilter.cpp

View Options

Modules/OpenCVVideoSupport/Commands/mitkGrabCutOpenCVImageFilter.h

View Options

Modules/OpenCVVideoSupport/Testing/mitkBasicCombinationOpenCVImageFilterTest.cpp

View Options

Modules/OpenCVVideoSupport/Testing/mitkConvertGrayscaleOpenCVImageFilterTest.cpp

View Options

Modules/OpenCVVideoSupport/Testing/mitkCropOpenCVImageFilterTest.cpp

View Options

Modules/OpenCVVideoSupport/Testing/mitkGrabCutOpenCVImageFilterTest.cpp

View Options

Modules/OpenCVVideoSupport/Testing/mitkOpenCVToMitkImageFilterTest.cpp

View Options

Modules/OpenCVVideoSupport/mitkImageToOpenCVImageFilter.cpp

View Options

Modules/OpenCVVideoSupport/mitkImageToOpenCVImageFilter.h

View Options

Modules/OpenCVVideoSupport/mitkOpenCVToMitkImageFilter.cpp

View Options

Modules/OpenCVVideoSupport/mitkOpenCVToMitkImageFilter.h

View Options

Modules/OpenCVVideoSupport/mitkOpenCVVideoSource.cpp

View Options

Modules/OpenCVVideoSupport/mitkOpenCVVideoSource.h

View Options

Modules/ToFHardware/mitkToFOpenCVImageGrabber.cpp

View Options

Modules/US/USFilters/mitkUSImageVideoSource.h

View Options

Plugins/org.mitk.gui.qt.ultrasound/src/internal/QmitkUltrasoundSupport.cpp

Merge branch 'T19348-SupportOpenCV3'aaccb9a7de5fActions

Description

Details

Event Timeline

Merged Changes

Changes (23)

rMITKaaccb9a7de5f

CMake/PackageDepends/MITK_OpenCV_Config.cmake

CMake/mitkFunctionGetLibrarySearchPaths.cmake

CMakeExternals/OpenCV.cmake

Modules/CameraCalibration/mitkEndoMacros.h

Modules/CameraCalibration/mitkTransform.h

Modules/CameraCalibration/mitkVnlMatrixFromCvMat.h

Modules/OpenCVVideoSupport/Commands/mitkConvertGrayscaleOpenCVImageFilter.cpp

Modules/OpenCVVideoSupport/Commands/mitkGrabCutOpenCVImageFilter.cpp

Modules/OpenCVVideoSupport/Commands/mitkGrabCutOpenCVImageFilter.h

Modules/OpenCVVideoSupport/Testing/mitkBasicCombinationOpenCVImageFilterTest.cpp

Modules/OpenCVVideoSupport/Testing/mitkConvertGrayscaleOpenCVImageFilterTest.cpp

Modules/OpenCVVideoSupport/Testing/mitkCropOpenCVImageFilterTest.cpp

Modules/OpenCVVideoSupport/Testing/mitkGrabCutOpenCVImageFilterTest.cpp

Modules/OpenCVVideoSupport/Testing/mitkOpenCVToMitkImageFilterTest.cpp

Modules/OpenCVVideoSupport/mitkImageToOpenCVImageFilter.cpp

Modules/OpenCVVideoSupport/mitkImageToOpenCVImageFilter.h

Modules/OpenCVVideoSupport/mitkOpenCVToMitkImageFilter.cpp

Modules/OpenCVVideoSupport/mitkOpenCVToMitkImageFilter.h

Modules/OpenCVVideoSupport/mitkOpenCVVideoSource.cpp

Modules/OpenCVVideoSupport/mitkOpenCVVideoSource.h

Modules/ToFHardware/mitkToFOpenCVImageGrabber.cpp

Modules/US/USFilters/mitkUSImageVideoSource.h

Plugins/org.mitk.gui.qt.ultrasound/src/internal/QmitkUltrasoundSupport.cpp

Merge branch 'T19348-SupportOpenCV3'
aaccb9a7de5f
Actions