Mercurial > hg > orthanc

diff OrthancServer/FromDcmtkBridge.h @ 1023:226cfef3822e templating

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
integration mainline->templating
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 10 Jul 2014 11:42:32 +0200
parents a226e0959d8b
children 6e7e5ed91c2d
line wrap: on
line diff
--- a/OrthancServer/FromDcmtkBridge.h	Wed Jun 25 11:56:48 2014 +0200
+++ b/OrthancServer/FromDcmtkBridge.h	Thu Jul 10 11:42:32 2014 +0200
@@ -44,11 +44,20 @@
   class FromDcmtkBridge
   {
   public:
+    static Encoding DetectEncoding(DcmDataset& dataset);
+
     static void Convert(DicomMap& target, DcmDataset& dataset);
 
+    static DicomTag Convert(const DcmTag& tag);
+
     static DicomTag GetTag(const DcmElement& element);
 
-    static DicomValue* ConvertLeafElement(DcmElement& element);
+    static bool IsPrivateTag(DcmTag& tag);
+
+    static bool IsPrivateTag(const DicomTag& tag);
+
+    static DicomValue* ConvertLeafElement(DcmElement& element,
+                                          Encoding encoding);
 
     static void ToJson(Json::Value& target, 
                        DcmDataset& dataset,
@@ -95,6 +104,6 @@
     static std::string GenerateUniqueIdentifier(ResourceType level);
 
     static bool SaveToMemoryBuffer(std::string& buffer,
-                                   DcmDataset* dataSet);
+                                   DcmDataset& dataSet);
   };
 }