[med-svn] [dcmtkpp] 02/09: Merge branch 'upstream'
Julien Lamy
lamy-guest at moszumanska.debian.org
Thu Jan 14 08:45:45 UTC 2016
This is an automated email from the git hooks/post-receive script.
lamy-guest pushed a commit to branch master
in repository dcmtkpp.
commit 74bd6d024399ea2dd85115a954ea1c4634b3c430
Merge: 7ea7acb 40b3289
Author: Julien Lamy <lamy at unistra.fr>
Date: Tue Jan 12 17:10:23 2016 +0100
Merge branch 'upstream'
Conflicts:
src/dcmtkpp/ServiceRole.cpp
src/dcmtkpp/ServiceRole.h
src/dcmtkpp/ServiceRole.txx
src/dcmtkpp/StoreSCU.cpp
src/dcmtkpp/registry.h
tests/code/CEchoRequest.cpp
tests/code/CEchoResponse.cpp
tests/code/CFindResponse.cpp
tests/code/CGetResponse.cpp
tests/code/CMoveResponse.cpp
tests/code/CStoreResponse.cpp
.travis.yml | 6 +-
CMakeLists.txt | 24 +-
Doxyfile | 4 +-
FindDCMTK.cmake | 32 +
FindICU.cmake | 26 +-
FindJsonCpp.cmake | 24 +
README.md | 26 +-
appveyor.full.yml | 52 +
appveyor.yml | 43 +
examples/CMakeLists.txt | 12 +-
examples/dicomdir.cpp | 14 +-
examples/dump.cpp | 18 +-
examples/find.cpp | 77 +-
examples/genericscp.cpp | 142 ++
examples/get.cpp | 136 +-
examples/move.cpp | 138 +-
examples/store.cpp | 76 +-
generate_registry | 4 +-
registry.cpp.tmpl | 18 +-
registry.h.tmpl | 10 +-
src/CMakeLists.txt | 43 +-
src/dcmtkpp/Association.cpp | 535 ----
src/dcmtkpp/Association.h | 184 --
src/dcmtkpp/GetSCU.cpp | 105 -
src/dcmtkpp/MoveSCU.cpp | 162 --
src/dcmtkpp/Network.cpp | 201 --
src/dcmtkpp/Network.h | 91 -
src/dcmtkpp/Response.cpp | 43 -
src/dcmtkpp/Response.h | 44 -
src/dcmtkpp/SCP.cpp | 44 -
src/dcmtkpp/SCP.h | 31 -
src/dcmtkpp/ServiceRole.cpp | 438 ----
src/dcmtkpp/ServiceRole.h | 113 -
src/dcmtkpp/ServiceRole.txx | 38 -
src/dcmtkpp/StoreSCP.cpp | 94 -
src/dcmtkpp/StoreSCP.h | 43 -
src/dcmtkpp/uid.cpp | 88 -
src/odil/Association.cpp | 496 ++++
src/odil/Association.h | 222 ++
src/odil/AssociationAcceptor.cpp | 98 +
src/odil/AssociationAcceptor.h | 64 +
src/odil/AssociationParameters.cpp | 457 ++++
src/odil/AssociationParameters.h | 156 ++
src/{dcmtkpp => odil}/BasicDirectoryCreator.cpp | 27 +-
src/{dcmtkpp => odil}/BasicDirectoryCreator.h | 21 +-
src/{dcmtkpp => odil}/DataSet.cpp | 22 +-
src/{dcmtkpp => odil}/DataSet.h | 36 +-
src/odil/EchoSCP.cpp | 82 +
src/odil/EchoSCP.h | 54 +
src/{dcmtkpp => odil}/Element.cpp | 10 +-
src/{dcmtkpp => odil}/Element.h | 32 +-
src/{dcmtkpp => odil}/Element.txx | 8 +-
src/{dcmtkpp => odil}/ElementsDictionary.cpp | 6 +-
src/{dcmtkpp => odil}/ElementsDictionary.h | 6 +-
.../UIDsDictionary.cpp => odil/Exception.cpp} | 29 +-
src/odil/Exception.h | 37 +
src/odil/FindSCP.cpp | 94 +
src/odil/FindSCP.h | 52 +
src/{dcmtkpp => odil}/FindSCU.cpp | 40 +-
src/{dcmtkpp => odil}/FindSCU.h | 11 +-
src/odil/GetSCP.cpp | 141 ++
src/odil/GetSCP.h | 59 +
src/odil/GetSCU.cpp | 115 +
src/{dcmtkpp => odil}/GetSCU.h | 28 +-
src/odil/MoveSCP.cpp | 147 ++
src/odil/MoveSCP.h | 65 +
src/odil/MoveSCU.cpp | 169 ++
src/{dcmtkpp => odil}/MoveSCU.h | 17 +-
src/{dcmtkpp => odil}/Reader.cpp | 118 +-
src/{dcmtkpp => odil}/Reader.h | 23 +-
src/odil/SCP.cpp | 46 +
src/odil/SCP.h | 55 +
src/odil/SCPDispatcher.cpp | 78 +
src/odil/SCPDispatcher.h | 47 +
src/{dcmtkpp => odil}/SCU.cpp | 35 +-
src/{dcmtkpp => odil}/SCU.h | 16 +-
src/odil/StoreSCP.cpp | 84 +
src/odil/StoreSCP.h | 54 +
src/{dcmtkpp => odil}/StoreSCU.cpp | 33 +-
src/{dcmtkpp => odil}/StoreSCU.h | 18 +-
src/{dcmtkpp => odil}/Tag.cpp | 10 +-
src/{dcmtkpp => odil}/Tag.h | 10 +-
src/{dcmtkpp => odil}/UIDsDictionary.cpp | 6 +-
src/{dcmtkpp => odil}/UIDsDictionary.h | 4 +-
src/{dcmtkpp => odil}/VR.cpp | 30 +-
src/{dcmtkpp => odil}/VR.h | 10 +-
src/{dcmtkpp => odil}/VRFinder.cpp | 18 +-
src/{dcmtkpp => odil}/VRFinder.h | 10 +-
src/{dcmtkpp => odil}/Value.cpp | 10 +-
src/{dcmtkpp => odil}/Value.h | 26 +-
src/{dcmtkpp => odil}/Value.txx | 8 +-
src/{dcmtkpp => odil}/Writer.cpp | 111 +-
src/{dcmtkpp => odil}/Writer.h | 29 +-
src/{dcmtkpp/UIDsDictionary.cpp => odil/asio.cpp} | 22 +-
src/odil/base64.cpp | 36 +
src/odil/base64.h | 42 +
src/odil/base64.txx | 131 +
src/{dcmtkpp => odil/dcmtk}/ElementAccessor.cpp | 11 +-
src/{dcmtkpp => odil/dcmtk}/ElementAccessor.h | 15 +-
src/{dcmtkpp => odil/dcmtk}/ElementAccessor.txx | 11 +-
src/{dcmtkpp => odil/dcmtk}/ElementTraits.cpp | 13 +-
src/{dcmtkpp => odil/dcmtk}/ElementTraits.h | 11 +-
src/{dcmtkpp => odil/dcmtk}/Exception.cpp | 27 +-
src/{dcmtkpp => odil/dcmtk}/Exception.h | 60 +-
src/{dcmtkpp => odil/dcmtk}/VRTraits.h | 16 +-
src/{dcmtkpp => odil/dcmtk}/conversion.cpp | 23 +-
src/{dcmtkpp => odil/dcmtk}/conversion.h | 35 +-
src/{dcmtkpp => odil/dcmtk}/conversion.txx | 17 +-
src/odil/dul/EventData.h | 39 +
src/odil/dul/StateMachine.cpp | 764 ++++++
src/odil/dul/StateMachine.h | 274 +++
src/odil/dul/Transport.cpp | 295 +++
src/odil/dul/Transport.h | 107 +
src/odil/endian.h | 87 +
src/{dcmtkpp => odil}/json_converter.cpp | 44 +-
src/{dcmtkpp => odil}/json_converter.h | 8 +-
src/{dcmtkpp => odil/message}/CEchoRequest.cpp | 15 +-
src/{dcmtkpp => odil/message}/CEchoRequest.h | 17 +-
src/{dcmtkpp => odil/message}/CEchoResponse.cpp | 17 +-
src/{dcmtkpp => odil/message}/CEchoResponse.h | 17 +-
src/{dcmtkpp => odil/message}/CFindRequest.cpp | 17 +-
src/{dcmtkpp => odil/message}/CFindRequest.h | 19 +-
src/{dcmtkpp => odil/message}/CFindResponse.cpp | 23 +-
src/{dcmtkpp => odil/message}/CFindResponse.h | 36 +-
src/{dcmtkpp => odil/message}/CGetRequest.cpp | 19 +-
src/{dcmtkpp => odil/message}/CGetRequest.h | 21 +-
src/{dcmtkpp => odil/message}/CGetResponse.cpp | 31 +-
src/{dcmtkpp => odil/message}/CGetResponse.h | 45 +-
src/{dcmtkpp => odil/message}/CMoveRequest.cpp | 19 +-
src/{dcmtkpp => odil/message}/CMoveRequest.h | 23 +-
src/{dcmtkpp => odil/message}/CMoveResponse.cpp | 31 +-
src/{dcmtkpp => odil/message}/CMoveResponse.h | 46 +-
src/{dcmtkpp => odil/message}/CStoreRequest.cpp | 18 +-
src/{dcmtkpp => odil/message}/CStoreRequest.h | 27 +-
src/{dcmtkpp => odil/message}/CStoreResponse.cpp | 23 +-
src/{dcmtkpp => odil/message}/CStoreResponse.h | 34 +-
src/{dcmtkpp => odil/message}/Cancellation.cpp | 21 +-
src/{dcmtkpp => odil/message}/Cancellation.h | 19 +-
src/{dcmtkpp => odil/message}/Message.cpp | 17 +-
src/{dcmtkpp => odil/message}/Message.h | 41 +-
src/{dcmtkpp => odil/message}/Request.cpp | 15 +-
src/{dcmtkpp => odil/message}/Request.h | 17 +-
src/odil/message/Response.cpp | 97 +
src/odil/message/Response.h | 103 +
src/odil/pdu/AAbort.cpp | 93 +
src/odil/pdu/AAbort.h | 49 +
src/odil/pdu/AAssociate.cpp | 272 ++
src/odil/pdu/AAssociate.h | 91 +
src/odil/pdu/AAssociateAC.cpp | 93 +
src/odil/pdu/AAssociateAC.h | 47 +
src/odil/pdu/AAssociateRJ.cpp | 112 +
src/odil/pdu/AAssociateRJ.h | 54 +
src/odil/pdu/AAssociateRQ.cpp | 93 +
src/odil/pdu/AAssociateRQ.h | 47 +
src/odil/pdu/AReleaseRP.cpp | 48 +
src/odil/pdu/AReleaseRP.h | 37 +
src/odil/pdu/AReleaseRQ.cpp | 48 +
src/odil/pdu/AReleaseRQ.h | 37 +
src/odil/pdu/ApplicationContext.cpp | 68 +
src/odil/pdu/ApplicationContext.h | 46 +
src/odil/pdu/ImplementationClassUID.cpp | 68 +
src/odil/pdu/ImplementationClassUID.h | 48 +
src/odil/pdu/ImplementationVersionName.cpp | 72 +
src/odil/pdu/ImplementationVersionName.h | 48 +
src/odil/pdu/Item.cpp | 454 ++++
src/odil/pdu/Item.h | 266 ++
src/odil/pdu/MaximumLength.cpp | 65 +
src/odil/pdu/MaximumLength.h | 47 +
src/odil/pdu/Object.cpp | 116 +
src/odil/pdu/Object.h | 55 +
src/odil/pdu/PDataTF.cpp | 186 ++
src/odil/pdu/PDataTF.h | 67 +
src/odil/pdu/PresentationContext.cpp | 218 ++
src/odil/pdu/PresentationContext.h | 70 +
src/odil/pdu/PresentationContextAC.cpp | 91 +
src/odil/pdu/PresentationContextAC.h | 55 +
src/odil/pdu/PresentationContextRQ.cpp | 101 +
src/odil/pdu/PresentationContextRQ.h | 58 +
src/odil/pdu/RoleSelection.cpp | 108 +
src/odil/pdu/RoleSelection.h | 65 +
src/odil/pdu/UserIdentityAC.cpp | 75 +
src/odil/pdu/UserIdentityAC.h | 47 +
src/odil/pdu/UserIdentityRQ.cpp | 169 ++
src/odil/pdu/UserIdentityRQ.h | 75 +
src/odil/pdu/UserInformation.cpp | 113 +
src/odil/pdu/UserInformation.h | 66 +
src/odil/pdu/UserInformation.txx | 157 ++
src/{dcmtkpp => odil}/registry.cpp | 18 +-
src/{dcmtkpp => odil}/registry.h | 10 +-
src/odil/uid.cpp | 43 +
src/{dcmtkpp => odil}/uid.h | 19 +-
src/{dcmtkpp => odil}/unicode.cpp | 11 +-
src/{dcmtkpp => odil}/unicode.h | 6 +-
src/{dcmtkpp => odil}/xml_converter.cpp | 40 +-
src/{dcmtkpp => odil}/xml_converter.h | 8 +-
tests/CMakeLists.txt | 33 +-
tests/MessageFixtureBase.h | 26 +-
tests/PeerFixtureBase.h | 71 +-
tests/code/Association.cpp | 268 +-
tests/code/AssociationAcceptor.cpp | 13 +
tests/code/AssociationParameters.cpp | 178 ++
tests/code/BasicDirectoryCreator.cpp | 159 ++
tests/code/CEchoRequest.cpp | 56 -
tests/code/CEchoResponse.cpp | 58 -
tests/code/CFindResponse.cpp | 72 -
tests/code/CGetResponse.cpp | 93 -
tests/code/CMoveResponse.cpp | 93 -
tests/code/CStoreResponse.cpp | 68 -
tests/code/Cancellation.cpp | 40 -
tests/code/DataSet.cpp | 295 ++-
tests/code/DcmtkException.cpp | 26 +
tests/code/EchoSCP.cpp | 122 +
tests/code/Element.cpp | 96 +-
tests/code/ElementAccessor.cpp | 44 +-
tests/code/Exception.cpp | 36 +-
tests/code/FindSCP.cpp | 166 ++
tests/code/FindSCU.cpp | 31 +-
tests/code/GetSCP.cpp | 201 ++
tests/code/GetSCU.cpp | 38 +-
tests/code/Message.cpp | 57 -
tests/code/MoveSCP.cpp | 237 ++
tests/code/MoveSCU.cpp | 45 +-
tests/code/Network.cpp | 156 --
tests/code/Reader.cpp | 250 +-
tests/code/Response.cpp | 31 -
tests/code/SCPDispatcher.cpp | 132 +
tests/code/SCU.cpp | 26 +-
tests/code/ServiceRole.cpp | 62 -
tests/code/StoreSCU.cpp | 66 +-
tests/code/Tag.cpp | 82 +-
tests/code/VR.cpp | 18 +-
tests/code/VRFinder.cpp | 177 ++
tests/code/Value.cpp | 224 +-
tests/code/Writer.cpp | 268 +-
tests/code/base64.cpp | 75 +
tests/code/conversion.cpp | 272 +-
tests/code/dul/StateMachine.cpp | 22 +
tests/code/dul/Transport.cpp | 45 +
tests/code/endian.cpp | 89 +
tests/code/json_converter.cpp | 126 +-
tests/code/message/CEchoRequest.cpp | 60 +
tests/code/message/CEchoResponse.cpp | 64 +
tests/code/{ => message}/CFindRequest.cpp | 46 +-
tests/code/message/CFindResponse.cpp | 107 +
tests/code/{ => message}/CGetRequest.cpp | 48 +-
tests/code/message/CGetResponse.cpp | 129 +
tests/code/{ => message}/CMoveRequest.cpp | 47 +-
tests/code/message/CMoveResponse.cpp | 130 +
tests/code/{ => message}/CStoreRequest.cpp | 44 +-
tests/code/message/CStoreResponse.cpp | 106 +
tests/code/message/Cancellation.cpp | 44 +
tests/code/message/Message.cpp | 63 +
tests/code/{ => message}/Request.cpp | 16 +-
tests/code/message/Response.cpp | 112 +
tests/code/pdu/AAbort.cpp | 51 +
tests/code/pdu/AAssociateAC.cpp | 279 +++
tests/code/pdu/AAssociateRJ.cpp | 59 +
tests/code/pdu/AAssociateRQ.cpp | 290 +++
tests/code/pdu/AReleaseRP.cpp | 34 +
tests/code/pdu/AReleaseRQ.cpp | 34 +
tests/code/pdu/ApplicationContext.cpp | 44 +
tests/code/pdu/ImplementationClassUID.cpp | 43 +
tests/code/pdu/ImplementationVersionName.cpp | 59 +
tests/code/pdu/Item.cpp | 128 +
tests/code/pdu/MaximumLength.cpp | 56 +
tests/code/pdu/PDataTF.cpp | 74 +
tests/code/pdu/PresentationContextAC.cpp | 62 +
tests/code/pdu/PresentationContextRQ.cpp | 82 +
tests/code/pdu/RoleSelection.cpp | 74 +
tests/code/pdu/UserIdentityAC.cpp | 58 +
tests/code/pdu/UserIdentityRQ.cpp | 124 +
tests/code/pdu/UserInformation.cpp | 160 ++
tests/code/registry.cpp | 16 +-
tests/code/uid.cpp | 4 +-
tests/code/unicode.cpp | 113 +-
tests/code/xml_converter.cpp | 219 +-
tests/run.sh | 12 +-
tests/tools/CMakeLists.txt | 11 +
tests/tools/dndefine.h | 80 +
tests/tools/getscu.cc | 657 +++++
tests/tools/scu.cc | 2590 ++++++++++++++++++++
tests/tools/scu.h | 1197 +++++++++
282 files changed, 20946 insertions(+), 5558 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/dcmtkpp.git
More information about the debian-med-commit
mailing list