# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1578329974 -3600
# Node ID 0654d0838de8ac73840454c1e15a697575bebd34
# Parent  0301f59450fe65bad92d6eee14992e3bf7a96dcf
disable thread support in DCMTK if wasm/asm.js

diff -r 0301f59450fe -r 0654d0838de8 Core/DicomParsing/FromDcmtkBridge.cpp
--- a/Core/DicomParsing/FromDcmtkBridge.cpp	Mon Jan 06 17:58:15 2020 +0100
+++ b/Core/DicomParsing/FromDcmtkBridge.cpp	Mon Jan 06 17:59:34 2020 +0100
@@ -177,18 +177,18 @@
     };
 
     
-#define DCMTK_TO_CTYPE_CONVERTER(converter, cType, dcmtkType, getter) \
- \
-    struct converter \
-    { \
-      typedef cType CType; \
- \
-      static bool Apply(CType& result, \
-                        DcmElement& element, \
-                        size_t i) \
-      { \
+#define DCMTK_TO_CTYPE_CONVERTER(converter, cType, dcmtkType, getter)   \
+                                                                        \
+    struct converter                                                    \
+    {                                                                   \
+      typedef cType CType;                                              \
+                                                                        \
+      static bool Apply(CType& result,                                  \
+                        DcmElement& element,                            \
+                        size_t i)                                       \
+      {                                                                 \
         return dynamic_cast<dcmtkType&>(element).getter(result, i).good(); \
-      } \
+      }                                                                 \
     };
 
 DCMTK_TO_CTYPE_CONVERTER(DcmtkToSint32Converter, Sint32, DcmSignedLong, getSint32)
diff -r 0301f59450fe -r 0654d0838de8 Resources/CMake/DcmtkConfigurationStatic-3.6.2.cmake
--- a/Resources/CMake/DcmtkConfigurationStatic-3.6.2.cmake	Mon Jan 06 17:58:15 2020 +0100
+++ b/Resources/CMake/DcmtkConfigurationStatic-3.6.2.cmake	Mon Jan 06 17:59:34 2020 +0100
@@ -12,7 +12,12 @@
 
 set(DCMTK_BINARY_DIR ${DCMTK_SOURCES_DIR}/)
 set(DCMTK_CMAKE_INCLUDE ${DCMTK_SOURCES_DIR}/)
-set(DCMTK_WITH_THREADS ON)
+
+if (CMAKE_SYSTEM_NAME STREQUAL "Emscripten")
+  set(DCMTK_WITH_THREADS OFF)  # Disable thread support in wasm/asm.js
+else()
+  set(DCMTK_WITH_THREADS ON)
+endif()
 
 add_definitions(-DDCMTK_INSIDE_LOG4CPLUS=1)
 
diff -r 0301f59450fe -r 0654d0838de8 Resources/CMake/DcmtkConfigurationStatic-3.6.4.cmake
--- a/Resources/CMake/DcmtkConfigurationStatic-3.6.4.cmake	Mon Jan 06 17:58:15 2020 +0100
+++ b/Resources/CMake/DcmtkConfigurationStatic-3.6.4.cmake	Mon Jan 06 17:59:34 2020 +0100
@@ -12,7 +12,12 @@
 
 set(DCMTK_BINARY_DIR ${DCMTK_SOURCES_DIR}/)
 set(DCMTK_CMAKE_INCLUDE ${DCMTK_SOURCES_DIR}/)
-set(DCMTK_WITH_THREADS ON)
+
+if (CMAKE_SYSTEM_NAME STREQUAL "Emscripten")
+  set(DCMTK_WITH_THREADS OFF)  # Disable thread support in wasm/asm.js
+else()
+  set(DCMTK_WITH_THREADS ON)
+endif()
 
 add_definitions(-DDCMTK_INSIDE_LOG4CPLUS=1)