Import 2017-06-07 23:51:09: master 40aca432

Diff Back to Repository
Author Committer Branch Timestamp Parent
jcfr jcfr master 2015-10-01 18:07:12 master d83b7edd
Changeset

COMP: Update Slicer and CTK to fix DCMTK windows build error.

This commit fixes windows build error and redefined warnings introduced
by the commit r24586 (ENH: Update DMCTK to use version DCMTK-3.6.1_20150924)

Related commits:

  • r24136 (STYLE: Update CTK to fix warning related to wrapping of CTKDICOM module)
  • r23955 (COMP: Workaround to fix HAVE_STAT redefined warning in SlicerDICOMExportDialog)
  • r23952 (COMP: Workaround to fix HAVE_STAT redefined warning in qSlicerCoreApplication)

CTK updates:

$ git shortlog 7199173..6453c27 --no-merges
Jean-Christophe Fillion-Robin (2):
Workaround refined macro warning when building CTKDICOMWidgetsPythonQt
Fix CTKDICOMWidgetsPythonQt windows build error undefining HAVE_INT64_T

Reported-by: Andriy Fedorov <fedorov@bwh.harvard.edu>
Thanks: Andras Lasso <lasso@queensu.ca>
Thanks: Jörg Riesmeier
Thanks: Michael Onken

git-svn-id: http://svn.slicer.org/Slicer4/trunk@24588 3bd1e089-480b-0410-8dfb-8563597acbee
mod - Base/QTCore/qSlicerCoreApplication.cxx Diff File
mod - Modules/Scripted/DICOMLib/Widgets/qSlicerDICOMExportDialog.cxx Diff File
mod - SuperBuild/External_CTK.cmake Diff File