Merge branch 'T24714-CleanupOldOpenCVCode' into T24609-v2018.04-alpha
4347e5904bf3
Actions

Description

Merge branch 'T24714-CleanupOldOpenCVCode' into T24609-v2018.04-alpha

Details

Provenance

seitela	Authored on Apr 25 2018, 6:02 PM
seitela	Pushed on Apr 25 2018, 6:03 PM

Parents

rMITKf4d1779646bb: Removed unneccesary includes
rMITK8ae8f1bb580f: Merge branch 'T24684-DisplaySliderValuesInUltrasound' into T24609-v2018.04-alpha

Branches

Unknown

Tags

Unknown

Event Timeline

seitela committed rMITK4347e5904bf3: Merge branch 'T24714-CleanupOldOpenCVCode' into T24609-v2018.04-alpha (authored by seitela).Apr 25 2018, 6:02 PM

Merged Changes

f4d1779646bb Removed unneccesary includes
Author
seitela
Browse Repository
No Builds
No Audits
e84836b3af4c Use opencv2/core.hpp instead of cv.h include
Author
seitela
Browse Repository
No Builds
No Audits
3737766f031a Use new OpenCV include
Author
seitela
Browse Repository
No Builds
No Audits
46aba4b3ff35 fixed opencv includes
Author
seitela
Browse Repository
No Builds
No Audits
d222b99dbdb7 changed to new opencv includes
Author
seitela
Browse Repository
No Builds
No Audits

Changes (13)

Path

Size

Modules/

CameraCalibration/

mitkCameraIntrinsics.h

mitkCvMatFromVnlMatrix.h

mitkStringFromCvMat.h

OpenCVVideoSupport/

Commands/

mitkBasicCombinationOpenCVImageFilter.cpp

UI/

QmitkOpenCVVideoControls.h

mitkOpenCVImageSource.h

mitkUndistortCameraImage.h

mitkVideoInputSource.h

ToFProcessing/

mitkToFCompositeFilter.cpp

mitkToFCompositeFilter.h

mitkToFDistanceImageToSurfaceFilter.h

US/

USFilters/

mitkUSImageSource.h

mitkUSImageVideoSource.cpp

rMITK4347e5904bf3

View Options

Modules/CameraCalibration/mitkCameraIntrinsics.h

View Options

Modules/CameraCalibration/mitkCvMatFromVnlMatrix.h

View Options

Modules/CameraCalibration/mitkStringFromCvMat.h

View Options

Modules/OpenCVVideoSupport/Commands/mitkBasicCombinationOpenCVImageFilter.cpp

View Options

Modules/OpenCVVideoSupport/UI/QmitkOpenCVVideoControls.h

View Options

Modules/OpenCVVideoSupport/mitkOpenCVImageSource.h

View Options

Modules/OpenCVVideoSupport/mitkUndistortCameraImage.h

View Options

Modules/OpenCVVideoSupport/mitkVideoInputSource.h

View Options

Modules/ToFProcessing/mitkToFCompositeFilter.cpp

View Options

Modules/ToFProcessing/mitkToFCompositeFilter.h

View Options

Modules/ToFProcessing/mitkToFDistanceImageToSurfaceFilter.h

View Options

Modules/US/USFilters/mitkUSImageSource.h

View Options

Modules/US/USFilters/mitkUSImageVideoSource.cpp

Merge branch 'T24714-CleanupOldOpenCVCode' into T24609-v2018.04-alpha4347e5904bf3Actions

Description

Details

Event Timeline

Merged Changes

Changes (13)

rMITK4347e5904bf3

Modules/CameraCalibration/mitkCameraIntrinsics.h

Modules/CameraCalibration/mitkCvMatFromVnlMatrix.h

Modules/CameraCalibration/mitkStringFromCvMat.h

Modules/OpenCVVideoSupport/Commands/mitkBasicCombinationOpenCVImageFilter.cpp

Modules/OpenCVVideoSupport/UI/QmitkOpenCVVideoControls.h

Modules/OpenCVVideoSupport/mitkOpenCVImageSource.h

Modules/OpenCVVideoSupport/mitkUndistortCameraImage.h

Modules/OpenCVVideoSupport/mitkVideoInputSource.h

Modules/ToFProcessing/mitkToFCompositeFilter.cpp

Modules/ToFProcessing/mitkToFCompositeFilter.h

Modules/ToFProcessing/mitkToFDistanceImageToSurfaceFilter.h

Modules/US/USFilters/mitkUSImageSource.h

Modules/US/USFilters/mitkUSImageVideoSource.cpp

Merge branch 'T24714-CleanupOldOpenCVCode' into T24609-v2018.04-alpha
4347e5904bf3
Actions