Merge pull request #496 from jadh4v/wasm-dcmqi

Fixes for upgraded DCMTK and web-assembly build
QIICR · Jun 21, 2024 · 2a2d359 · 2a2d359
2 parents 81e9073 + 1cfe717
commit 2a2d359
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 5 deletions.
diff --git a/.github/workflows/cmake-win.yml b/.github/workflows/cmake-win.yml
@@ -11,8 +11,8 @@ jobs:
 
   build-windows:
 
-    runs-on: windows-latest
-    timeout-minutes: 30
+    runs-on: windows-2022
+    timeout-minutes: 360
 
     steps:
       - uses: actions/checkout@v3
@@ -57,7 +57,7 @@ jobs:
           echo "Step 2"
           cd ${{ github.workspace }}\dcmqi-build
           echo "Step 3"
-          cmake -G "Visual Studio 17 2022" -Ax64 -DITK_DIR:PATH=c:\ITK-install\lib\cmake\ITK-5.3 -DDCMTK_DIR:PATH=c:\DCMTK-install\cmake -DZLIB_ROOT:PATH=c:\zlib-install -DZLIB_INCLUDE_DIR:PATH=c:\zlib-install\include -DZLIB_LIBRARY:FILEPATH=c:\zlib-install\lib\zlib.lib -DBUILD_SHARED_LIBS:BOOL=OFF ${{ github.workspace }}
+          cmake -G "Visual Studio 17 2022" -Ax64 -DBUILD_SHARED_LIBS:BOOL=OFF ${{ github.workspace }}
 
       - name: Build dcmqi
         run: |
@@ -81,7 +81,7 @@ jobs:
 
   publish-windows:
 
-    runs-on: windows-latest
+    runs-on: windows-2019
     timeout-minutes: 5
     # Only run if the event is not a pull request and the repository owner is QIICR.
     # The latter is to prevent forks from publishing packages even if the owner's token
@@ -108,4 +108,4 @@ jobs:
           --prerelease-packages "${{ github.workspace }}\dcmqi-build\dcmqi-build\dcmqi-*-win64-*.zip" `
           --prerelease-packages-clear-pattern "dcmqi-*-win64-*" `
           --prerelease-packages-keep-pattern "*<COMMIT_DATE>-<COMMIT_SHORT_SHA>*" `
-          --token ${{ secrets.GA_TOKEN }}
+          --token ${{ secrets.GA_TOKEN }}
diff --git a/libsrc/Itk2DicomConverter.cpp b/libsrc/Itk2DicomConverter.cpp
@@ -5,6 +5,13 @@
 #include "dcmqi/JSONSegmentationMetaInformationHandler.h"
 
 // DCMTK includes
+#include <dcmtk/config/osconfig.h>
+#if defined(PACKAGE_VERSION_NUMBER) && PACKAGE_VERSION_NUMBER > 366
+  #include <dcmtk/dcmdata/dcuid.h>
+  #include <dcmtk/dcmdata/dcvrda.h>
+  #include <dcmtk/dcmdata/dcvrtm.h>
+  #include <dcmtk/dcmfg/fgfracon.h>
+#endif
 #include <dcmtk/dcmsr/codes/dcm.h>
 
 

diff --git a/libsrc/ParaMapConverter.cpp b/libsrc/ParaMapConverter.cpp
@@ -7,6 +7,17 @@
 #include "dcmqi/ParaMapConverter.h"
 
 // DCMTK includes
+#include <dcmtk/config/osconfig.h>
+#if defined(PACKAGE_VERSION_NUMBER) && PACKAGE_VERSION_NUMBER > 366
+  #include <dcmtk/dcmdata/dcuid.h>
+  #include <dcmtk/dcmdata/dcvrda.h>
+  #include <dcmtk/dcmdata/dcvrtm.h>
+  #include <dcmtk/dcmfg/fgfracon.h>
+  #include <dcmtk/dcmfg/fgframeanatomy.h>
+  #include <dcmtk/dcmfg/fgparametricmapframetype.h>
+  #include <dcmtk/dcmfg/fgpixeltransform.h>
+  #include <dcmtk/dcmfg/fgrealworldvaluemapping.h>
+#endif
 #include <dcmtk/dcmsr/codes/dcm.h>
 #include <dcmtk/dcmsr/codes/sct.h>
 #include <dcmtk/dcmsr/codes/ucum.h>