Mercurial > hg > orthanc
comparison OrthancServer/ParsedDicomFile.cpp @ 2028:d108412411e5
fix msvc warnings
author | sjodogne |
---|---|
date | Mon, 20 Jun 2016 14:07:29 +0200 |
parents | 0ae26237569a |
children | b9bd52c72ba2 |
comparison
equal
deleted
inserted
replaced
2026:d46746607ae0 | 2028:d108412411e5 |
---|---|
1265 | 1265 |
1266 | 1266 |
1267 ParsedDicomFile* ParsedDicomFile::CreateFromJson(const Json::Value& json, | 1267 ParsedDicomFile* ParsedDicomFile::CreateFromJson(const Json::Value& json, |
1268 DicomFromJsonFlags flags) | 1268 DicomFromJsonFlags flags) |
1269 { | 1269 { |
1270 const bool generateIdentifiers = (flags & DicomFromJsonFlags_GenerateIdentifiers); | 1270 const bool generateIdentifiers = (flags & DicomFromJsonFlags_GenerateIdentifiers) ? true : false; |
1271 const bool decodeDataUriScheme = (flags & DicomFromJsonFlags_DecodeDataUriScheme); | 1271 const bool decodeDataUriScheme = (flags & DicomFromJsonFlags_DecodeDataUriScheme) ? true : false; |
1272 | 1272 |
1273 std::auto_ptr<ParsedDicomFile> result(new ParsedDicomFile(generateIdentifiers)); | 1273 std::auto_ptr<ParsedDicomFile> result(new ParsedDicomFile(generateIdentifiers)); |
1274 result->SetEncoding(FromDcmtkBridge::ExtractEncoding(json, Configuration::GetDefaultEncoding())); | 1274 result->SetEncoding(FromDcmtkBridge::ExtractEncoding(json, Configuration::GetDefaultEncoding())); |
1275 | 1275 |
1276 const Json::Value::Members tags = json.getMemberNames(); | 1276 const Json::Value::Members tags = json.getMemberNames(); |