[med-svn] [gdcm] 02/06: Merge tag 'upstream/2.6.7'

[Gert Wollny]

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

gert-guest pushed a commit to branch master
in repository gdcm.

commit 1d0fde541e979d7384f0c3a37f3ffb04d8e8b8d6
Merge: 9421222 e020fa9
Author: Gert Wollny <gw.fossdev at gmail.com>
Date:   Fri Mar 3 17:43:03 2017 +0000

    Merge tag 'upstream/2.6.7'
    
    Upstream version 2.6.7

 .travis.yml                                        |   6 +-
 Applications/Cxx/gdcmdump.cxx                      |  61 ++++-
 Applications/Cxx/gdcmxml.cxx                       |   2 +-
 CMakeLists.txt                                     |   2 +-
 Examples/Cxx/DumpExamCard.cxx                      | 245 ++++++++++++++++-----
 Examples/Cxx/FixJAIBugJPEGLS.cxx                   |   2 +-
 .../gdcmOpenSSLP7CryptographicMessageSyntax.cxx    |   6 +-
 Source/DataDictionary/gdcmPrivateDefaultDicts.cxx  |  73 +++++-
 Source/DataDictionary/privatedicts.xml             |   2 +-
 .../gdcmReader.cxx                                 |   6 +-
 .../MediaStorageAndFileFormat/gdcmImageHelper.cxx  |  38 ++++
 .../gdcmJPEG2000Codec.cxx                          |   2 +-
 Source/MediaStorageAndFileFormat/gdcmJPEGCodec.cxx |   1 +
 .../Cxx/TestElement5.cxx                           |   2 +-
 .../Cxx/TestTableReader.cxx                        |   7 +-
 .../MediaStorageAndFileFormat/Cxx/TestCurve2.cxx   |   2 +-
 .../Cxx/TestImageRegionReader1.cxx                 |   2 +-
 .../Cxx/TestImageRegionReader2.cxx                 |   2 +-
 .../MediaStorageAndFileFormat/Cxx/TestOverlay3.cxx |   4 +-
 .../MediaStorageAndFileFormat/Cxx/TestPrinter1.cxx |   2 +-
 Utilities/VTK/Applications/gdcm2vtk.cxx            |   2 +-
 Utilities/VTK/CMakeLists.txt                       |   2 +-
 Utilities/doxygen/CMakeLists.txt                   |   2 +-
 Utilities/doxygen/man/gdcmconv.xml                 |   4 +-
 Utilities/doxygen/man/gdcmdump.xml                 |  36 +--
 Utilities/doxygen/man/gdcminfo.xml                 |   2 +-
 Utilities/doxygen/man/gdcmscu.xml                  |  20 +-
 Utilities/doxygen/man/gdcmxml.xml                  |   4 +-
 Utilities/gdcmjpeg/jdlhuff.c                       |  12 +-
 Utilities/gdcmjpeg/jdphuff.c                       |  12 +-
 Utilities/gdcmjpeg/jdshuff.c                       |  12 +-
 31 files changed, 437 insertions(+), 138 deletions(-)

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