Mercurial > hg > orthanc
diff OrthancFramework/Sources/DicomParsing/FromDcmtkBridge.h @ 4105:c02a2d9efbc2
move FromDcmtkBridge::ExecuteToDicom() to LuaFunctionCall, to remove dependency of DCMTK on Lua
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Mon, 06 Jul 2020 13:48:10 +0200 |
parents | d25f4c0fa160 |
children | bf7b9edf6b81 |
line wrap: on
line diff
--- a/OrthancFramework/Sources/DicomParsing/FromDcmtkBridge.h Mon Jul 06 11:45:39 2020 +0200 +++ b/OrthancFramework/Sources/DicomParsing/FromDcmtkBridge.h Mon Jul 06 13:48:10 2020 +0200 @@ -43,10 +43,6 @@ #include <dcmtk/dcmdata/dcfilefo.h> #include <json/json.h> -#if !defined(ORTHANC_ENABLE_LUA) -# error The macro ORTHANC_ENABLE_LUA must be defined -#endif - #if ORTHANC_ENABLE_DCMTK != 1 # error The macro ORTHANC_ENABLE_DCMTK must be set to 1 #endif @@ -55,10 +51,6 @@ # include <gtest/gtest_prod.h> #endif -#if ORTHANC_ENABLE_LUA == 1 -# include "../Lua/LuaFunctionCall.h" -#endif - #if !defined(ORTHANC_ENABLE_DCMTK_JPEG) # error The macro ORTHANC_ENABLE_DCMTK_JPEG must be defined #endif @@ -244,11 +236,6 @@ static void FromJson(DicomMap& values, const Json::Value& result); -#if ORTHANC_ENABLE_LUA == 1 - static void ExecuteToDicom(DicomMap& target, - LuaFunctionCall& call); -#endif - static void ExtractDicomSummary(DicomMap& target, DcmItem& dataset, const std::set<DicomTag>& ignoreTagLength);