Mercurial > hg > orthanc
changeset 1694:06d579e82bb8
refactoring
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Thu, 08 Oct 2015 13:49:20 +0200 |
| parents | 558b25228a23 |
| children | 18c02c6987d5 |
| files | OrthancServer/FromDcmtkBridge.cpp OrthancServer/FromDcmtkBridge.h OrthancServer/ParsedDicomFile.cpp |
| diffstat | 3 files changed, 1 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/OrthancServer/FromDcmtkBridge.cpp Thu Oct 08 13:45:33 2015 +0200 +++ b/OrthancServer/FromDcmtkBridge.cpp Thu Oct 08 13:49:20 2015 +0200 @@ -350,19 +350,6 @@ } - bool FromDcmtkBridge::IsPrivateTag(DcmTag& tag) - { -#if 1 - DcmTagKey tmp(tag.getGTag(), tag.getETag()); - return tmp.isPrivate(); -#else - // Implementation for Orthanc versions <= 0.8.5 - return (tag.getPrivateCreator() != NULL || - !strcmp("PrivateCreator", tag.getTagName())); // TODO - This may change with future versions of DCMTK -#endif - } - - bool FromDcmtkBridge::IsPrivateTag(const DicomTag& tag) { #if 1
--- a/OrthancServer/FromDcmtkBridge.h Thu Oct 08 13:45:33 2015 +0200 +++ b/OrthancServer/FromDcmtkBridge.h Thu Oct 08 13:49:20 2015 +0200 @@ -60,8 +60,6 @@ static DicomTag GetTag(const DcmElement& element); - static bool IsPrivateTag(DcmTag& tag); - static bool IsPrivateTag(const DicomTag& tag); static bool IsUnknownTag(const DicomTag& tag);
--- a/OrthancServer/ParsedDicomFile.cpp Thu Oct 08 13:45:33 2015 +0200 +++ b/OrthancServer/ParsedDicomFile.cpp Thu Oct 08 13:49:20 2015 +0200 @@ -546,7 +546,7 @@ DcmTag tag(element->getTag()); // Is this a private tag? - if (FromDcmtkBridge::IsPrivateTag(tag)) + if (tag.isPrivate()) { bool remove = true;