changeset 5038:f8bea9c1c0fc

reduce dependencies to DCMTK (e.g. for plugins)
author Alain Mazy <am@osimis.io>
date Fri, 24 Jun 2022 16:44:38 +0200
parents 3444990cf295
children 28db9663fc2d
files OrthancFramework/Sources/DicomFormat/DicomMap.cpp OrthancFramework/Sources/DicomFormat/DicomMap.h
diffstat 2 files changed, 7 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/OrthancFramework/Sources/DicomFormat/DicomMap.cpp	Fri Jun 24 16:16:43 2022 +0200
+++ b/OrthancFramework/Sources/DicomFormat/DicomMap.cpp	Fri Jun 24 16:44:38 2022 +0200
@@ -34,7 +34,10 @@
 #include "../OrthancException.h"
 #include "../Toolbox.h"
 #include "DicomArray.h"
+
+#if ORTHANC_ENABLE_DCMTK == 1
 #include "../DicomParsing/FromDcmtkBridge.h"
+#endif
 
 namespace Orthanc
 {
@@ -1530,6 +1533,7 @@
     return true;
   }
 
+#if ORTHANC_ENABLE_DCMTK == 1
   void DicomMap::ExtractSequences(std::set<DicomTag>& sequences, const std::set<DicomTag>& tags)
   {
     sequences.clear();
@@ -1543,6 +1547,7 @@
       }
     }
   }
+#endif
 
   void DicomMap::Serialize(Json::Value& target) const
   {
--- a/OrthancFramework/Sources/DicomFormat/DicomMap.h	Fri Jun 24 16:16:43 2022 +0200
+++ b/OrthancFramework/Sources/DicomFormat/DicomMap.h	Fri Jun 24 16:44:38 2022 +0200
@@ -149,7 +149,9 @@
 
     static bool HasComputedTags(const std::set<DicomTag>& tags);
 
+#if ORTHANC_ENABLE_DCMTK == 1
     static void ExtractSequences(std::set<DicomTag>& sequences, const std::set<DicomTag>& tags);
+#endif
 
     static const std::set<DicomTag>& GetMainDicomTags(ResourceType level);