ENH: Update version of DCMTK to 3.6.1_201610.12

Applications/ctkDICOMObjectViewer/ctkDICOMObjectViewerMain.cpp

@@ -26,7 +26,7 @@
 #include "ctkDICOMItemView.h"
 
 // DCMTK includes
-#include <dcmimage.h>
+#include <dcmtk/dcmimgle/dcmimage.h>
 
 
 // Qt includes

CMakeExternals/DCMTK.cmake

@@ -24,7 +24,7 @@ if(DEFINED DCMTK_DIR AND NOT EXISTS ${DCMTK_DIR})
 endif()
 
 if(NOT DEFINED DCMTK_DIR AND NOT ${CMAKE_PROJECT_NAME}_USE_SYSTEM_${proj})
-  set(revision_tag DCMTK-3.6.1_20150924)
+  set(revision_tag efe1a177eac040b6d41aae0db7714cd970e12bc5)
   if(${proj}_REVISION_TAG)
     set(revision_tag ${${proj}_REVISION_TAG})
   endif()

Libs/DICOM/Core/ctkDICOMDatabase.cpp

@@ -49,7 +49,7 @@
 #include <dcmtk/ofstd/ofstring.h>
 #include <dcmtk/ofstd/ofstd.h>        /* for class OFStandard */
 #include <dcmtk/dcmdata/dcddirif.h>   /* for class DicomDirInterface */
-#include <dcmimage.h>
+#include <dcmtk/dcmimgle/dcmimage.h>
 
 #include <dcmtk/dcmjpeg/djdecode.h>  /* for dcmjpeg decoders */
 #include <dcmtk/dcmjpeg/djencode.h>  /* for dcmjpeg encoders */

Libs/DICOM/Core/ctkDICOMItem.cpp

@@ -21,9 +21,9 @@
 
 #include "ctkDICOMItem.h"
 
-#include <dctk.h>
-#include <dcostrmb.h>
-#include <dcistrmb.h>
+#include <dcmtk/dcmdata/dctk.h>
+#include <dcmtk/dcmdata/dcostrmb.h>
+#include <dcmtk/dcmdata/dcistrmb.h>
 
 #include <stdexcept>
 

Libs/DICOM/Core/ctkDICOMItem.h

@@ -25,7 +25,7 @@
 
 #include "ctkDICOMPersonName.h"
 
-#include <dcdatset.h> // DCMTK DcmDataset
+#include <dcmtk/dcmdata/dcdatset.h> // DCMTK DcmDataset
 
 #include <QtCore>
 

Libs/DICOM/Core/ctkDICOMModel.cpp

@@ -30,7 +30,7 @@
 #include <QDebug>
 
 // dcmtk includes
-#include "dcvrpn.h"
+#include "dcmtk/dcmdata/dcvrpn.h"
 
 // ctkDICOMCore includes
 #include "ctkDICOMModel.h"

Libs/DICOM/Widgets/Testing/Cpp/ctkDICOMImageTest1.cpp

@@ -28,7 +28,7 @@
 #include "ctkDICOMImage.h"
 
 // DCMTK includes
-#include <dcmimage.h>
+#include <dcmtk/dcmimgle/dcmimage.h>
 
 // STD includes
 #include <iostream>

Libs/DICOM/Widgets/Testing/Cpp/ctkDICOMItemViewTest1.cpp

@@ -28,7 +28,7 @@
 #include "ctkDICOMItemView.h"
 
 // DCMTK includes
-#include <dcmimage.h>
+#include <dcmtk/dcmimgle/dcmimage.h>
 
 // STD includes
 #include <iostream>

Libs/DICOM/Widgets/ctkDICOMAppWidget.cpp

@@ -21,7 +21,7 @@
 // std includes
 #include <iostream>
 
-#include <dcmimage.h>
+#include <dcmtk/dcmimgle/dcmimage.h>
 
 // Qt includes
 #include <QAction>

Libs/DICOM/Widgets/ctkDICOMImage.cpp

@@ -28,8 +28,8 @@
 #include "ctkLogger.h"
 
 // DCMTK includes
-#include <dcmimage.h>
-#include <ofbmanip.h>
+#include <dcmtk/dcmimgle/dcmimage.h>
+#include <dcmtk/ofstd/ofbmanip.h>
 
 static ctkLogger logger ( "org.commontk.dicom.DICOMImage" );
 struct Node;

Libs/DICOM/Widgets/ctkDICOMThumbnailGenerator.cpp

@@ -27,7 +27,7 @@
 #include <QImage>
 
 // DCMTK includes
-#include "dcmimage.h"
+#include "dcmtk/dcmimgle/dcmimage.h"
 
 static ctkLogger logger ( "org.commontk.dicom.DICOMThumbnailGenerator" );
 struct Node;

Libs/DICOM/Widgets/ctkDICOMThumbnailListWidget.cpp

@@ -51,7 +51,7 @@
 #include <iostream>
 
 // DCMTK includes
-#include <dcmimage.h>
+#include <dcmtk/dcmimgle/dcmimage.h>
 
 static ctkLogger logger("org.commontk.DICOM.Widgets.ctkDICOMThumbnailListWidget");
 

Plugins/org.commontk.dah.cmdlinemoduleapp/ctkCommandLineModuleAppLogic.cpp

@@ -43,7 +43,7 @@
 #include "ctkCmdLineModuleBackendLocalProcess.h"
 
 // DCMTK includes
-#include <dcmimage.h>
+#include <dcmtk/dcmimgle/dcmimage.h>
 
 #if (QT_VERSION < QT_VERSION_CHECK(5,0,0))
 #include <QDesktopServices>

Plugins/org.commontk.dah.exampleapp/ctkExampleDicomAppLogic.cpp

@@ -39,7 +39,7 @@
 #include "ctkDicomAvailableDataHelper.h"
 
 // DCMTK includes
-#include <dcmimage.h>
+#include <dcmtk/dcmimgle/dcmimage.h>
 
 //----------------------------------------------------------------------------
 ctkExampleDicomAppLogic::ctkExampleDicomAppLogic():

Plugins/org.commontk.dah.examplehost/ctkExampleDicomHost.cpp

@@ -35,7 +35,7 @@
 #include <iostream>
 
 // DCMTK includes
-#include <dcuid.h>
+#include <dcmtk/dcmdata/dcuid.h>
 
 //----------------------------------------------------------------------------
 ctkExampleDicomHost::ctkExampleDicomHost(ctkHostedAppPlaceholderWidget* placeholderWidget, int hostPort, int appPort) :