# HG changeset patch # User Sebastien Jodogne # Date 1458817030 -3600 # Node ID dba0db0a94b4931f120240582a1dee4300dce627 # Parent e251606c1433499623dfbb75187a9a8f291e6933 generalization diff -r e251606c1433 -r dba0db0a94b4 OrthancServer/FromDcmtkBridge.cpp --- a/OrthancServer/FromDcmtkBridge.cpp Thu Mar 24 11:46:41 2016 +0100 +++ b/OrthancServer/FromDcmtkBridge.cpp Thu Mar 24 11:57:10 2016 +0100 @@ -276,7 +276,7 @@ } - Encoding FromDcmtkBridge::DetectEncoding(DcmDataset& dataset, + Encoding FromDcmtkBridge::DetectEncoding(DcmItem& dataset, Encoding defaultEncoding) { Encoding encoding = defaultEncoding; @@ -311,7 +311,7 @@ void FromDcmtkBridge::Convert(DicomMap& target, - DcmDataset& dataset, + DcmItem& dataset, unsigned int maxStringLength, Encoding defaultEncoding) { diff -r e251606c1433 -r dba0db0a94b4 OrthancServer/FromDcmtkBridge.h --- a/OrthancServer/FromDcmtkBridge.h Thu Mar 24 11:46:41 2016 +0100 +++ b/OrthancServer/FromDcmtkBridge.h Thu Mar 24 11:57:10 2016 +0100 @@ -55,11 +55,11 @@ unsigned int minMultiplicity, unsigned int maxMultiplicity); - static Encoding DetectEncoding(DcmDataset & dataset, + static Encoding DetectEncoding(DcmItem& dataset, Encoding defaultEncoding); static void Convert(DicomMap& target, - DcmDataset& dataset, + DcmItem& dataset, unsigned int maxStringLength, Encoding defaultEncoding);