|
 |
c69c5dc |
From 42113618abda2260f7039878cd71cdb19d62eaca Mon Sep 17 00:00:00 2001
|
|
|
c69c5dc |
From: Hans Johnson <hans.j.johnson@gmail.com>
|
|
|
c69c5dc |
Date: Mon, 31 Dec 2018 07:30:51 -0700
|
|
|
c69c5dc |
Subject: [PATCH] COMP: DCMTK 3.6.4 updated function signatures
|
|
|
c69c5dc |
|
|
|
c69c5dc |
The locking mechanism for the dcmtk global
|
|
|
c69c5dc |
dictionary was changed to support:
|
|
|
c69c5dc |
|
|
|
c69c5dc |
Class OFReadWriteLock now uses SRW locks on Windows.
|
|
|
c69c5dc |
|
|
|
c69c5dc |
Unfortunately SRW locks require different functions for unlocking read
|
|
|
c69c5dc |
and write locks, which causes an API change in class OFReadWriteLock and
|
|
|
c69c5dc |
in class GlobalDcmDataDictionary (which internally uses a read/write
|
|
|
c69c5dc |
lock to protect access to the DICOM dictionary.)
|
|
|
c69c5dc |
---
|
|
|
c69c5dc |
Libs/DICOM/Core/ctkDICOMItem.cpp | 9 +++++++++
|
|
|
c69c5dc |
1 file changed, 9 insertions(+)
|
|
|
c69c5dc |
|
|
|
c69c5dc |
diff --git a/Libs/DICOM/Core/ctkDICOMItem.cpp b/Libs/DICOM/Core/ctkDICOMItem.cpp
|
|
|
c69c5dc |
index f987b1fd6..be33e9054 100644
|
|
|
c69c5dc |
--- a/Libs/DICOM/Core/ctkDICOMItem.cpp
|
|
|
c69c5dc |
+++ b/Libs/DICOM/Core/ctkDICOMItem.cpp
|
|
|
c69c5dc |
@@ -21,6 +21,7 @@
|
|
|
c69c5dc |
|
|
|
c69c5dc |
#include "ctkDICOMItem.h"
|
|
|
c69c5dc |
|
|
|
c69c5dc |
+#include <dcmtk/dcmdata/dcuid.h>
|
|
|
c69c5dc |
#include <dcmtk/dcmdata/dctk.h>
|
|
|
c69c5dc |
#include <dcmtk/dcmdata/dcostrmb.h>
|
|
|
c69c5dc |
#include <dcmtk/dcmdata/dcistrmb.h>
|
|
|
c69c5dc |
@@ -950,7 +951,11 @@ QString ctkDICOMItem::TagDescription( const DcmTag& tag )
|
|
|
c69c5dc |
{
|
|
|
c69c5dc |
returnName = entry->getTagName();
|
|
|
c69c5dc |
}
|
|
|
c69c5dc |
+#if OFFIS_DCMTK_VERSION_NUMBER < 364
|
|
|
c69c5dc |
dcmDataDict.unlock();
|
|
|
c69c5dc |
+#else
|
|
|
c69c5dc |
+ dcmDataDict.rdunlock();
|
|
|
c69c5dc |
+#endif
|
|
|
c69c5dc |
return returnName;
|
|
|
c69c5dc |
}
|
|
|
c69c5dc |
|
|
|
c69c5dc |
@@ -964,7 +969,11 @@ QString ctkDICOMItem::TagVR( const DcmTag& tag )
|
|
|
c69c5dc |
{
|
|
|
c69c5dc |
returnVR = entry->getVR().getVRName();
|
|
|
c69c5dc |
}
|
|
|
c69c5dc |
+#if OFFIS_DCMTK_VERSION_NUMBER < 364
|
|
|
c69c5dc |
dcmDataDict.unlock();
|
|
|
c69c5dc |
+#else
|
|
|
c69c5dc |
+ dcmDataDict.rdunlock();
|
|
|
c69c5dc |
+#endif
|
|
|
c69c5dc |
return returnVR;
|
|
|
c69c5dc |
}
|
|
|
c69c5dc |
|