Mercurial > hg > orthanc
comparison OrthancServer/DicomProtocol/DicomServer.cpp @ 660:f0232774b913
fix warnings
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Mon, 04 Nov 2013 15:07:58 +0100 |
parents | 08eca5d86aad |
children | b01cc78caba4 |
comparison
equal
deleted
inserted
replaced
659:443cced10836 | 660:f0232774b913 |
---|---|
56 | 56 |
57 //std::set< | 57 //std::set< |
58 }; | 58 }; |
59 | 59 |
60 | 60 |
61 #if DCMTK_USE_EMBEDDED_DICTIONARIES == 1 | |
61 static void LoadEmbeddedDictionary(DcmDataDictionary& dictionary, | 62 static void LoadEmbeddedDictionary(DcmDataDictionary& dictionary, |
62 EmbeddedResources::FileResourceId resource) | 63 EmbeddedResources::FileResourceId resource) |
63 { | 64 { |
64 Toolbox::TemporaryFile tmp; | 65 Toolbox::TemporaryFile tmp; |
65 | 66 |
72 { | 73 { |
73 throw OrthancException(ErrorCode_InternalError); | 74 throw OrthancException(ErrorCode_InternalError); |
74 } | 75 } |
75 } | 76 } |
76 | 77 |
77 | 78 #else |
78 static void LoadExternalDictionary(DcmDataDictionary& dictionary, | 79 static void LoadExternalDictionary(DcmDataDictionary& dictionary, |
79 const std::string& directory, | 80 const std::string& directory, |
80 const std::string& filename) | 81 const std::string& filename) |
81 { | 82 { |
82 boost::filesystem::path p = directory; | 83 boost::filesystem::path p = directory; |
87 if (!dictionary.loadDictionary(p.string().c_str())) | 88 if (!dictionary.loadDictionary(p.string().c_str())) |
88 { | 89 { |
89 throw OrthancException(ErrorCode_InternalError); | 90 throw OrthancException(ErrorCode_InternalError); |
90 } | 91 } |
91 } | 92 } |
92 | 93 |
94 #endif | |
93 | 95 |
94 | 96 |
95 void DicomServer::ServerThread(DicomServer* server) | 97 void DicomServer::ServerThread(DicomServer* server) |
96 { | 98 { |
97 /* Disable "gethostbyaddr" (which results in memory leaks) and use raw IP addresses */ | 99 /* Disable "gethostbyaddr" (which results in memory leaks) and use raw IP addresses */ |