This is an automated email from the git hooks/post-receive script. gert-guest pushed a commit to branch master in repository gdcm.
commit f9a3450dbe1822f1b4f98263d24213ad721b087a Merge: cfd7338 cbde7d4 Author: Gert Wollny <[email protected]> Date: Sun Jul 3 20:55:14 2016 +0000 Merge tag 'upstream/2.6.4' Upstream version 2.6.4 .travis.yml | 9 ++- Applications/Cxx/gdcmconv.cxx | 6 +- CMake/CTestCustom.ctest.in | 1 + CMakeLists.txt | 20 ++++++- Examples/Cxx/DumpPhilipsECHO.cxx | 2 +- Source/Common/gdcmDirectory.cxx | 8 +-- Source/Common/gdcmSystem.cxx | 4 ++ Source/Common/zipstreamimpl.hpp | 18 ++++++ Source/DataDictionary/gdcmGlobal.cxx | 4 ++ Source/DataDictionary/gdcmPrivateDefaultDicts.cxx | 4 ++ .../gdcmFileMetaInformation.cxx | 27 +++++++++ .../gdcmDataSetHelper.cxx | 3 +- .../gdcmIconImageGenerator.cxx | 6 +- .../MediaStorageAndFileFormat/gdcmImageHelper.cxx | 45 +++++++++++---- .../MediaStorageAndFileFormat/gdcmImageWriter.cxx | 10 ++++ .../gdcmJPEG2000Codec.cxx | 46 ++++++++++++--- .../MediaStorageAndFileFormat/gdcmPixmapReader.cxx | 12 +++- Source/MediaStorageAndFileFormat/gdcmPrinter.cxx | 2 +- Source/MediaStorageAndFileFormat/gdcmRLECodec.cxx | 4 +- Source/MediaStorageAndFileFormat/gdcmRLECodec.h | 2 +- .../MediaStorageAndFileFormat/gdcmUIDGenerator.cxx | 2 +- .../Cxx/TestElement1.cxx | 2 +- Utilities/VTK/Applications/gdcm2vtk.cxx | 66 ++++++++++++---------- Utilities/VTK/Applications/gdcmviewer.cxx | 57 +++++++++++++------ Utilities/VTK/CMakeLists.txt | 33 ++++++++--- Utilities/VTK/Examples/CMakeLists.txt | 4 +- Utilities/VTK/Examples/Csharp/HelloVTKWorld.cs | 3 +- Utilities/VTK/Examples/Csharp/HelloVTKWorld2.cs | 6 +- Utilities/VTK/Examples/Cxx/Compute3DSpacing.cxx | 6 ++ Utilities/VTK/Examples/Cxx/gdcmorthoplanes.cxx | 4 ++ Utilities/VTK/Examples/Cxx/gdcmvolume.cxx | 3 + Utilities/VTK/Examples/Java/HelloVTKWorld.java | 4 +- Utilities/VTK/Examples/Java/MIPViewer.java | 2 +- Utilities/VTK/Examples/Java/MPRViewer2.java | 20 +++---- Utilities/VTK/Examples/Java/ReadSeriesIntoVTK.java | 2 +- Utilities/VTK/Testing/CMakeLists.txt | 4 +- .../VTK/Testing/Cxx/TestvtkGDCMImageReader1.cxx | 4 ++ .../VTK/Testing/Cxx/TestvtkGDCMImageReader2_3.cxx | 4 ++ .../Testing/Cxx/TestvtkGDCMImageReaderIsLossy.cxx | 4 ++ .../VTK/Testing/Cxx/TestvtkGDCMImageWriter1.cxx | 4 ++ .../VTK/Testing/Cxx/TestvtkGDCMImageWriter2.cxx | 4 ++ Utilities/VTK/VTK4/vtkMedicalImageProperties.cxx | 4 ++ Utilities/VTK/VTK4/vtkMedicalImageProperties.h | 4 ++ Utilities/VTK/VTK4/vtkStringArray.cxx | 4 ++ Utilities/VTK/VTK4/vtkStringArray.h | 4 ++ Utilities/VTK/vtkGDCMImageReader.cxx | 4 ++ Utilities/VTK/vtkGDCMImageReader.h | 4 ++ Utilities/VTK/vtkGDCMImageReader2.cxx | 4 ++ Utilities/VTK/vtkGDCMImageReader2.h | 4 ++ Utilities/VTK/vtkGDCMImageWriter.cxx | 8 +++ Utilities/VTK/vtkGDCMImageWriter.h | 4 ++ Utilities/VTK/vtkGDCMMedicalImageProperties.cxx | 4 ++ Utilities/VTK/vtkGDCMMedicalImageProperties.h | 4 ++ Utilities/VTK/vtkGDCMPolyDataReader.cxx | 4 ++ Utilities/VTK/vtkGDCMPolyDataReader.h | 4 ++ Utilities/VTK/vtkGDCMPolyDataWriter.cxx | 4 ++ Utilities/VTK/vtkGDCMPolyDataWriter.h | 4 ++ Utilities/VTK/vtkGDCMTesting.cxx | 4 ++ Utilities/VTK/vtkGDCMTesting.h | 4 ++ Utilities/VTK/vtkGDCMThreadedImageReader.cxx | 4 ++ Utilities/VTK/vtkGDCMThreadedImageReader.h | 4 ++ Utilities/VTK/vtkGDCMThreadedImageReader2.cxx | 4 ++ Utilities/VTK/vtkGDCMThreadedImageReader2.h | 4 ++ Utilities/VTK/vtkImageColorViewer.cxx | 4 ++ Utilities/VTK/vtkImageColorViewer.h | 4 ++ Utilities/VTK/vtkImageMapToColors16.cxx | 4 ++ Utilities/VTK/vtkImageMapToColors16.h | 4 ++ Utilities/VTK/vtkImageMapToWindowLevelColors2.cxx | 4 ++ Utilities/VTK/vtkImageMapToWindowLevelColors2.h | 4 ++ .../VTK/vtkImagePlanarComponentsToComponents.cxx | 4 ++ .../VTK/vtkImagePlanarComponentsToComponents.h | 5 ++ Utilities/VTK/vtkImageRGBToYBR.cxx | 4 ++ Utilities/VTK/vtkImageRGBToYBR.h | 4 ++ Utilities/VTK/vtkImageYBRToRGB.cxx | 4 ++ Utilities/VTK/vtkImageYBRToRGB.h | 4 ++ Utilities/VTK/vtkLookupTable16.cxx | 4 ++ Utilities/VTK/vtkLookupTable16.h | 4 ++ Utilities/VTK/vtkRTStructSetProperties.cxx | 4 ++ Utilities/VTK/vtkRTStructSetProperties.h | 4 ++ Utilities/VTK/vtkgdcm.py | 6 +- Utilities/doxygen/CMakeLists.txt | 36 ++++++++++-- Utilities/doxygen/doxyfile.in | 2 +- Utilities/doxygen/vtk/CMakeLists.txt | 3 +- Utilities/gdcm_charls.h | 3 +- Utilities/gdcmcharls/encoderstrategy.h | 12 +++- Utilities/socketxx/socket++/local.h | 2 +- Utilities/socketxx/socket++/sockstream.h | 2 +- .../wxWidgets/wxVTKRenderWindowInteractor.cxx | 4 ++ Utilities/wxWidgets/wxVTKRenderWindowInteractor.h | 4 ++ Wrapping/Java/CMakeLists.txt | 2 +- Wrapping/Java/gdcm.i | 9 +++ Wrapping/Python/Python.h.in | 2 +- appveyor.yml | 4 +- 93 files changed, 580 insertions(+), 139 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/gdcm.git _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
