Diffusion MITK 511928f9940f

Merge branch 'bug-9965-EliminateWarnings2'
511928f9940f
Actions

Description

Merge branch 'bug-9965-EliminateWarnings2'

Details

Provenance

kislinsk

Authored on Jan 12 2012, 5:36 PM

Parents

rMITK5ed67f68fbfb: Fixed merge conflict.
rMITK736b2c287d5d: Merge branch 'bug-10116-FiberBundleXintegration'

Branches

Unknown

Tags

Unknown

Event Timeline

kislinsk committed rMITK511928f9940f: Merge branch 'bug-9965-EliminateWarnings2' (authored by kislinsk).Jan 12 2012, 5:36 PM

Merged Changes

5ed67f68fbfb Fixed merge conflict.
Author
kislinsk
Browse Repository
No Builds
No Audits
63f2a3ea13f0 Reordered initialization lists. Fixed comparisations between signed and…
Author
kislinsk
Browse Repository
No Builds
No Audits

Changes (53)

Path

Size

Packages

BlueBerry/

Bundles/

org.blueberry.osgi/

src/

berryExtensionType.h

Core/

Code/

Controllers/

mitkPlanePositionManager.cpp

mitkRenderingManager.cpp

DataManagement/

mitkAbstractTransformGeometry.cpp

mitkGeometry3D.cpp

mitkGroupTagProperty.cpp

mitkPlaneGeometry.cpp

mitkRestorePlanePositionOperation.cpp

Testing/

DICOMTesting/

Testing/

mitkDICOMTestingSanityTest.cpp

mitkTestDICOMLoading.cpp

mitkClippedSurfaceBoundsCalculatorTest.cpp

mitkDicomSeriesReaderTest.cpp

mitkPlanePositionManagerTest.cpp

mitkPointSetInteractorTest.cpp

mitkSliceNavigationControllerTest.cpp

CoreUI/

Bundles/

org.mitk.core.services/

src/

internal/

mitkPluginActivator.cpp

Qmitk/

QmitkLineEditLevelWindowWidget.cpp

QmitkRenderWindow.cpp

QmitkRenderWindowMenu.cpp

QmitkStdMultiWidget.cpp

Documentation/

Snippets/

uServices-singleton/

main.cpp

Modules/

Bundles/

org.mitk.gui.qt.diffusionimaging/

src/

internal/

QmitkPartialVolumeAnalysisView.cpp

DiffusionImaging/

IODataStructures/

DiffusionWeightedImages/

mitkNrrdDiffusionImageReader.cpp

Tractography/

GibbsTracking/

ParticleGrid.cpp

auxilary_classes.cpp

IGT/

IGTFilters/

mitkNavigationDataPlayer.cpp

mitkNavigationDataPlayer.h

mitkNavigationDataPlayerBase.h

ImageExtraction/

Testing/

mitkCompareImageSliceTestHelper.h

ImageStatistics/

Testing/

mitkImageStatisticsCalculatorTest.cpp

O1: MITK Reviewer Group I

mitkPointSetDifferenceStatisticsCalculatorTest.cpp

O1: MITK Reviewer Group I

mitkPointSetStatisticsCalculatorTest.cpp

O1: MITK Reviewer Group I

mitkImageStatisticsCalculator.cpp

O1: MITK Reviewer Group I

mitkPointSetDifferenceStatisticsCalculator.cpp

O1: MITK Reviewer Group I

mitkPointSetStatisticsCalculator.cpp

O1: MITK Reviewer Group I

MitkExt/

Algorithms/

mitkReduceContourSetFilter.cpp

Testing/

mitkCompareImageSliceTestHelper.h

PlanarFigure/

DataManagement/

mitkPlanarAngle.cpp

O1: MITK Reviewer Group I

mitkPlanarFigure.cpp

O1: MITK Reviewer Group I

mitkPlanarPolygon.cpp

O1: MITK Reviewer Group I

Interactions/

mitkPlanarFigureInteractor.cpp

O1: MITK Reviewer Group I

Testing/

mitkPlanarFigureIOTest.cpp

O1: MITK Reviewer Group I

mitkPlanarPolygonTest.cpp

O1: MITK Reviewer Group I

mitkPlanarSubdivisionPolygonTest.cpp

O1: MITK Reviewer Group I

SceneSerialization/

Testing/

mitkSceneIOTest.cpp

O1: MITK Reviewer Group I

ToFHardware/

mitkToFCameraDevice.cpp

mitkToFCameraMITKPlayerController.cpp

mitkToFCameraMITKPlayerDevice.cpp

mitkToFCameraPMDDevice.cpp

mitkToFCameraPMDRawDataDevice.cpp

mitkToFCameraPMDRawDataDevice.h

ToFProcessing/

mitkToFDistanceImageToPointSetFilter.cpp

mitkToFDistanceImageToSurfaceFilter.cpp

rMITK511928f9940f

View Options

BlueBerry/Bundles/org.blueberry.osgi/src/berryExtensionType.h

View Options

Core/Code/Controllers/mitkPlanePositionManager.cpp

View Options

Core/Code/Controllers/mitkRenderingManager.cpp

View Options

Core/Code/DataManagement/mitkAbstractTransformGeometry.cpp

View Options

Core/Code/DataManagement/mitkGeometry3D.cpp

View Options

Core/Code/DataManagement/mitkGroupTagProperty.cpp

View Options

Core/Code/DataManagement/mitkPlaneGeometry.cpp

View Options

Core/Code/DataManagement/mitkRestorePlanePositionOperation.cpp

View Options

Core/Code/Testing/DICOMTesting/Testing/mitkDICOMTestingSanityTest.cpp

View Options

Core/Code/Testing/DICOMTesting/mitkTestDICOMLoading.cpp

View Options

Core/Code/Testing/mitkClippedSurfaceBoundsCalculatorTest.cpp

View Options

Core/Code/Testing/mitkDicomSeriesReaderTest.cpp

View Options

Core/Code/Testing/mitkPlanePositionManagerTest.cpp

View Options

Core/Code/Testing/mitkPointSetInteractorTest.cpp

View Options

Core/Code/Testing/mitkSliceNavigationControllerTest.cpp

View Options

CoreUI/Bundles/org.mitk.core.services/src/internal/mitkPluginActivator.cpp

View Options

CoreUI/Qmitk/QmitkLineEditLevelWindowWidget.cpp

View Options

CoreUI/Qmitk/QmitkRenderWindow.cpp

View Options

CoreUI/Qmitk/QmitkRenderWindowMenu.cpp

View Options

CoreUI/Qmitk/QmitkStdMultiWidget.cpp

View Options

Documentation/Snippets/uServices-singleton/main.cpp

View Options

Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkPartialVolumeAnalysisView.cpp

View Options

Modules/DiffusionImaging/IODataStructures/DiffusionWeightedImages/mitkNrrdDiffusionImageReader.cpp

View Options

Modules/DiffusionImaging/Tractography/GibbsTracking/ParticleGrid.cpp

View Options

Modules/DiffusionImaging/Tractography/GibbsTracking/auxilary_classes.cpp

View Options

Modules/IGT/IGTFilters/mitkNavigationDataPlayer.cpp

View Options

Modules/IGT/IGTFilters/mitkNavigationDataPlayer.h

View Options

Modules/IGT/IGTFilters/mitkNavigationDataPlayerBase.h

View Options

Modules/ImageExtraction/Testing/mitkCompareImageSliceTestHelper.h

View Options

Modules/ImageStatistics/Testing/mitkImageStatisticsCalculatorTest.cpp

View Options

Modules/ImageStatistics/Testing/mitkPointSetDifferenceStatisticsCalculatorTest.cpp

View Options

Modules/ImageStatistics/Testing/mitkPointSetStatisticsCalculatorTest.cpp

View Options

Modules/ImageStatistics/mitkImageStatisticsCalculator.cpp

View Options

Modules/ImageStatistics/mitkPointSetDifferenceStatisticsCalculator.cpp

View Options

Modules/ImageStatistics/mitkPointSetStatisticsCalculator.cpp

View Options

Modules/MitkExt/Algorithms/mitkReduceContourSetFilter.cpp

View Options

Modules/MitkExt/Testing/mitkCompareImageSliceTestHelper.h

View Options

Modules/PlanarFigure/DataManagement/mitkPlanarAngle.cpp

View Options

Modules/PlanarFigure/DataManagement/mitkPlanarFigure.cpp

View Options

Modules/PlanarFigure/DataManagement/mitkPlanarPolygon.cpp

View Options

Modules/PlanarFigure/Interactions/mitkPlanarFigureInteractor.cpp

View Options

Modules/PlanarFigure/Testing/mitkPlanarFigureIOTest.cpp

View Options

Modules/PlanarFigure/Testing/mitkPlanarPolygonTest.cpp

View Options

Modules/PlanarFigure/Testing/mitkPlanarSubdivisionPolygonTest.cpp

View Options

Modules/SceneSerialization/Testing/mitkSceneIOTest.cpp

View Options

Modules/ToFHardware/mitkToFCameraDevice.cpp

View Options

Modules/ToFHardware/mitkToFCameraMITKPlayerController.cpp

View Options

Modules/ToFHardware/mitkToFCameraMITKPlayerDevice.cpp

View Options

Modules/ToFHardware/mitkToFCameraPMDDevice.cpp

View Options

Modules/ToFHardware/mitkToFCameraPMDRawDataDevice.cpp

View Options

Modules/ToFHardware/mitkToFCameraPMDRawDataDevice.h

View Options

Modules/ToFProcessing/mitkToFDistanceImageToPointSetFilter.cpp

View Options

Modules/ToFProcessing/mitkToFDistanceImageToSurfaceFilter.cpp

Merge branch 'bug-9965-EliminateWarnings2'511928f9940fActions

Description

Details

Event Timeline

Merged Changes

Changes (53)

rMITK511928f9940f

BlueBerry/Bundles/org.blueberry.osgi/src/berryExtensionType.h

Core/Code/Controllers/mitkPlanePositionManager.cpp

Core/Code/Controllers/mitkRenderingManager.cpp

Core/Code/DataManagement/mitkAbstractTransformGeometry.cpp

Core/Code/DataManagement/mitkGeometry3D.cpp

Core/Code/DataManagement/mitkGroupTagProperty.cpp

Core/Code/DataManagement/mitkPlaneGeometry.cpp

Core/Code/DataManagement/mitkRestorePlanePositionOperation.cpp

Core/Code/Testing/DICOMTesting/Testing/mitkDICOMTestingSanityTest.cpp

Core/Code/Testing/DICOMTesting/mitkTestDICOMLoading.cpp

Core/Code/Testing/mitkClippedSurfaceBoundsCalculatorTest.cpp

Core/Code/Testing/mitkDicomSeriesReaderTest.cpp

Core/Code/Testing/mitkPlanePositionManagerTest.cpp

Core/Code/Testing/mitkPointSetInteractorTest.cpp

Core/Code/Testing/mitkSliceNavigationControllerTest.cpp

CoreUI/Bundles/org.mitk.core.services/src/internal/mitkPluginActivator.cpp

CoreUI/Qmitk/QmitkLineEditLevelWindowWidget.cpp

CoreUI/Qmitk/QmitkRenderWindow.cpp

CoreUI/Qmitk/QmitkRenderWindowMenu.cpp

CoreUI/Qmitk/QmitkStdMultiWidget.cpp

Documentation/Snippets/uServices-singleton/main.cpp

Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkPartialVolumeAnalysisView.cpp

Modules/DiffusionImaging/IODataStructures/DiffusionWeightedImages/mitkNrrdDiffusionImageReader.cpp

Modules/DiffusionImaging/Tractography/GibbsTracking/ParticleGrid.cpp

Modules/DiffusionImaging/Tractography/GibbsTracking/auxilary_classes.cpp

Modules/IGT/IGTFilters/mitkNavigationDataPlayer.cpp

Modules/IGT/IGTFilters/mitkNavigationDataPlayer.h

Modules/IGT/IGTFilters/mitkNavigationDataPlayerBase.h

Modules/ImageExtraction/Testing/mitkCompareImageSliceTestHelper.h

Modules/ImageStatistics/Testing/mitkImageStatisticsCalculatorTest.cpp

Modules/ImageStatistics/Testing/mitkPointSetDifferenceStatisticsCalculatorTest.cpp

Modules/ImageStatistics/Testing/mitkPointSetStatisticsCalculatorTest.cpp

Modules/ImageStatistics/mitkImageStatisticsCalculator.cpp

Modules/ImageStatistics/mitkPointSetDifferenceStatisticsCalculator.cpp

Modules/ImageStatistics/mitkPointSetStatisticsCalculator.cpp

Modules/MitkExt/Algorithms/mitkReduceContourSetFilter.cpp

Modules/MitkExt/Testing/mitkCompareImageSliceTestHelper.h

Modules/PlanarFigure/DataManagement/mitkPlanarAngle.cpp

Modules/PlanarFigure/DataManagement/mitkPlanarFigure.cpp

Modules/PlanarFigure/DataManagement/mitkPlanarPolygon.cpp

Modules/PlanarFigure/Interactions/mitkPlanarFigureInteractor.cpp

Modules/PlanarFigure/Testing/mitkPlanarFigureIOTest.cpp

Modules/PlanarFigure/Testing/mitkPlanarPolygonTest.cpp

Modules/PlanarFigure/Testing/mitkPlanarSubdivisionPolygonTest.cpp

Modules/SceneSerialization/Testing/mitkSceneIOTest.cpp

Modules/ToFHardware/mitkToFCameraDevice.cpp

Modules/ToFHardware/mitkToFCameraMITKPlayerController.cpp

Modules/ToFHardware/mitkToFCameraMITKPlayerDevice.cpp

Modules/ToFHardware/mitkToFCameraPMDDevice.cpp

Modules/ToFHardware/mitkToFCameraPMDRawDataDevice.cpp

Modules/ToFHardware/mitkToFCameraPMDRawDataDevice.h

Modules/ToFProcessing/mitkToFDistanceImageToPointSetFilter.cpp

Modules/ToFProcessing/mitkToFDistanceImageToSurfaceFilter.cpp

Merge branch 'bug-9965-EliminateWarnings2'
511928f9940f
Actions