Mercurial > hg > orthanc
comparison OrthancServer/Internals/MoveScp.cpp @ 1928:84c7eaeb5244
Configuration::GetDefaultEncoding
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Mon, 21 Mar 2016 14:12:31 +0100 |
parents | 21fcfc428dc2 |
children | cda5b0ab4ce5 |
comparison
equal
deleted
inserted
replaced
1927:b60f27664b8f | 1928:84c7eaeb5244 |
---|---|
84 | 84 |
85 #include <memory> | 85 #include <memory> |
86 | 86 |
87 #include "../FromDcmtkBridge.h" | 87 #include "../FromDcmtkBridge.h" |
88 #include "../ToDcmtkBridge.h" | 88 #include "../ToDcmtkBridge.h" |
89 #include "../OrthancInitialization.h" | |
89 #include "../../Core/Logging.h" | 90 #include "../../Core/Logging.h" |
90 #include "../../Core/OrthancException.h" | 91 #include "../../Core/OrthancException.h" |
91 | 92 |
92 | 93 |
93 namespace Orthanc | 94 namespace Orthanc |
127 | 128 |
128 MoveScpData& data = *reinterpret_cast<MoveScpData*>(callbackData); | 129 MoveScpData& data = *reinterpret_cast<MoveScpData*>(callbackData); |
129 if (data.lastRequest_ == NULL) | 130 if (data.lastRequest_ == NULL) |
130 { | 131 { |
131 DicomMap input; | 132 DicomMap input; |
132 FromDcmtkBridge::Convert(input, *requestIdentifiers); | 133 FromDcmtkBridge::Convert(input, *requestIdentifiers, |
134 Configuration::GetDefaultEncoding()); | |
133 | 135 |
134 try | 136 try |
135 { | 137 { |
136 data.iterator_.reset(data.handler_->Handle(data.target_, input, | 138 data.iterator_.reset(data.handler_->Handle(data.target_, input, |
137 *data.remoteIp_, *data.remoteAet_, | 139 *data.remoteIp_, *data.remoteAet_, |