# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1444304960 -7200
# Node ID 06d579e82bb8e88d67d3cde680e6f046a4415d10
# Parent  558b25228a23b8ad244cd97d6f59e5aba7321e87
refactoring

diff -r 558b25228a23 -r 06d579e82bb8 OrthancServer/FromDcmtkBridge.cpp
--- 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
diff -r 558b25228a23 -r 06d579e82bb8 OrthancServer/FromDcmtkBridge.h
--- 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);
diff -r 558b25228a23 -r 06d579e82bb8 OrthancServer/ParsedDicomFile.cpp
--- 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;