Mercurial > hg > orthanc

changeset 6550:cca87835da95

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix build msvc 2015
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 19 Dec 2025 16:56:17 +0100
parents bf72a35a8313
children a1be792caa93
files OrthancFramework/Resources/Patches/dcmtk-3.7.0.patch
diffstat 1 files changed, 32 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/OrthancFramework/Resources/Patches/dcmtk-3.7.0.patch	Fri Dec 19 15:49:17 2025 +0100
+++ b/OrthancFramework/Resources/Patches/dcmtk-3.7.0.patch	Fri Dec 19 16:56:17 2025 +0100
@@ -39,6 +39,21 @@
  }
 +
 +#include "dcdict_orthanc.cc"
+diff -urEb dcmtk-3.7.0.orig/dcmdata/libsrc/dclist.cc dcmtk-3.7.0/dcmdata/libsrc/dclist.cc
+--- dcmtk-3.7.0.orig/dcmdata/libsrc/dclist.cc	2025-12-19 14:29:01.226154713 +0100
++++ dcmtk-3.7.0/dcmdata/libsrc/dclist.cc	2025-12-19 16:32:05.503265348 +0100
+@@ -19,6 +19,11 @@
+  *
+  */
+ 
++
++#ifdef _WIN32
++#define NOMINMAX
++#endif
++
+ #include "dcmtk/config/osconfig.h"    /* make sure OS specific configuration is included first */
+ 
+ #include "dcmtk/ofstd/ofstream.h"
 diff -urEb dcmtk-3.7.0.orig/dcmdata/libsrc/dcpxitem.cc dcmtk-3.7.0/dcmdata/libsrc/dcpxitem.cc
 --- dcmtk-3.7.0.orig/dcmdata/libsrc/dcpxitem.cc	2025-12-19 14:29:01.226154713 +0100
 +++ dcmtk-3.7.0/dcmdata/libsrc/dcpxitem.cc	2025-12-19 14:32:22.058845317 +0100
@@ -51,6 +66,20 @@
  
  // ********************************
  
+diff -urEb dcmtk-3.7.0.orig/dcmimgle/libsrc/dimoimg.cc dcmtk-3.7.0/dcmimgle/libsrc/dimoimg.cc
+--- dcmtk-3.7.0.orig/dcmimgle/libsrc/dimoimg.cc	2025-12-19 14:29:01.240154622 +0100
++++ dcmtk-3.7.0/dcmimgle/libsrc/dimoimg.cc	2025-12-19 16:37:36.341891012 +0100
+@@ -20,6 +20,10 @@
+  */
+ 
+ 
++#ifdef _WIN32
++#define NOMINMAX
++#endif
++
+ #include "dcmtk/config/osconfig.h"
+ #include "dcmtk/dcmimgle/dimoimg.h"
+ 
 diff -urEb dcmtk-3.7.0.orig/dcmnet/libsrc/scu.cc dcmtk-3.7.0/dcmnet/libsrc/scu.cc
 --- dcmtk-3.7.0.orig/dcmnet/libsrc/scu.cc	2025-12-19 14:29:01.298154244 +0100
 +++ dcmtk-3.7.0/dcmnet/libsrc/scu.cc	2025-12-19 14:32:55.028558816 +0100
@@ -168,8 +197,8 @@
  
 diff -urEb dcmtk-3.7.0.orig/oficonv/libsrc/citrus_lock.h dcmtk-3.7.0/oficonv/libsrc/citrus_lock.h
 --- dcmtk-3.7.0.orig/oficonv/libsrc/citrus_lock.h	2025-12-19 14:29:01.279154368 +0100
-+++ dcmtk-3.7.0/oficonv/libsrc/citrus_lock.h	2025-12-19 14:44:56.261698027 +0100
-@@ -31,11 +31,11 @@
++++ dcmtk-3.7.0/oficonv/libsrc/citrus_lock.h	2025-12-19 16:48:26.750185959 +0100
+@@ -31,7 +31,7 @@
  
  #ifdef WITH_THREADS
  
@@ -177,13 +206,7 @@
 +#if defined(HAVE_WINDOWS_H)
  
  #include <windows.h>
--#define WLOCK(lock)   AcquireSRWLockExclusive(lock);
--#define UNLOCK(lock)  ReleaseSRWLockExclusive(lock);
-+#define WLOCK(lock)   EnterCriticalSection(lock);
-+#define UNLOCK(lock)  LeaveCriticalSection(lock);
- #define RLOCK(lock)   AcquireSRWLockShared(lock);
- #define UNRLOCK(lock) ReleaseSRWLockShared(lock);
- 
+ #define WLOCK(lock)   AcquireSRWLockExclusive(lock);
 diff -urEb dcmtk-3.7.0.orig/oficonv/libsrc/citrus_mapper.c dcmtk-3.7.0/oficonv/libsrc/citrus_mapper.c
 --- dcmtk-3.7.0.orig/oficonv/libsrc/citrus_mapper.c	2025-12-19 14:29:01.274154401 +0100
 +++ dcmtk-3.7.0/oficonv/libsrc/citrus_mapper.c	2025-12-19 14:45:32.613427883 +0100