[med-svn] [gdcm] 02/04: Merge tag 'upstream/2.6.8'

[Gert Wollny]

This is an automated email from the git hooks/post-receive script.

gewo pushed a commit to branch master
in repository gdcm.

commit 53f88ab9b96aa0eaaa19573adb3e453c729245f6
Merge: aa3f323 ca2ab1c
Author: Gert Wollny <gewo at debian.org>
Date:   Tue May 23 10:43:07 2017 +0000

    Merge tag 'upstream/2.6.8'
    
    Upstream version 2.6.8

 .travis.yml                                        |   5 +
 CMake/CTestCustom.ctest.in                         |   1 +
 CMakeLists.txt                                     |   6 +-
 Examples/Cxx/CMakeLists.txt                        |   2 +
 Examples/Cxx/EmptyMask.cxx                         | 234 +++++++++++++++++++++
 Examples/Cxx/TemplateEmptyImage.cxx                | 107 ++++++++++
 Source/Common/gdcmSystem.cxx                       |   3 +
 Source/Common/gdcmTesting.cxx                      |   1 +
 Source/DataDictionary/gdcmPrivateDefaultDicts.cxx  |   3 +
 .../gdcmAttribute.h                                |   1 -
 .../gdcmSequenceOfItems.h                          |   1 +
 Source/MediaStorageAndFileFormat/CMakeLists.txt    |   4 +
 .../gdcmFileDerivation.cxx                         |  43 ++--
 .../MediaStorageAndFileFormat/gdcmFileDerivation.h |   5 +
 .../MediaStorageAndFileFormat/gdcmFileStreamer.cxx |  91 ++++----
 .../MediaStorageAndFileFormat/gdcmImageHelper.cxx  |   9 +-
 .../gdcmImageRegionReader.cxx                      |  20 +-
 .../MediaStorageAndFileFormat/gdcmImageWriter.cxx  |   7 +-
 .../MediaStorageAndFileFormat/gdcmPixmapReader.cxx |   2 +-
 .../MediaStorageAndFileFormat/gdcmPixmapWriter.cxx |  18 +-
 .../gdcmSplitMosaicFilter.cxx                      |  10 +-
 Testing/Source/Common/Cxx/TestMD5.cxx              |   1 +
 Testing/Source/Common/Cxx/TestSHA1.cxx             |   1 +
 Testing/Source/Common/Cxx/TestSystem1.cxx          |   2 +-
 Testing/Source/Data/gdcmMD5DataImages.cxx          |   1 +
 Testing/Source/Data/gdcmMediaStorageDataFiles.cxx  |   1 +
 .../gdcmSelectedPrivateGroupOffsetDataFiles.cxx    |   1 +
 .../Data/gdcmSelectedTagsOffsetDataFiles.cxx       |   1 +
 Testing/Source/Data/gdcmStreamOffsetDataFiles.cxx  |   1 +
 .../Cxx/TestAttribute7.cxx                         |  25 +++
 .../MediaStorageAndFileFormat/Cxx/TestPrinter1.cxx |   2 +
 .../Cxx/TestSCUValidation.cxx                      |   3 +-
 Utilities/VTK/CMakeLists.txt                       |   4 +-
 Utilities/VTK/vtkGDCMPolyDataReader.cxx            |   5 +-
 Utilities/VTK/vtkImageMapToColors16.cxx            |   7 +-
 Utilities/VTK/vtkImageMapToColors16.h              |   4 +
 Utilities/socketxx/socket++/fork.cpp               |   2 +-
 37 files changed, 550 insertions(+), 84 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/gdcm.git