diff OrthancServer/Sources/ServerEnumerations.cpp @ 4473:68f52897c119

new URIs: /tools/accepted-transfer-syntaxes and /tools/unknown-sop-class-accepted to replace Lua callbacks for transfer syntaxes
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 26 Jan 2021 14:48:10 +0100
parents 28a4baadde17
children f8c1d94363b6
line wrap: on
line diff
--- a/OrthancServer/Sources/ServerEnumerations.cpp	Tue Jan 26 10:18:50 2021 +0100
+++ b/OrthancServer/Sources/ServerEnumerations.cpp	Tue Jan 26 14:48:10 2021 +0100
@@ -416,48 +416,10 @@
   }
 
 
-  const char* EnumerationToString(TransferSyntaxGroup syntax)
+  void GetTransferSyntaxGroup(std::set<DicomTransferSyntax>& target,
+                              TransferSyntaxGroup source)
   {
-    switch (syntax)
-    {
-      case TransferSyntaxGroup_Deflated:
-        return "Deflated";
-
-      case TransferSyntaxGroup_Jpeg:
-        return "JPEG";
-
-      case TransferSyntaxGroup_Jpeg2000:
-        return "JPEG2000";
-
-      case TransferSyntaxGroup_JpegLossless:
-        return "JPEG Lossless";
-
-      case TransferSyntaxGroup_Jpip:
-        return "JPIP";
-
-      case TransferSyntaxGroup_Mpeg2:
-        return "MPEG2";
-
-      case TransferSyntaxGroup_Mpeg4:
-        return "MPEG4";
-
-      case TransferSyntaxGroup_Rle:
-        return "RLE";
-
-      default: 
-        throw OrthancException(ErrorCode_ParameterOutOfRange);
-    }
-  }
-
-
-  void GetTransferSyntaxGroup(std::set<DicomTransferSyntax>& target,
-                              TransferSyntaxGroup source,
-                              bool clearTarget)
-  {
-    if (clearTarget)
-    {
-      target.clear();
-    }
+    target.clear();
 
     switch (source)
     {    
@@ -510,14 +472,12 @@
         break;
 
       case TransferSyntaxGroup_Mpeg4:
-#if DCMTK_VERSION_NUMBER >= 361
         // New in Orthanc 1.6.0
         target.insert(DicomTransferSyntax_MPEG4BDcompatibleHighProfileLevel4_1);
         target.insert(DicomTransferSyntax_MPEG4HighProfileLevel4_1);
         target.insert(DicomTransferSyntax_MPEG4HighProfileLevel4_2_For2DVideo);
         target.insert(DicomTransferSyntax_MPEG4HighProfileLevel4_2_For3DVideo);
         target.insert(DicomTransferSyntax_MPEG4StereoHighProfileLevel4_2);
-#endif
         break;
         
       case TransferSyntaxGroup_Rle: