[med-svn] [dcmtk] 01/04: New upstream version 3.6.1~20160630
Gert Wollny
gert-guest at moszumanska.debian.org
Tue Oct 11 20:56:32 UTC 2016
This is an automated email from the git hooks/post-receive script.
gert-guest pushed a commit to branch master
in repository dcmtk.
commit 5dbd33b457ddef47c262ea66ae89c1fc626f8891
Author: Gert Wollny <gw.fossdev at gmail.com>
Date: Tue Oct 11 20:08:20 2016 +0000
New upstream version 3.6.1~20160630
---
CMake/GenerateDCMTKConfigure.cmake | 76 +-
CMake/dcmtkPrepare.cmake | 16 +-
CMake/osconfig.h.in | 5 -
CMakeLists.txt | 2 +-
CREDITS | 10 +-
Makefile | 70 +-
VERSION | 2 +-
config/Makefile.def.in | 2 +-
config/arith.cc | 8 +-
ofstd/libsrc/ofmath.cc => config/math.cc | 70 +-
config/modules | 2 +-
dcmdata/data/dicom.dic | 821 ++-
dcmdata/docs/dcmgpdir.man | 6 +-
dcmdata/docs/img2dcm.man | 8 +-
dcmdata/include/dcmtk/dcmdata/dcbytstr.h | 21 +-
dcmdata/include/dcmtk/dcmdata/dcddirif.h | 12 +
dcmdata/include/dcmtk/dcmdata/dcdeftag.h | 130 +-
dcmdata/include/dcmtk/dcmdata/dcdirrec.h | 4 +-
dcmdata/include/dcmtk/dcmdata/dcerror.h | 9 +-
dcmdata/include/dcmtk/dcmdata/dcuid.h | 4 +
dcmdata/libi2d/i2djpgs.cc | 4 +-
dcmdata/libsrc/dcbytstr.cc | 70 +-
dcmdata/libsrc/dcchrstr.cc | 17 +-
dcmdata/libsrc/dccodec.cc | 76 +-
dcmdata/libsrc/dcddirif.cc | 211 +-
dcmdata/libsrc/dcdict.cc | 14 +-
dcmdata/libsrc/dcdictbi.cc | 696 +-
dcmdata/libsrc/dcdirrec.cc | 5 +-
dcmdata/libsrc/dcerror.cc | 16 +-
dcmdata/libsrc/dcitem.cc | 9 +-
dcmdata/libsrc/dcrleccd.cc | 6 +-
dcmdata/libsrc/dcrlecce.cc | 6 +-
dcmdata/libsrc/dcsequen.cc | 2 +-
dcmdata/libsrc/dcswap.cc | 17 +-
dcmdata/libsrc/dcuid.cc | 18 +-
dcmdata/libsrc/dcvr.cc | 4 +-
dcmdata/libsrc/dcvrpn.cc | 15 +-
dcmdata/tests/tchval.cc | 20 +-
dcmfg/include/dcmtk/dcmfg/fg.h | 4 +-
dcmfg/include/dcmtk/dcmfg/fgbase.h | 10 +-
dcmfg/include/dcmtk/dcmfg/fgderimg.h | 10 +-
dcmfg/include/dcmtk/dcmfg/fgfracon.h | 10 +-
dcmfg/include/dcmtk/dcmfg/fgframevoilut.h | 6 +-
dcmfg/include/dcmtk/dcmfg/fgimagedatatype.h | 4 +-
dcmfg/include/dcmtk/dcmfg/fginterface.h | 8 +-
dcmfg/include/dcmtk/dcmfg/fgpixmsr.h | 8 +-
dcmfg/include/dcmtk/dcmfg/fgplanor.h | 10 +-
dcmfg/include/dcmtk/dcmfg/fgplanorvol.h | 4 +-
dcmfg/include/dcmtk/dcmfg/fgplanpo.h | 8 +-
dcmfg/include/dcmtk/dcmfg/fgplanposvol.h | 10 +-
.../include/dcmtk/dcmfg/fgrealworldvaluemapping.h | 11 +-
dcmfg/include/dcmtk/dcmfg/fgseg.h | 10 +-
dcmfg/include/dcmtk/dcmfg/fgtypes.h | 10 +-
dcmfg/include/dcmtk/dcmfg/fgusimagedescription.h | 12 +-
dcmfg/include/dcmtk/dcmfg/stack.h | 4 +-
dcmfg/libsrc/Makefile.dep | 31 +-
dcmfg/libsrc/fg.cc | 4 +-
dcmfg/libsrc/fgbase.cc | 8 +-
dcmfg/libsrc/fgfact.cc | 6 +-
dcmfg/libsrc/fgfracon.cc | 2 +-
dcmfg/libsrc/fgimagedatatype.cc | 15 +-
dcmfg/libsrc/fginterface.cc | 16 +-
dcmfg/libsrc/fgplanpo.cc | 4 +-
dcmfg/libsrc/fgrealworldvaluemapping.cc | 20 +-
dcmfg/libsrc/fgtypes.cc | 8 +-
dcmfg/libsrc/fgusimagedescription.cc | 4 +-
dcmfg/libsrc/stackinterface.cc | 6 +-
dcmimage/include/dcmtk/dcmimage/diargpxt.h | 16 +-
dcmimage/include/dcmtk/dcmimage/dicmypxt.h | 22 +-
dcmimage/include/dcmtk/dcmimage/dicoimg.h | 6 +-
dcmimage/include/dcmtk/dcmimage/dicomot.h | 12 +-
dcmimage/include/dcmtk/dcmimage/dicoopxt.h | 22 +-
dcmimage/include/dcmtk/dcmimage/dicopx.h | 6 +-
dcmimage/include/dcmtk/dcmimage/dicopxt.h | 36 +-
dcmimage/include/dcmtk/dcmimage/dihsvpxt.h | 34 +-
dcmimage/include/dcmtk/dcmimage/dipalpxt.h | 10 +-
dcmimage/include/dcmtk/dcmimage/diqtcmap.h | 6 +-
dcmimage/include/dcmtk/dcmimage/diqtctab.h | 14 +-
dcmimage/include/dcmtk/dcmimage/diqtfs.h | 10 +-
dcmimage/include/dcmtk/dcmimage/dirgbpxt.h | 14 +-
dcmimage/include/dcmtk/dcmimage/diybrpxt.h | 78 +-
dcmimage/include/dcmtk/dcmimage/diyf2pxt.h | 20 +-
dcmimage/include/dcmtk/dcmimage/diyp2pxt.h | 20 +-
dcmimage/libsrc/diqtctab.cc | 28 +-
dcmimage/libsrc/diqthash.cc | 4 +-
dcmimage/libsrc/diquant.cc | 4 +-
dcmimgle/include/dcmtk/dcmimgle/dcmimage.h | 15 +-
dcmimgle/include/dcmtk/dcmimgle/dicrvfit.h | 18 +-
dcmimgle/include/dcmtk/dcmimgle/diflipt.h | 58 +-
dcmimgle/include/dcmtk/dcmimgle/diinpxt.h | 38 +-
dcmimgle/include/dcmtk/dcmimgle/dimoimg.h | 10 +-
dcmimgle/include/dcmtk/dcmimgle/dimoipxt.h | 18 +-
dcmimgle/include/dcmtk/dcmimgle/dimoopxt.h | 62 +-
dcmimgle/include/dcmtk/dcmimgle/dimopxt.h | 34 +-
dcmimgle/include/dcmtk/dcmimgle/dirotat.h | 56 +-
dcmimgle/include/dcmtk/dcmimgle/discalet.h | 130 +-
dcmimgle/include/dcmtk/dcmimgle/displint.h | 10 +-
dcmimgle/include/dcmtk/dcmimgle/diutils.h | 4 +-
dcmimgle/libsrc/dibaslut.cc | 8 +-
dcmimgle/libsrc/dicielut.cc | 16 +-
dcmimgle/libsrc/didispfn.cc | 22 +-
dcmimgle/libsrc/digsdfn.cc | 18 +-
dcmimgle/libsrc/digsdlut.cc | 16 +-
dcmimgle/libsrc/diimage.cc | 27 +-
dcmimgle/libsrc/diluptab.cc | 62 +-
dcmimgle/libsrc/dimoimg.cc | 46 +-
dcmimgle/libsrc/diovdat.cc | 4 +-
dcmimgle/libsrc/diovlay.cc | 22 +-
dcmimgle/libsrc/diovlimg.cc | 6 +-
dcmimgle/libsrc/diovpln.cc | 42 +-
dcmiod/include/dcmtk/dcmiod/cielabutil.h | 6 +-
dcmiod/include/dcmtk/dcmiod/iodmacro.h | 220 +-
dcmiod/include/dcmtk/dcmiod/iodreferences.h | 356 ++
dcmiod/include/dcmtk/dcmiod/iodrules.h | 18 +-
dcmiod/include/dcmtk/dcmiod/iodtypes.h | 6 +-
dcmiod/include/dcmtk/dcmiod/iodutil.h | 46 +-
dcmiod/include/dcmtk/dcmiod/modbase.h | 11 +-
dcmiod/include/dcmtk/dcmiod/modcommoninstanceref.h | 24 +-
dcmiod/include/dcmtk/dcmiod/modenhequipment.h | 31 +-
dcmiod/include/dcmtk/dcmiod/modenhusimage.h | 7 +-
dcmiod/include/dcmtk/dcmiod/modenhusseries.h | 6 +-
dcmiod/include/dcmtk/dcmiod/modequipment.h | 2 +-
dcmiod/include/dcmtk/dcmiod/modgeneralimage.h | 4 +-
.../include/dcmtk/dcmiod/modmultiframedimension.h | 10 +-
dcmiod/include/dcmtk/dcmiod/modmultiframefg.h | 4 +-
dcmiod/include/dcmtk/dcmiod/modpatientstudy.h | 4 +-
dcmiod/include/dcmtk/dcmiod/modsopcommon.h | 4 +-
dcmiod/include/dcmtk/dcmiod/modsynchronisation.h | 4 +-
dcmiod/libsrc/CMakeLists.txt | 1 +
dcmiod/libsrc/Makefile.dep | 149 +-
dcmiod/libsrc/iodmacro.cc | 373 +-
dcmiod/libsrc/iodreferences.cc | 534 ++
dcmiod/libsrc/iodrules.cc | 61 +-
dcmiod/libsrc/iodtypes.cc | 4 +-
dcmiod/libsrc/iodutil.cc | 46 +-
dcmiod/libsrc/modacquisitioncontext.cc | 4 +-
dcmiod/libsrc/modbase.cc | 17 +-
dcmiod/libsrc/modcommoninstanceref.cc | 169 +-
dcmiod/libsrc/modenhequipment.cc | 36 +-
dcmiod/libsrc/modenhusimage.cc | 68 +-
dcmiod/libsrc/modenhusseries.cc | 8 +-
dcmiod/libsrc/modequipment.cc | 18 +-
dcmiod/libsrc/modfor.cc | 6 +-
dcmiod/libsrc/modgeneralimage.cc | 36 +-
dcmiod/libsrc/modgeneralseries.cc | 31 +-
dcmiod/libsrc/modgeneralstudy.cc | 22 +-
dcmiod/libsrc/modimagepixel.cc | 24 +-
dcmiod/libsrc/modmultiframedimension.cc | 10 +-
dcmiod/libsrc/modmultiframefg.cc | 12 +-
dcmiod/libsrc/modpatient.cc | 10 +-
dcmiod/libsrc/modpatientstudy.cc | 10 +-
dcmiod/libsrc/modsegmentationseries.cc | 10 +-
dcmiod/libsrc/modsopcommon.cc | 16 +-
dcmiod/libsrc/modsynchronization.cc | 20 +-
dcmiod/libsrc/modusfor.cc | 18 +-
dcmiod/tests/tcielabutil.cc | 2 +-
dcmjpeg/docs/dcmcjpeg.man | 10 +-
dcmjpeg/libijg12/jdlhuff.c | 13 +-
dcmjpeg/libijg12/jdphuff.c | 33 +-
dcmjpeg/libijg12/jdshuff.c | 21 +-
dcmjpeg/libijg16/jdlhuff.c | 13 +-
dcmjpeg/libijg16/jdphuff.c | 33 +-
dcmjpeg/libijg16/jdshuff.c | 21 +-
dcmjpeg/libijg8/jdlhuff.c | 13 +-
dcmjpeg/libijg8/jdphuff.c | 33 +-
dcmjpeg/libijg8/jdshuff.c | 21 +-
dcmjpeg/libsrc/djcodecd.cc | 22 +-
dcmjpeg/libsrc/djcodece.cc | 4 +-
dcmjpls/docs/dcmcjpls.man | 4 +-
dcmjpls/libcharls/encodstr.h | 256 +-
dcmjpls/libsrc/djcodecd.cc | 42 +-
dcmnet/docs/movescu.man | 24 +-
dcmnet/docs/storescp.man | 4 +
dcmnet/etc/storescp.cfg | 4 +
dcmnet/etc/storescu.cfg | 4 +
dcmnet/include/dcmtk/dcmnet/assoc.h | 14 +-
dcmnet/include/dcmtk/dcmnet/dicom.h | 6 +-
dcmnet/include/dcmtk/dcmnet/dimse.h | 22 +-
dcmnet/include/dcmtk/dcmnet/dstorscu.h | 26 +-
dcmnet/include/dcmtk/dcmnet/dul.h | 3 +-
dcmnet/libsrc/assoc.cc | 19 +-
dcmnet/libsrc/dimecho.cc | 2 +-
dcmnet/libsrc/dimfind.cc | 2 +-
dcmnet/libsrc/dimget.cc | 2 +-
dcmnet/libsrc/dimmove.cc | 2 +-
dcmnet/libsrc/dimse.cc | 2 +-
dcmnet/libsrc/dimstore.cc | 2 +-
dcmnet/libsrc/dstorscu.cc | 13 +
dcmnet/libsrc/dul.cc | 54 +-
dcmpstat/libsrc/Makefile.dep | 3 +-
dcmpstat/libsrc/dviface.cc | 6 +-
dcmqrdb/docs/dcmqrscp.man | 4 +
dcmqrdb/libsrc/dcmqrdbi.cc | 29 +-
dcmrt/include/dcmtk/dcmrt/drttypes.h | 5 +-
dcmrt/libsrc/drtbvcps.cc | 5 +-
dcmrt/libsrc/drttypes.cc | 12 +-
dcmrt/tests/tests.cc | 4 +-
dcmseg/include/dcmtk/dcmseg/segdoc.h | 41 +-
dcmseg/include/dcmtk/dcmseg/segment.h | 16 +-
dcmseg/include/dcmtk/dcmseg/segtypes.h | 12 +-
dcmseg/include/dcmtk/dcmseg/segutils.h | 4 +-
dcmseg/libsrc/Makefile.dep | 6 +
dcmseg/libsrc/segdoc.cc | 32 +-
dcmseg/libsrc/segment.cc | 8 +-
dcmseg/libsrc/segtypes.cc | 16 +-
dcmseg/libsrc/segutils.cc | 4 +-
dcmseg/tests/Makefile.dep | 1 +
dcmsr/apps/Makefile.dep | 476 +-
dcmsr/apps/dsr2html.cc | 7 +-
dcmsr/apps/dsr2xml.cc | 9 +-
dcmsr/apps/dsrdump.cc | 7 +-
dcmsr/apps/xml2dsr.cc | 11 +-
dcmsr/include/dcmtk/dcmsr/cmr/cid100.h | 18 +-
dcmsr/include/dcmtk/dcmsr/cmr/cid10013.h | 12 +-
dcmsr/include/dcmtk/dcmsr/cmr/cid10033.h | 6 +-
dcmsr/include/dcmtk/dcmsr/cmr/cid11.h | 28 +-
dcmsr/include/dcmtk/dcmsr/cmr/cid244.h | 6 +-
dcmsr/include/dcmtk/dcmsr/cmr/cid29.h | 6 +-
dcmsr/include/dcmtk/dcmsr/cmr/cid4020.h | 10 +-
dcmsr/include/dcmtk/dcmsr/cmr/cid4021.h | 120 +-
dcmsr/include/dcmtk/dcmsr/cmr/cid4031.h | 12 +-
dcmsr/include/dcmtk/dcmsr/cmr/cid42.h | 6 +-
dcmsr/include/dcmtk/dcmsr/cmr/cid5000.h | 4 +-
dcmsr/include/dcmtk/dcmsr/cmr/cid5001.h | 4 +-
dcmsr/include/dcmtk/dcmsr/cmr/cid6147.h | 6 +-
dcmsr/include/dcmtk/dcmsr/cmr/cid7021.h | 6 +-
dcmsr/include/dcmtk/dcmsr/cmr/cid7181.h | 18 +-
dcmsr/include/dcmtk/dcmsr/cmr/cid7445.h | 6 +-
dcmsr/include/dcmtk/dcmsr/cmr/cid7452.h | 6 +-
dcmsr/include/dcmtk/dcmsr/cmr/cid7453.h | 6 +-
dcmsr/include/dcmtk/dcmsr/cmr/cid7464.h | 6 +-
dcmsr/include/dcmtk/dcmsr/cmr/cid7469.h | 24 +-
dcmsr/include/dcmtk/dcmsr/codes/dcm.h | 270 +-
dcmsr/include/dcmtk/dcmsr/codes/ncit.h | 24 +-
dcmsr/include/dcmtk/dcmsr/codes/srt.h | 7 +-
dcmsr/include/dcmtk/dcmsr/codes/ucum.h | 8 +-
dcmsr/include/dcmtk/dcmsr/codes/umls.h | 68 +-
dcmsr/include/dcmtk/dcmsr/dsrcitem.h | 6 +-
dcmsr/include/dcmtk/dcmsr/dsrcodvl.h | 1 -
dcmsr/include/dcmtk/dcmsr/dsrcomvl.h | 2 -
dcmsr/include/dcmtk/dcmsr/dsrcsidl.h | 14 +-
dcmsr/include/dcmtk/dcmsr/dsrctpl.h | 1 +
dcmsr/include/dcmtk/dcmsr/dsrdncsr.h | 65 +
dcmsr/include/dcmtk/dcmsr/dsrdoc.h | 18 +-
dcmsr/include/dcmtk/dcmsr/dsrdocst.h | 66 +-
dcmsr/include/dcmtk/dcmsr/dsrdoctn.h | 11 +-
dcmsr/include/dcmtk/dcmsr/dsrdoctr.h | 2 -
dcmsr/include/dcmtk/dcmsr/dsrnumvl.h | 4 +-
dcmsr/include/dcmtk/dcmsr/dsrposcn.h | 25 +-
dcmsr/include/dcmtk/dcmsr/dsrreftn.h | 7 +-
dcmsr/include/dcmtk/dcmsr/dsrrtpl.h | 1 +
dcmsr/include/dcmtk/dcmsr/dsrsoprf.h | 19 +-
dcmsr/include/dcmtk/dcmsr/dsrstpl.h | 3 +
dcmsr/include/dcmtk/dcmsr/dsrstrvl.h | 2 -
dcmsr/include/dcmtk/dcmsr/dsrtcodt.h | 2 -
dcmsr/include/dcmtk/dcmsr/dsrtlist.h | 6 +-
dcmsr/include/dcmtk/dcmsr/dsrtnant.h | 4 +-
dcmsr/include/dcmtk/dcmsr/dsrtncsr.h | 197 +-
dcmsr/include/dcmtk/dcmsr/dsrtree.h | 2 +
dcmsr/include/dcmtk/dcmsr/dsrtypes.h | 33 +-
dcmsr/include/dcmtk/dcmsr/dsrxmlc.h | 6 +-
dcmsr/include/dcmtk/dcmsr/dsrxmld.h | 3 +-
dcmsr/libcmr/Makefile.dep | 3065 ++-------
dcmsr/libcmr/cid100.cc | 10 +-
dcmsr/libcmr/cid10013.cc | 7 +-
dcmsr/libcmr/cid10033.cc | 4 +-
dcmsr/libcmr/cid11.cc | 20 +-
dcmsr/libcmr/cid244.cc | 4 +-
dcmsr/libcmr/cid29.cc | 4 +-
dcmsr/libcmr/cid4020.cc | 7 +-
dcmsr/libcmr/cid4021.cc | 61 +-
dcmsr/libcmr/cid4031.cc | 10 +-
dcmsr/libcmr/cid42.cc | 4 +-
dcmsr/libcmr/cid6147.cc | 4 +-
dcmsr/libcmr/cid7021.cc | 4 +-
dcmsr/libcmr/cid7181.cc | 13 +-
dcmsr/libcmr/cid7445.cc | 4 +-
dcmsr/libcmr/cid7452.cc | 4 +-
dcmsr/libcmr/cid7453.cc | 4 +-
dcmsr/libcmr/cid7464.cc | 4 +-
dcmsr/libcmr/cid7469.cc | 15 +-
dcmsr/libcmr/tid1001.cc | 2 +
dcmsr/libcmr/tid1204.cc | 2 +
dcmsr/libcmr/tid1411.cc | 1 +
dcmsr/libcmr/tid1500.cc | 3 +-
dcmsr/libcmr/tid1600.cc | 12 +-
dcmsr/libsrc/CMakeLists.txt | 2 +-
dcmsr/libsrc/Makefile.dep | 6734 +++++---------------
dcmsr/libsrc/Makefile.in | 16 +-
dcmsr/libsrc/dsrcodtn.cc | 4 +-
dcmsr/libsrc/dsrcodvl.cc | 9 +
dcmsr/libsrc/dsrcomtn.cc | 3 +-
dcmsr/libsrc/dsrcomvl.cc | 4 +
dcmsr/libsrc/dsrcontn.cc | 4 +-
dcmsr/libsrc/dsrcsidl.cc | 41 +-
dcmsr/libsrc/dsrctpl.cc | 3 +
dcmsr/libsrc/dsrdattn.cc | 5 +-
dcmsr/libsrc/dsrdncsr.cc | 155 +
dcmsr/libsrc/dsrdoc.cc | 65 +-
dcmsr/libsrc/dsrdocst.cc | 90 +-
dcmsr/libsrc/dsrdoctn.cc | 9 +-
dcmsr/libsrc/dsrdoctr.cc | 17 +-
dcmsr/libsrc/dsrdtitn.cc | 5 +-
dcmsr/libsrc/dsrimgfr.cc | 3 +
dcmsr/libsrc/dsrimgse.cc | 7 +-
dcmsr/libsrc/dsrimgtn.cc | 4 +-
dcmsr/libsrc/dsrimgvl.cc | 4 +
dcmsr/libsrc/dsrnumvl.cc | 3 +
dcmsr/libsrc/dsrpnmtn.cc | 5 +-
dcmsr/libsrc/dsrposcn.cc | 14 +-
dcmsr/libsrc/dsrrefin.cc | 6 +-
dcmsr/libsrc/dsrreftn.cc | 10 +-
dcmsr/libsrc/dsrrrdcc.cc | 4 +-
dcmsr/libsrc/dsrsc3gr.cc | 4 +
dcmsr/libsrc/dsrsc3vl.cc | 3 +
dcmsr/libsrc/dsrscogr.cc | 4 +
dcmsr/libsrc/dsrscovl.cc | 3 +
dcmsr/libsrc/dsrsoprf.cc | 24 +-
dcmsr/libsrc/dsrtcodt.cc | 3 +
dcmsr/libsrc/dsrtcosp.cc | 3 +
dcmsr/libsrc/dsrtcoto.cc | 5 +-
dcmsr/libsrc/dsrtcovl.cc | 2 +
dcmsr/libsrc/dsrtextn.cc | 5 +-
dcmsr/libsrc/dsrtimtn.cc | 5 +-
dcmsr/libsrc/dsrtypes.cc | 38 +-
dcmsr/libsrc/dsruidtn.cc | 5 +-
dcmsr/libsrc/dsrwavch.cc | 3 +
dcmsr/libsrc/dsrwavtn.cc | 4 +-
dcmsr/libsrc/dsrwavvl.cc | 2 +
dcmsr/tests/Makefile.dep | 710 +--
dcmsr/tests/mkreport.cc | 19 +-
dcmsr/tests/tests.cc | 2 +
dcmsr/tests/tsrcmr.cc | 3 +
dcmsr/tests/tsrcodvl.cc | 4 +
dcmsr/tests/tsrdoc.cc | 27 +
dcmsr/tests/tsrdoctr.cc | 21 +
dcmsr/tests/tsrnumvl.cc | 1 +
dcmsr/tests/tsrtpl.cc | 40 +-
dcmsr/tests/tsrtree.cc | 1 +
dcmtract/CMakeLists.txt | 10 +
dcmtract/Makefile.in | 86 +
dcmtract/configure | 53 +
dcmtract/data/Makefile.in | 23 +
dcmtract/docs/Makefile.in | 23 +
dcmtract/docs/dcmtract.dox | 159 +
dcmtract/etc/Makefile.in | 23 +
dcmtract/include/CMakeLists.txt | 2 +
dcmtract/include/Makefile.in | 27 +
dcmtract/include/dcmtk/dcmtract/trcdef.h | 37 +
dcmtract/include/dcmtk/dcmtract/trcmeasurement.h | 248 +
.../include/dcmtk/dcmtract/trcmodtractresults.h | 174 +
dcmtract/include/dcmtk/dcmtract/trcstatistic.h | 318 +
dcmtract/include/dcmtk/dcmtract/trctrack.h | 201 +
dcmtract/include/dcmtk/dcmtract/trctrackset.h | 468 ++
.../dcmtk/dcmtract/trctractographyresults.h | 302 +
dcmtract/include/dcmtk/dcmtract/trctypes.h | 111 +
dcmtract/libsrc/CMakeLists.txt | 5 +
{dcmseg => dcmtract}/libsrc/Makefile.dep | 476 +-
dcmtract/libsrc/Makefile.in | 56 +
dcmtract/libsrc/trcmeasurement.cc | 345 +
dcmtract/libsrc/trcmodtractresults.cc | 294 +
dcmtract/libsrc/trcstatistic.cc | 349 +
dcmtract/libsrc/trctrack.cc | 326 +
dcmtract/libsrc/trctrackset.cc | 676 ++
dcmtract/libsrc/trctractographyresults.cc | 367 ++
dcmtract/libsrc/trctypes.cc | 34 +
dcmtract/tests/Makefile.dep | 0
dcmtract/tests/Makefile.in | 29 +
docs/CHANGES.361 | 1208 ++++
doxygen/htmldocs.cfg | 2 +-
doxygen/htmldocs.dox | 1 +
doxygen/manpages.cfg | 2 +-
doxygen/manpages/man1/dcm2pdf.1 | 2 +-
doxygen/manpages/man1/dcm2pnm.1 | 2 +-
doxygen/manpages/man1/dcm2xml.1 | 2 +-
doxygen/manpages/man1/dcmcjpeg.1 | 12 +-
doxygen/manpages/man1/dcmcjpls.1 | 6 +-
doxygen/manpages/man1/dcmconv.1 | 2 +-
doxygen/manpages/man1/dcmcrle.1 | 2 +-
doxygen/manpages/man1/dcmdjpeg.1 | 2 +-
doxygen/manpages/man1/dcmdjpls.1 | 2 +-
doxygen/manpages/man1/dcmdrle.1 | 2 +-
doxygen/manpages/man1/dcmdspfn.1 | 2 +-
doxygen/manpages/man1/dcmdump.1 | 2 +-
doxygen/manpages/man1/dcmftest.1 | 2 +-
doxygen/manpages/man1/dcmgpdir.1 | 6 +-
doxygen/manpages/man1/dcmj2pnm.1 | 2 +-
doxygen/manpages/man1/dcml2pnm.1 | 2 +-
doxygen/manpages/man1/dcmmkcrv.1 | 2 +-
doxygen/manpages/man1/dcmmkdir.1 | 2 +-
doxygen/manpages/man1/dcmmklut.1 | 2 +-
doxygen/manpages/man1/dcmodify.1 | 2 +-
doxygen/manpages/man1/dcmp2pgm.1 | 2 +-
doxygen/manpages/man1/dcmprscp.1 | 2 +-
doxygen/manpages/man1/dcmprscu.1 | 2 +-
doxygen/manpages/man1/dcmpschk.1 | 2 +-
doxygen/manpages/man1/dcmpsmk.1 | 2 +-
doxygen/manpages/man1/dcmpsprt.1 | 2 +-
doxygen/manpages/man1/dcmpsrcv.1 | 2 +-
doxygen/manpages/man1/dcmpssnd.1 | 2 +-
doxygen/manpages/man1/dcmqridx.1 | 2 +-
doxygen/manpages/man1/dcmqrscp.1 | 6 +-
doxygen/manpages/man1/dcmqrti.1 | 2 +-
doxygen/manpages/man1/dcmquant.1 | 2 +-
doxygen/manpages/man1/dcmrecv.1 | 2 +-
doxygen/manpages/man1/dcmscale.1 | 2 +-
doxygen/manpages/man1/dcmsend.1 | 2 +-
doxygen/manpages/man1/dcmsign.1 | 2 +-
doxygen/manpages/man1/dcod2lum.1 | 2 +-
doxygen/manpages/man1/dconvlum.1 | 2 +-
doxygen/manpages/man1/drtdump.1 | 2 +-
doxygen/manpages/man1/dsr2html.1 | 2 +-
doxygen/manpages/man1/dsr2xml.1 | 2 +-
doxygen/manpages/man1/dsrdump.1 | 2 +-
doxygen/manpages/man1/dump2dcm.1 | 2 +-
doxygen/manpages/man1/echoscu.1 | 2 +-
doxygen/manpages/man1/findscu.1 | 2 +-
doxygen/manpages/man1/getscu.1 | 2 +-
doxygen/manpages/man1/img2dcm.1 | 8 +-
doxygen/manpages/man1/movescu.1 | 26 +-
doxygen/manpages/man1/pdf2dcm.1 | 2 +-
doxygen/manpages/man1/storescp.1 | 6 +-
doxygen/manpages/man1/storescu.1 | 2 +-
doxygen/manpages/man1/termscu.1 | 2 +-
doxygen/manpages/man1/wlmscpfs.1 | 2 +-
doxygen/manpages/man1/xml2dcm.1 | 2 +-
doxygen/manpages/man1/xml2dsr.1 | 2 +-
oflog/libsrc/timehelp.cc | 30 +-
ofstd/include/dcmtk/ofstd/ofbmanip.h | 22 +-
ofstd/include/dcmtk/ofstd/oflimits.h | 52 +-
ofstd/include/dcmtk/ofstd/ofstd.h | 2 +-
ofstd/include/dcmtk/ofstd/ofvector.h | 6 +-
ofstd/libsrc/Makefile.dep | 9 +-
ofstd/libsrc/ofmath.cc | 108 +-
ofstd/libsrc/ofstd.cc | 42 +-
ofstd/tests/Makefile.dep | 11 -
ofstd/tests/taddsub.cc | 63 -
ofstd/tests/tofstd.cc | 11 +-
438 files changed, 16066 insertions(+), 11304 deletions(-)
diff --git a/CMake/GenerateDCMTKConfigure.cmake b/CMake/GenerateDCMTKConfigure.cmake
index f8543a4..c936b4d 100644
--- a/CMake/GenerateDCMTKConfigure.cmake
+++ b/CMake/GenerateDCMTKConfigure.cmake
@@ -325,11 +325,6 @@ ENDIF(WIN32 AND NOT CYGWIN)
CHECK_FUNCTION_EXISTS(tmpnam HAVE_TMPNAM)
CHECK_FUNCTION_EXISTS(uname HAVE_UNAME)
CHECK_FUNCTION_EXISTS(usleep HAVE_USLEEP)
- CHECK_FUNCTION_EXISTS(_vsnprintf_s HAVE__VSNPRINTF_S)
- CHECK_FUNCTION_EXISTS(vfprintf_s HAVE_VFPRINTF_S)
- CHECK_FUNCTION_EXISTS(vprintf HAVE_VPRINTF)
- CHECK_FUNCTION_EXISTS(vsnprintf HAVE_VSNPRINTF)
- CHECK_FUNCTION_EXISTS(vsprintf_s HAVE_VSPRINTF_S)
CHECK_FUNCTION_EXISTS(wait3 HAVE_WAIT3)
CHECK_FUNCTION_EXISTS(waitpid HAVE_WAITPID)
CHECK_FUNCTION_EXISTS(_findfirst HAVE__FINDFIRST)
@@ -485,6 +480,11 @@ ENDIF(WIN32 AND NOT CYGWIN)
CHECK_FUNCTIONWITHHEADER_EXISTS(setsockopt "${HEADERS}" HAVE_PROTOTYPE_SETSOCKOPT)
CHECK_FUNCTIONWITHHEADER_EXISTS(socket "${HEADERS}" HAVE_PROTOTYPE_SOCKET)
CHECK_FUNCTIONWITHHEADER_EXISTS(listen "${HEADERS}" HAVE_PROTOTYPE_LISTEN)
+ CHECK_FUNCTIONWITHHEADER_EXISTS(_vsnprintf_s "${HEADERS}" HAVE__VSNPRINTF_S)
+ CHECK_FUNCTIONWITHHEADER_EXISTS(vfprintf_s "${HEADERS}" HAVE_VFPRINTF_S)
+ CHECK_FUNCTIONWITHHEADER_EXISTS(vprintf "${HEADERS}" HAVE_VPRINTF)
+ CHECK_FUNCTIONWITHHEADER_EXISTS(vsnprintf "${HEADERS}" HAVE_VSNPRINTF)
+ CHECK_FUNCTIONWITHHEADER_EXISTS(vsprintf_s "${HEADERS}" HAVE_VSPRINTF_S)
CHECK_FUNCTIONWITHHEADER_EXISTS(std::vfprintf "${CXXHEADERS}" HAVE_PROTOTYPE_STD__VFPRINTF)
CHECK_FUNCTIONWITHHEADER_EXISTS(std::vsnprintf "${CXXHEADERS}" HAVE_PROTOTYPE_STD__VSNPRINTF)
CHECK_FUNCTIONWITHHEADER_EXISTS(_stricmp "${HEADERS}" HAVE_PROTOTYPE__STRICMP)
@@ -820,38 +820,40 @@ int main()
# Compile config/arith.cc and generate config/arith.h
FUNCTION(INSPECT_FUNDAMENTAL_ARITHMETIC_TYPES)
SET(ARITH_H_FILE ${DCMTK_BINARY_DIR}/config/include/dcmtk/config/arith.h)
- IF(CMAKE_CROSSCOMPILING)
- IF(WIN32)
- UNIX_TO_WINE_PATH(ARITH_H_FILE ${ARITH_H_FILE})
- STRING(REPLACE "\\" "\\\\" ARITH_H_FILE ${ARITH_H_FILE})
- ELSEIF(ANDROID)
- SET(ARITH_H_DESTINATION ${ARITH_H_FILE})
- SET(ARITH_H_FILE "${ANDROID_TEMPORARY_FILES_LOCATION}/arith.h")
- ENDIF()
- ENDIF(CMAKE_CROSSCOMPILING)
- DCMTK_TRY_RUN(
- RESULT COMPILED
- ${DCMTK_BINARY_DIR}/CMakeTmp/Arith
- ${DCMTK_SOURCE_DIR}/config/arith.cc
- COMPILE_DEFINITIONS -I"${DCMTK_BINARY_DIR}/config/include" -I"${DCMTK_SOURCE_DIR}/ofstd/include" -I"${DCMTK_SOURCE_DIR}/ofstd/libsrc"
- RUN_OUTPUT_VARIABLE OUTPUT
- COMPILE_OUTPUT_VARIABLE CERR
- ARGS \"${ARITH_H_FILE}\"
- )
- IF(COMPILED)
- IF(NOT RESULT)
- MESSAGE(STATUS "${OUTPUT}")
- IF(CMAKE_CROSSCOMPILING)
- IF(ANDROID)
- DCMTK_ANDROID_PULL(DCMTK_ANDROID_EMULATOR_INSTANCE ${ARITH_H_FILE} DESTINATION ${ARITH_H_DESTINATION})
- ENDIF()
- ENDIF(CMAKE_CROSSCOMPILING)
- ELSE(NOT RESULT)
- MESSAGE(FATAL_ERROR "${OUTPUT}")
- ENDIF(NOT RESULT)
- ELSE(COMPILED)
- MESSAGE(FATAL_ERROR "${CERR}")
- ENDIF(COMPILED)
+ IF(NOT EXISTS "${ARITH_H_FILE}")
+ IF(CMAKE_CROSSCOMPILING)
+ IF(WIN32)
+ UNIX_TO_WINE_PATH(ARITH_H_FILE ${ARITH_H_FILE})
+ STRING(REPLACE "\\" "\\\\" ARITH_H_FILE ${ARITH_H_FILE})
+ ELSEIF(ANDROID)
+ SET(ARITH_H_DESTINATION ${ARITH_H_FILE})
+ SET(ARITH_H_FILE "${ANDROID_TEMPORARY_FILES_LOCATION}/arith.h")
+ ENDIF()
+ ENDIF(CMAKE_CROSSCOMPILING)
+ DCMTK_TRY_RUN(
+ RESULT COMPILED
+ ${DCMTK_BINARY_DIR}/CMakeTmp/Arith
+ ${DCMTK_SOURCE_DIR}/config/arith.cc
+ COMPILE_DEFINITIONS -I"${DCMTK_BINARY_DIR}/config/include" -I"${DCMTK_SOURCE_DIR}/ofstd/include" -I"${DCMTK_SOURCE_DIR}/ofstd/libsrc"
+ RUN_OUTPUT_VARIABLE OUTPUT
+ COMPILE_OUTPUT_VARIABLE CERR
+ ARGS \"${ARITH_H_FILE}\"
+ )
+ IF(COMPILED)
+ IF(NOT RESULT)
+ MESSAGE(STATUS "${OUTPUT}")
+ IF(CMAKE_CROSSCOMPILING)
+ IF(ANDROID)
+ DCMTK_ANDROID_PULL(DCMTK_ANDROID_EMULATOR_INSTANCE ${ARITH_H_FILE} DESTINATION ${ARITH_H_DESTINATION})
+ ENDIF()
+ ENDIF(CMAKE_CROSSCOMPILING)
+ ELSE(NOT RESULT)
+ MESSAGE(FATAL_ERROR "${OUTPUT}")
+ ENDIF(NOT RESULT)
+ ELSE(COMPILED)
+ MESSAGE(FATAL_ERROR "${CERR}")
+ ENDIF(COMPILED)
+ ENDIF() # file exists
ENDFUNCTION(INSPECT_FUNDAMENTAL_ARITHMETIC_TYPES)
IF(CMAKE_CROSSCOMPILING)
diff --git a/CMake/dcmtkPrepare.cmake b/CMake/dcmtkPrepare.cmake
index 2ddd7b2..e66ac8a 100644
--- a/CMake/dcmtkPrepare.cmake
+++ b/CMake/dcmtkPrepare.cmake
@@ -9,9 +9,9 @@ SET(DCMTK_CONFIGURATION_DONE true)
# Minimum CMake version required
CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
-IF(CMAKE_BACKWARDS_COMPATIBILITY GREATER 3.3.2)
- SET(CMAKE_BACKWARDS_COMPATIBILITY 3.3.2 CACHE STRING "Latest version of CMake when this project was released." FORCE)
-ENDIF(CMAKE_BACKWARDS_COMPATIBILITY GREATER 3.3.2)
+IF(CMAKE_BACKWARDS_COMPATIBILITY GREATER 3.5.2)
+ SET(CMAKE_BACKWARDS_COMPATIBILITY 3.5.2 CACHE STRING "Latest version of CMake when this project was released." FORCE)
+ENDIF(CMAKE_BACKWARDS_COMPATIBILITY GREATER 3.5.2)
# CMAKE_BUILD_TYPE is set to value "Release" if none is specified by the
# selected build file generator. For those generators that support multiple
@@ -42,7 +42,7 @@ SET(DCMTK_MINOR_VERSION 6)
SET(DCMTK_BUILD_VERSION 1)
# The ABI is not guaranteed to be stable between different snapshots/releases,
# so this particular version number is increased for each snapshot or release.
-SET(DCMTK_ABI_VERSION 8)
+SET(DCMTK_ABI_VERSION 9)
# Package "release" settings (some are currently unused and, therefore, disabled)
SET(DCMTK_PACKAGE_NAME "dcmtk")
@@ -212,7 +212,7 @@ IF(COMMAND CMAKE_POLICY)
ENDIF(COMMAND CMAKE_POLICY)
# pass optional build date to compiler
-ADD_DEFINITIONS(-DDCMTK_BUILD_DATE=\\\"2016-02-16\\\")
+ADD_DEFINITIONS(-DDCMTK_BUILD_DATE=\\\"2016-06-30\\\")
# make OFString(NULL) safe by default
ADD_DEFINITIONS(-DUSE_NULL_SAFE_OFSTRING)
@@ -318,9 +318,13 @@ IF(WIN32) # special handling for Windows systems
# Avoid auto-importing warnings on MinGW
SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--enable-auto-import")
ELSE(MINGW)
- # On Visual Studio 8 MS deprecated C. This removes all 1.276E1265 security warnings.
IF(NOT BORLAND)
IF(NOT CYGWIN)
+ # Disable min() and max() macros pre-defined by Microsoft. We define our own
+ # version in oflimits.h and on Windows that could result in name clashes in
+ # Visual Studio.
+ ADD_DEFINITIONS(-DNOMINMAX)
+ # On Visual Studio 8 MS deprecated C. This removes all 1.276E1265 security warnings.
IF(NOT DCMTK_ENABLE_VISUAL_STUDIO_DEPRECATED_C_WARNINGS)
ADD_DEFINITIONS(
-D_CRT_FAR_MAPPINGS_NO_DEPRECATE
diff --git a/CMake/osconfig.h.in b/CMake/osconfig.h.in
index a68bd74..2b6325d 100644
--- a/CMake/osconfig.h.in
+++ b/CMake/osconfig.h.in
@@ -1024,11 +1024,6 @@ typedef unsigned long ulong;
#pragma warning( disable : 4996 ) /* disable warnings about "deprecated" C runtime functions */
#pragma warning( disable : 4351 ) /* disable warnings about "new behavior" when initializing the elements of an array */
#endif /* _MSC_VER >= 1400 */
-/* Disable min() and max() macros pre-defined by Microsoft. We define our own
- * version in oflimits.h and on Windows that could result in name clashes in
- * Visual Studio.
- */
-#define NOMINMAX
#endif /* _MSC_VER */
/* Define if your system defines ios::nocreate in iostream.h */
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3a4c596..e79ed77 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,7 +15,7 @@ INCLUDE(CMake/dcmtkPrepare.cmake NO_POLICY_SCOPE)
SET(DCMTK_MODULES ofstd oflog dcmdata dcmimgle
dcmimage dcmjpeg dcmjpls dcmtls dcmnet dcmsr
- dcmsign dcmwlm dcmqrdb dcmpstat dcmrt dcmiod dcmfg dcmseg
+ dcmsign dcmwlm dcmqrdb dcmpstat dcmrt dcmiod dcmfg dcmseg dcmtract
CACHE STRING "List of modules that should be built.")
#-----------------------------------------------------------------------------
diff --git a/CREDITS b/CREDITS
index 906d7ee..c67e7c0 100644
--- a/CREDITS
+++ b/CREDITS
@@ -37,6 +37,14 @@ QIICR: The work on various DCMTK modules was supported in part by funding from
Cancer Research (ITCR) initiative to the Quantitative Image Informatics for
Cancer Research (QIICR) project, award U24 CA180918.
+SlicerDMRI: The work on DCMTK Tractography modules was supported in part by
+ funding from the National Institutes of Health National Institute of
+ Biomedical Imaging and Bioengineering (NIBIB), to project Neuroimage Analysis
+ Center, award P41 EB015902; and the National Institutes of Health National
+ Cancer Institute (NCI) Informatics Technology for Cancer Research (ITCR)
+ initiative, to project Open Source Diffusion MRI Technology For Brain Cancer
+ Research, award U01 CA199459.
+
VISUS: The work on various extensions of the DCMTK was supported in part by
funding from the VISUS Technology Transfer GmbH (Bochum, Germany).
@@ -47,4 +55,4 @@ YXLON: The work on the initial version of the DICONDE data dictionary was
Please note that this list does not claim to be exhaustive. Just send us an
email if you think that you or your company/organization should also be listed.
-DCMTK Team, 2015-09-12
+DCMTK Team, 2016-06-08
diff --git a/Makefile b/Makefile
index 2f19180..83aaaf4 100644
--- a/Makefile
+++ b/Makefile
@@ -9,39 +9,39 @@ include $(configdir)/Makefile.def
.NOTPARALLEL:
-all: config-all ofstd-all oflog-all dcmdata-all dcmiod-all dcmfg-all dcmseg-all dcmimgle-all dcmimage-all dcmjpeg-all dcmjpls-all dcmtls-all dcmnet-all dcmsr-all dcmsign-all dcmwlm-all dcmqrdb-all dcmpstat-all dcmrt-all
+all: config-all ofstd-all oflog-all dcmdata-all dcmiod-all dcmfg-all dcmseg-all dcmimgle-all dcmimage-all dcmjpeg-all dcmjpls-all dcmtls-all dcmnet-all dcmsr-all dcmsign-all dcmwlm-all dcmqrdb-all dcmpstat-all dcmrt-all dcmtract-all
-libsrc-all: ofstd-libsrc-all oflog-libsrc-all dcmdata-libsrc-all dcmiod-libsrc-all dcmfg-libsrc-all dcmseg-libsrc-all dcmimgle-libsrc-all dcmimage-libsrc-all dcmjpeg-libsrc-all dcmjpls-libsrc-all dcmtls-libsrc-all dcmnet-libsrc-all dcmsr-libsrc-all dcmsign-libsrc-all dcmwlm-libsrc-all dcmqrdb-libsrc-all dcmpstat-libsrc-all dcmrt-libsrc-all
+libsrc-all: ofstd-libsrc-all oflog-libsrc-all dcmdata-libsrc-all dcmiod-libsrc-all dcmfg-libsrc-all dcmseg-libsrc-all dcmimgle-libsrc-all dcmimage-libsrc-all dcmjpeg-libsrc-all dcmjpls-libsrc-all dcmtls-libsrc-all dcmnet-libsrc-all dcmsr-libsrc-all dcmsign-libsrc-all dcmwlm-libsrc-all dcmqrdb-libsrc-all dcmpstat-libsrc-all dcmrt-libsrc-all dcmtract-libsrc-all
-tests-all: config-tests-all ofstd-tests-all oflog-tests-all dcmdata-tests-all dcmiod-tests-all dcmfg-tests-all dcmseg-tests-all dcmimgle-tests-all dcmimage-tests-all dcmjpeg-tests-all dcmjpls-tests-all dcmtls-tests-all dcmnet-tests-all dcmsr-tests-all dcmsign-tests-all dcmwlm-tests-all dcmqrdb-tests-all dcmpstat-tests-all dcmrt-tests-all
+tests-all: config-tests-all ofstd-tests-all oflog-tests-all dcmdata-tests-all dcmiod-tests-all dcmfg-tests-all dcmseg-tests-all dcmimgle-tests-all dcmimage-tests-all dcmjpeg-tests-all dcmjpls-tests-all dcmtls-tests-all dcmnet-tests-all dcmsr-tests-all dcmsign-tests-all dcmwlm-tests-all dcmqrdb-tests-all dcmpstat-tests-all dcmrt-tests-all dcmtract-tests-all
-install: config-install ofstd-install oflog-install dcmdata-install dcmiod-install dcmfg-install dcmseg-install dcmimgle-install dcmimage-install dcmjpeg-install dcmjpls-install dcmtls-install dcmnet-install dcmsr-install dcmsign-install dcmwlm-install dcmqrdb-install dcmpstat-install dcmrt-install dcmtk-install-doc install-man
+install: config-install ofstd-install oflog-install dcmdata-install dcmiod-install dcmfg-install dcmseg-install dcmimgle-install dcmimage-install dcmjpeg-install dcmjpls-install dcmtls-install dcmnet-install dcmsr-install dcmsign-install dcmwlm-install dcmqrdb-install dcmpstat-install dcmrt-install dcmtract-install dcmtk-install-doc install-man
install-all: install install-lib install-html
-install-bin: config-install-bin ofstd-install-bin oflog-install-bin dcmdata-install-bin dcmiod-install-bin dcmfg-install-bin dcmseg-install-bin dcmimgle-install-bin dcmimage-install-bin dcmjpeg-install-bin dcmjpls-install-bin dcmtls-install-bin dcmnet-install-bin dcmsr-install-bin dcmsign-install-bin dcmwlm-install-bin dcmqrdb-install-bin dcmpstat-install-bin dcmrt-install-bin
+install-bin: config-install-bin ofstd-install-bin oflog-install-bin dcmdata-install-bin dcmiod-install-bin dcmfg-install-bin dcmseg-install-bin dcmimgle-install-bin dcmimage-install-bin dcmjpeg-install-bin dcmjpls-install-bin dcmtls-install-bin dcmnet-install-bin dcmsr-install-bin dcmsign-install-bin dcmwlm-install-bin dcmqrdb-install-bin dcmpstat-install-bin dcmrt-install-bin dcmtract-install-bin
-install-doc: config-install-doc ofstd-install-doc oflog-install-doc dcmdata-install-doc dcmiod-install-doc dcmfg-install-doc dcmseg-install-doc dcmimgle-install-doc dcmimage-install-doc dcmjpeg-install-doc dcmjpls-install-doc dcmtls-install-doc dcmnet-install-doc dcmsr-install-doc dcmsign-install-doc dcmwlm-install-doc dcmqrdb-install-doc dcmpstat-install-doc dcmrt-install-doc
+install-doc: config-install-doc ofstd-install-doc oflog-install-doc dcmdata-install-doc dcmiod-install-doc dcmfg-install-doc dcmseg-install-doc dcmimgle-install-doc dcmimage-install-doc dcmjpeg-install-doc dcmjpls-install-doc dcmtls-install-doc dcmnet-install-doc dcmsr-install-doc dcmsign-install-doc dcmwlm-install-doc dcmqrdb-install-doc dcmpstat-install-doc dcmrt-install-doc dcmtract-install-doc
-install-data: config-install-data ofstd-install-data oflog-install-data dcmdata-install-data dcmiod-install-data dcmfg-install-data dcmseg-install-data dcmimgle-install-data dcmimage-install-data dcmjpeg-install-data dcmjpls-install-data dcmtls-install-data dcmnet-install-data dcmsr-install-data dcmsign-install-data dcmwlm-install-data dcmqrdb-install-data dcmpstat-install-data dcmrt-install-data
+install-data: config-install-data ofstd-install-data oflog-install-data dcmdata-install-data dcmiod-install-data dcmfg-install-data dcmseg-install-data dcmimgle-install-data dcmimage-install-data dcmjpeg-install-data dcmjpls-install-data dcmtls-install-data dcmnet-install-data dcmsr-install-data dcmsign-install-data dcmwlm-install-data dcmqrdb-install-data dcmpstat-install-data dcmrt-install-data dcmtract-install-data
-install-etc: config-install-etc ofstd-install-etc oflog-install-etc dcmdata-install-etc dcmiod-install-etc dcmfg-install-etc dcmseg-install-etc dcmimgle-install-etc dcmimage-install-etc dcmjpeg-install-etc dcmjpls-install-etc dcmtls-install-etc dcmnet-install-etc dcmsr-install-etc dcmsign-install-etc dcmwlm-install-etc dcmqrdb-install-etc dcmpstat-install-etc dcmrt-install-etc
+install-etc: config-install-etc ofstd-install-etc oflog-install-etc dcmdata-install-etc dcmiod-install-etc dcmfg-install-etc dcmseg-install-etc dcmimgle-install-etc dcmimage-install-etc dcmjpeg-install-etc dcmjpls-install-etc dcmtls-install-etc dcmnet-install-etc dcmsr-install-etc dcmsign-install-etc dcmwlm-install-etc dcmqrdb-install-etc dcmpstat-install-etc dcmrt-install-etc dcmtract-install-etc
-install-lib: config-install-lib ofstd-install-lib oflog-install-lib dcmdata-install-lib dcmiod-install-lib dcmfg-install-lib dcmseg-install-lib dcmimgle-install-lib dcmimage-install-lib dcmjpeg-install-lib dcmjpls-install-lib dcmtls-install-lib dcmnet-install-lib dcmsr-install-lib dcmsign-install-lib dcmwlm-install-lib dcmqrdb-install-lib dcmpstat-install-lib dcmrt-install-lib
+install-lib: config-install-lib ofstd-install-lib oflog-install-lib dcmdata-install-lib dcmiod-install-lib dcmfg-install-lib dcmseg-install-lib dcmimgle-install-lib dcmimage-install-lib dcmjpeg-install-lib dcmjpls-install-lib dcmtls-install-lib dcmnet-install-lib dcmsr-install-lib dcmsign-install-lib dcmwlm-install-lib dcmqrdb-install-lib dcmpstat-install-lib dcmrt-install-lib dcmtract-install-lib
-install-include: config-install-include ofstd-install-include oflog-install-include dcmdata-install-include dcmiod-install-include dcmfg-install-include dcmseg-install-include dcmimgle-install-include dcmimage-install-include dcmjpeg-install-include dcmjpls-install-include dcmtls-install-include dcmnet-install-include dcmsr-install-include dcmsign-install-include dcmwlm-install-include dcmqrdb-install-include dcmpstat-install-include dcmrt-install-include
+install-include: config-install-include ofstd-install-include oflog-install-include dcmdata-install-include dcmiod-install-include dcmfg-install-include dcmseg-install-include dcmimgle-install-include dcmimage-install-include dcmjpeg-install-include dcmjpls-install-include dcmtls-install-include dcmnet-install-include dcmsr-install-include dcmsign-install-include dcmwlm-install-include dcmqrdb-install-include dcmpstat-install-include dcmrt-install-include dcmtract-install-include
-install-support: config-install-support ofstd-install-support oflog-install-support dcmdata-install-support dcmiod-install-support dcmfg-install-support dcmseg-install-support dcmimgle-install-support dcmimage-install-support dcmjpeg-install-support dcmjpls-install-support dcmtls-install-support dcmnet-install-support dcmsr-install-support dcmsign-install-support dcmwlm-install-support dcmqrdb-install-support dcmpstat-install-support dcmrt-install-support
+install-support: config-install-support ofstd-install-support oflog-install-support dcmdata-install-support dcmiod-install-support dcmfg-install-support dcmseg-install-support dcmimgle-install-support dcmimage-install-support dcmjpeg-install-support dcmjpls-install-support dcmtls-install-support dcmnet-install-support dcmsr-install-support dcmsign-install-support dcmwlm-install-support dcmqrdb-install-support dcmpstat-install-support dcmrt-install-support dcmtract-install-support
check: tests-all
$(MAKE) -s check-nosilent
-check-nosilent: config-check ofstd-check oflog-check dcmdata-check dcmiod-check dcmfg-check dcmseg-check dcmimgle-check dcmimage-check dcmjpeg-check dcmjpls-check dcmtls-check dcmnet-check dcmsr-check dcmsign-check dcmwlm-check dcmqrdb-check dcmpstat-check dcmrt-check
+check-nosilent: config-check ofstd-check oflog-check dcmdata-check dcmiod-check dcmfg-check dcmseg-check dcmimgle-check dcmimage-check dcmjpeg-check dcmjpls-check dcmtls-check dcmnet-check dcmsr-check dcmsign-check dcmwlm-check dcmqrdb-check dcmpstat-check dcmrt-check dcmtract-check
check-exhaustive: tests-all
$(MAKE) -s check-nosilent-exhaustive
-check-nosilent-exhaustive: config-check-exhaustive ofstd-check-exhaustive oflog-check-exhaustive dcmdata-check-exhaustive dcmiod-check-exhaustive dcmfg-check-exhaustive dcmseg-check-exhaustive dcmimgle-check-exhaustive dcmimage-check-exhaustive dcmjpeg-check-exhaustive dcmjpls-check-exhaustive dcmtls-check-exhaustive dcmnet-check-exhaustive dcmsr-check-exhaustive dcmsign-check-exhaustive dcmwlm-check-exhaustive dcmqrdb-check-exhaustive dcmpstat-check-exhaustive dcmrt-check-exhaustive
+check-nosilent-exhaustive: config-check-exhaustive ofstd-check-exhaustive oflog-check-exhaustive dcmdata-check-exhaustive dcmiod-check-exhaustive dcmfg-check-exhaustive dcmseg-check-exhaustive dcmimgle-check-exhaustive dcmimage-check-exhaustive dcmjpeg-check-exhaustive dcmjpls-check-exhaustive dcmtls-check-exhaustive dcmnet-check-exhaustive dcmsr-check-exhaustive dcmsign-check-exhaustive dcmwlm-check-exhaustive dcmqrdb-check-exhaustive dcmpstat-check-exhaustive dcmrt-check-exhaustive dc [...]
dcmtk-install-doc:
$(configdir)/mkinstalldirs $(DESTDIR)$(docdir)
@@ -91,7 +91,7 @@ help:
@echo ""
@echo "The following modules are available:"
@echo ""
- @echo "ofstd oflog dcmdata dcmiod dcmfg dcmseg dcmimgle dcmimage dcmjpeg dcmjpls dcmtls dcmnet dcmsr dcmsign dcmwlm dcmqrdb dcmpstat dcmrt"
+ @echo "ofstd oflog dcmdata dcmiod dcmfg dcmseg dcmimgle dcmimage dcmjpeg dcmjpls dcmtls dcmnet dcmsr dcmsign dcmwlm dcmqrdb dcmpstat dcmrt dcmtract"
config-all:
(cd config && $(MAKE) ARCH="$(ARCH)" DESTDIR="$(DESTDIR)" all)
@@ -834,6 +834,45 @@ dcmrt-check:
dcmrt-check-exhaustive:
(cd dcmrt && $(MAKE) ARCH="$(ARCH)" DESTDIR="$(DESTDIR)" check-exhaustive)
+dcmtract-all:
+ (cd dcmtract && $(MAKE) ARCH="$(ARCH)" DESTDIR="$(DESTDIR)" all)
+
+dcmtract-libsrc-all:
+ (cd dcmtract && $(MAKE) ARCH="$(ARCH)" DESTDIR="$(DESTDIR)" libsrc-all)
+
+dcmtract-tests-all:
+ (cd dcmtract && $(MAKE) ARCH="$(ARCH)" DESTDIR="$(DESTDIR)" tests-all)
+
+dcmtract-install:
+ (cd dcmtract && $(MAKE) ARCH="$(ARCH)" DESTDIR="$(DESTDIR)" install)
+
+dcmtract-install-bin:
+ (cd dcmtract && $(MAKE) ARCH="$(ARCH)" DESTDIR="$(DESTDIR)" install-bin)
+
+dcmtract-install-doc:
+ (cd dcmtract && $(MAKE) ARCH="$(ARCH)" DESTDIR="$(DESTDIR)" install-doc)
+
+dcmtract-install-data:
+ (cd dcmtract && $(MAKE) ARCH="$(ARCH)" DESTDIR="$(DESTDIR)" install-data)
+
+dcmtract-install-etc:
+ (cd dcmtract && $(MAKE) ARCH="$(ARCH)" DESTDIR="$(DESTDIR)" install-etc)
+
+dcmtract-install-lib:
+ (cd dcmtract && $(MAKE) ARCH="$(ARCH)" DESTDIR="$(DESTDIR)" install-lib)
+
+dcmtract-install-include:
+ (cd dcmtract && $(MAKE) ARCH="$(ARCH)" DESTDIR="$(DESTDIR)" install-include)
+
+dcmtract-install-support:
+ (cd dcmtract && $(MAKE) ARCH="$(ARCH)" DESTDIR="$(DESTDIR)" install-support)
+
+dcmtract-check:
+ (cd dcmtract && $(MAKE) ARCH="$(ARCH)" DESTDIR="$(DESTDIR)" check)
+
+dcmtract-check-exhaustive:
+ (cd dcmtract && $(MAKE) ARCH="$(ARCH)" DESTDIR="$(DESTDIR)" check-exhaustive)
+
dependencies:
-(cd config && $(MAKE) dependencies)
(cd ofstd && $(MAKE) dependencies)
@@ -854,6 +893,7 @@ dependencies:
(cd dcmqrdb && $(MAKE) dependencies)
(cd dcmpstat && $(MAKE) dependencies)
(cd dcmrt && $(MAKE) dependencies)
+ (cd dcmtract && $(MAKE) dependencies)
clean:
(cd ofstd && $(MAKE) clean)
@@ -874,6 +914,7 @@ clean:
(cd dcmqrdb && $(MAKE) clean)
(cd dcmpstat && $(MAKE) clean)
(cd dcmrt && $(MAKE) clean)
+ (cd dcmtract && $(MAKE) clean)
(cd doxygen && $(MAKE) clean)
-(cd config && $(MAKE) clean)
rm -f $(TRASH)
@@ -897,6 +938,7 @@ distclean:
(cd dcmqrdb && $(MAKE) distclean)
(cd dcmpstat && $(MAKE) distclean)
(cd dcmrt && $(MAKE) distclean)
+ (cd dcmtract && $(MAKE) distclean)
(cd doxygen && $(MAKE) distclean)
-(cd config && $(MAKE) distclean)
rm -f $(TRASH)
diff --git a/VERSION b/VERSION
index 1413f36..b0cf8e9 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.6.1_20160216
+3.6.1_20160630
diff --git a/config/Makefile.def.in b/config/Makefile.def.in
index a60168c..cbec746 100644
--- a/config/Makefile.def.in
+++ b/config/Makefile.def.in
@@ -52,7 +52,7 @@ DEBUG = @DEBUG@
#
# We want the old behavior of OFString(NULL) for now, no crashes.
-GLOBALDEFS = @DEFS@ -DDCMTK_BUILD_DATE=\"2016-02-16\" -DUSE_NULL_SAFE_OFSTRING -DDCMTK_BUILD_IN_PROGRESS
+GLOBALDEFS = @DEFS@ -DDCMTK_BUILD_DATE=\"2016-06-30\" -DUSE_NULL_SAFE_OFSTRING -DDCMTK_BUILD_IN_PROGRESS
#
# ARCH defines special machine archtecture compiler settings
diff --git a/config/arith.cc b/config/arith.cc
index 948766d..17eded5 100644
--- a/config/arith.cc
+++ b/config/arith.cc
@@ -27,7 +27,7 @@
#define INCLUDE_CMATH
#define INCLUDE_CSETJMP
#define INCLUDE_CSIGNAL
-#include "ofmath.cc"
+#include "math.cc"
#ifdef HAVE_FENV_H
// For controlling floating point exceptions on Unix like systems.
@@ -207,7 +207,7 @@ static int test_inf( STD_NAMESPACE ostream& out, const char* name )
const int has_inf = print_flag
(
out,
- OFMath::isinf(t),
+ dcmtk_config_math::isinf(t),
"HAS_INFINITY",
name,
7
@@ -236,7 +236,7 @@ static int test_qnan( STD_NAMESPACE ostream& out, const char* name )
const int has_qnan = print_flag
(
out,
- OFMath::isnan( t ),
+ dcmtk_config_math::isnan( t ),
"HAS_QUIET_NAN",
name,
7
@@ -336,7 +336,7 @@ static int test_snan( STD_NAMESPACE ostream& out, const char* name )
{
// Create signaling NaNs and test if they really are signaling NaNs
const T& t = guess<T>::snan();
- int flag = OFMath::isnan( t ) && test_trap( &provoke_snan<T> );
+ int flag = dcmtk_config_math::isnan( t ) && test_trap( &provoke_snan<T> );
// Disable floating point exceptions that have been enabled for the test,
// Windows and Unix version.
#ifdef HAVE_WINDOWS_H
diff --git a/ofstd/libsrc/ofmath.cc b/config/math.cc
similarity index 69%
copy from ofstd/libsrc/ofmath.cc
copy to config/math.cc
index 90c9e61..bdfca25 100644
--- a/ofstd/libsrc/ofmath.cc
+++ b/config/math.cc
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2015, OFFIS e.V.
+ * Copyright (C) 2015-2016, OFFIS e.V.
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation were developed by
@@ -27,7 +27,7 @@
#define INCLUDE_CFLOAT
#define INCLUDE_IOSTREAM
#include "dcmtk/ofstd/ofstdinc.h"
-#include "dcmtk/ofstd/ofmath.h"
+#include "dcmtk/ofstd/oftypes.h"
#ifdef HAVE_WINDOWS_H
#define WIN32_LEAN_AND_MEAN
@@ -74,60 +74,56 @@ extern "C"
int isinf(double value);
}
#endif
-
-#elif !defined(HAVE_PROTOTYPE_STD__ISINF)
-
-static int my_isinf(double x)
-{
-#ifdef HAVE_WINDOWS_H
- return (! _finite(x)) && (! _isnan(x));
-#else
- // Solaris 2.5.1 has finite() and isnan() but not isinf().
- return (! finite(x)) && (! isnan(x));
-#endif
-}
#endif /* HAVE_ISINF */
-OFBool OFMath::isnan( float f )
+struct dcmtk_config_math
{
+ static inline OFBool isnan( float f )
+ {
#ifdef HAVE_WINDOWS_H
- return _isnan(f) != 0;
+ return _isnan(f) != 0;
#elif defined(HAVE_PROTOTYPE_STD__ISNAN)
- return STD_NAMESPACE isnan(f);
+ return STD_NAMESPACE isnan(f);
#else
- return ::isnan(f);
+ return ::isnan(f);
#endif
-}
+ }
-OFBool OFMath::isnan( double d )
-{
+ static inline OFBool isnan( double d )
+ {
#ifdef HAVE_WINDOWS_H
- return _isnan(d) != 0;
+ return _isnan(d) != 0;
#elif defined(HAVE_PROTOTYPE_STD__ISNAN)
- return STD_NAMESPACE isnan(d);
+ return STD_NAMESPACE isnan(d);
#else
- return ::isnan(d);
+ return ::isnan(d);
#endif
-}
+ }
-OFBool OFMath::isinf( float f )
-{
+ static inline OFBool isinf( float f )
+ {
#ifdef HAVE_PROTOTYPE_STD__ISINF
- return STD_NAMESPACE isinf( f );
+ return STD_NAMESPACE isinf( f );
#elif defined(HAVE_ISINF)
- return ::isinf( f );
+ return ::isinf( f );
#else
- return my_isinf( f ) != 0;
+ return dcmtk_config_math::isinf( OFstatic_cast( double, f ) );
#endif
-}
+ }
-OFBool OFMath::isinf( double d )
-{
+ static inline OFBool isinf( double d )
+ {
#ifdef HAVE_PROTOTYPE_STD__ISINF
- return STD_NAMESPACE isinf( d );
+ return STD_NAMESPACE isinf( d );
#elif defined(HAVE_ISINF)
- return ::isinf( d );
+ return ::isinf( d );
#else
- return my_isinf( d ) != 0;
+#ifdef HAVE_WINDOWS_H
+ return (! _finite(d)) && (! _isnan(d));
+#else
+ // Solaris 2.5.1 has finite() and isnan() but not isinf().
+ return (! finite(d)) && (! isnan(d));
#endif
-}
+#endif
+ }
+};
diff --git a/config/modules b/config/modules
index 2e28fdc..698a4b1 100644
--- a/config/modules
+++ b/config/modules
@@ -1 +1 @@
-ofstd oflog dcmdata dcmiod dcmfg dcmseg dcmimgle dcmimage dcmjpeg dcmjpls dcmtls dcmnet dcmsr dcmsign dcmwlm dcmqrdb dcmpstat dcmrt
+ofstd oflog dcmdata dcmiod dcmfg dcmseg dcmimgle dcmimage dcmjpeg dcmjpls dcmtls dcmnet dcmsr dcmsign dcmwlm dcmqrdb dcmpstat dcmrt dcmtract
diff --git a/dcmdata/data/dicom.dic b/dcmdata/data/dicom.dic
index 7146c67..e0f8c86 100644
--- a/dcmdata/data/dicom.dic
+++ b/dcmdata/data/dicom.dic
@@ -21,16 +21,12 @@
# DICONDE (Digital Imaging and Communication in Nondestructive Evaluation) and
# DICOS (Digital Imaging and Communications in Security) standard.
#
-# Generated automatically from DICOM PS 3.6-2015c and PS 3.7-2015c.
-# File created on 2015-07-05 12:23:01 by J. Riesmeier on thinkpad.
-# File updated manually on 2016-01-25 by J. Riesmeier.
+# Generated automatically from DICOM PS 3.6-2016c and PS 3.7-2016c
+# File created on 2016-06-13 09:52:04 by J. Riesmeier on thinkpad.
#
# In addition, the data dictionary entries from the following final text
# supplements and correction items (CP) have been incorporated:
-# - Supplement 156, 181, 184
-# - CP 1364, 1431, 1432, 1441, 1454, 1457, 1458, 1460, 1461, 1478 (WC), 1487,
-# 1496, 1499, 1504, 1516
-# "WC" means "Draft Final Text - Waiting for Codes"
+# - (none)
#
# Each line represents an entry in the data dictionary. Each line has 5 fields
# (Tag, VR, Name, VM, Version). Entries need not be in ascending tag order.
@@ -127,6 +123,7 @@
(0008,0052) CS QueryRetrieveLevel 1 DICOM
(0008,0053) CS QueryRetrieveView 1 DICOM
(0008,0054) AE RetrieveAETitle 1-n DICOM
+(0008,0055) AE StationAETitle 1 DICOM
(0008,0056) CS InstanceAvailability 1 DICOM
(0008,0058) UI FailedSOPInstanceUIDList 1-n DICOM
(0008,0060) CS Modality 1 DICOM
@@ -167,6 +164,9 @@
(0008,0119) UC LongCodeValue 1 DICOM
(0008,0120) UR URNCodeValue 1 DICOM
(0008,0121) SQ EquivalentCodeSequence 1 DICOM
+(0008,0122) LO MappingResourceName 1 DICOM
+(0008,0123) SQ ContextGroupIdentificationSequence 1 DICOM
+(0008,0124) SQ MappingResourceIdentificationSequence 1 DICOM
(0008,0201) SH TimezoneOffsetFromUTC 1 DICOM
(0008,0300) SQ PrivateDataElementCharacteristicsSequence 1 DICOM
(0008,0301) US PrivateGroupReference 1 DICOM
@@ -218,6 +218,7 @@
(0008,1197) US FailureReason 1 DICOM
(0008,1198) SQ FailedSOPSequence 1 DICOM
(0008,1199) SQ ReferencedSOPSequence 1 DICOM
+(0008,119A) SQ OtherFailuresSequence 1 DICOM
(0008,1200) SQ StudiesContainingOtherReferencedInstancesSequence 1 DICOM
(0008,1250) SQ RelatedSeriesSequence 1 DICOM
(0008,2111) ST DerivationDescription 1 DICOM
@@ -268,14 +269,28 @@
(0010,0021) LO IssuerOfPatientID 1 DICOM
(0010,0022) CS TypeOfPatientID 1 DICOM
(0010,0024) SQ IssuerOfPatientIDQualifiersSequence 1 DICOM
+(0010,0026) SQ SourcePatientGroupIdentificationSequence 1 DICOM
+(0010,0027) SQ GroupOfPatientsIdentificationSequence 1 DICOM
+(0010,0028) US SubjectRelativePositionInImage 3 DICOM
(0010,0030) DA PatientBirthDate 1 DICOM
(0010,0032) TM PatientBirthTime 1 DICOM
+(0010,0033) LO PatientBirthDateInAlternativeCalendar 1 DICOM
+(0010,0034) LO PatientDeathDateInAlternativeCalendar 1 DICOM
+(0010,0035) CS PatientAlternativeCalendar 1 DICOM
(0010,0040) CS PatientSex 1 DICOM
(0010,0050) SQ PatientInsurancePlanCodeSequence 1 DICOM
(0010,0101) SQ PatientPrimaryLanguageCodeSequence 1 DICOM
(0010,0102) SQ PatientPrimaryLanguageModifierCodeSequence 1 DICOM
(0010,0200) CS QualityControlSubject 1 DICOM
(0010,0201) SQ QualityControlSubjectTypeCodeSequence 1 DICOM
+(0010,0212) UC StrainDescription 1 DICOM
+(0010,0213) LO StrainNomenclature 1 DICOM
+(0010,0214) LO StrainStockNumber 1 DICOM
+(0010,0215) SQ StrainSourceRegistryCodeSequence 1 DICOM
+(0010,0216) SQ StrainStockSequence 1 DICOM
+(0010,0217) LO StrainSource 1 DICOM
+(0010,0218) UT StrainAdditionalInformation 1 DICOM
+(0010,0219) SQ StrainCodeSequence 1 DICOM
(0010,1000) LO OtherPatientIDs 1-n DICOM
(0010,1001) PN OtherPatientNames 1-n DICOM
(0010,1002) SQ OtherPatientIDsSequence 1 DICOM
@@ -337,18 +352,27 @@
(0012,0083) SQ ConsentForClinicalTrialUseSequence 1 DICOM
(0012,0084) CS DistributionType 1 DICOM
(0012,0085) CS ConsentForDistributionFlag 1 DICOM
-(0014,0025) ST ComponentManufacturingProcedure 1-n DICOM/DICONDE
-(0014,0028) ST ComponentManufacturer 1-n DICOM/DICONDE
+(0014,0025) ST ComponentManufacturingProcedure 1 DICOM/DICONDE
+(0014,0028) ST ComponentManufacturer 1 DICOM/DICONDE
(0014,0030) DS MaterialThickness 1-n DICOM/DICONDE
(0014,0032) DS MaterialPipeDiameter 1-n DICOM/DICONDE
(0014,0034) DS MaterialIsolationDiameter 1-n DICOM/DICONDE
-(0014,0042) ST MaterialGrade 1-n DICOM/DICONDE
-(0014,0044) ST MaterialPropertiesDescription 1-n DICOM/DICONDE
+(0014,0042) ST MaterialGrade 1 DICOM/DICONDE
+(0014,0044) ST MaterialPropertiesDescription 1 DICOM/DICONDE
(0014,0046) LT MaterialNotes 1 DICOM/DICONDE
(0014,0050) CS ComponentShape 1 DICOM/DICONDE
(0014,0052) CS CurvatureType 1 DICOM/DICONDE
(0014,0054) DS OuterDiameter 1 DICOM/DICONDE
(0014,0056) DS InnerDiameter 1 DICOM/DICONDE
+(0014,0100) LO ComponentWelderIDs 1-n DICOM/DICONDE
+(0014,0101) CS SecondaryApprovalStatus 1 DICOM/DICONDE
+(0014,0102) DA SecondaryReviewDate 1 DICOM/DICONDE
+(0014,0103) TM SecondaryReviewTime 1 DICOM/DICONDE
+(0014,0104) PN SecondaryReviewerName 1 DICOM/DICONDE
+(0014,0105) ST RepairID 1 DICOM/DICONDE
+(0014,0106) SQ MultipleComponentApprovalSequence 1 DICOM/DICONDE
+(0014,0107) CS OtherApprovalStatus 1-n DICOM/DICONDE
+(0014,0108) CS OtherSecondaryApprovalStatus 1-n DICOM/DICONDE
(0014,1010) ST ActualEnvironmentalConditions 1 DICOM/DICONDE
(0014,1020) DA ExpiryDate 1 DICOM/DICONDE
(0014,1040) ST EnvironmentalConditions 1 DICOM/DICONDE
@@ -683,6 +707,8 @@
(0018,1251) SH TransmitCoilName 1 DICOM
(0018,1260) SH PlateType 1 DICOM
(0018,1261) LO PhosphorType 1 DICOM
+(0018,1271) FD WaterEquivalentDiameter 1 DICOM
+(0018,1272) SQ WaterEquivalentDiameterCalculationMethodCodeSequence 1 DICOM
(0018,1300) DS ScanVelocity 1 DICOM
(0018,1301) CS WholeBodyTechnique 1-n DICOM
(0018,1302) IS ScanLength 1 DICOM
@@ -692,6 +718,7 @@
(0018,1315) CS VariableFlipAngleFlag 1 DICOM
(0018,1316) DS SAR 1 DICOM
(0018,1318) DS dBdt 1 DICOM
+(0018,1320) FL B1rms 1 DICOM
(0018,1400) LO AcquisitionDeviceProcessingDescription 1 DICOM
(0018,1401) LO AcquisitionDeviceProcessingCode 1 DICOM
(0018,1402) CS CassetteOrientation 1 DICOM
@@ -1164,6 +1191,10 @@
(0018,9605) FD DiffusionBValueYY 1 DICOM
(0018,9606) FD DiffusionBValueYZ 1 DICOM
(0018,9607) FD DiffusionBValueZZ 1 DICOM
+(0018,9621) SQ FunctionalMRSequence 1 DICOM
+(0018,9622) CS FunctionalSettlingPhaseFramesPresent 1 DICOM
+(0018,9623) DT FunctionalSyncPulse 1 DICOM
+(0018,9624) CS SettlingPhaseFrame 1 DICOM
(0018,9701) DT DecayCorrectionDateTime 1 DICOM
(0018,9715) FD StartDensityThreshold 1 DICOM
(0018,9716) FD StartRelativeDensityDifferenceThreshold 1 DICOM
@@ -1614,6 +1645,7 @@
(0028,1221) OW SegmentedRedPaletteColorLookupTableData 1 DICOM
(0028,1222) OW SegmentedGreenPaletteColorLookupTableData 1 DICOM
(0028,1223) OW SegmentedBluePaletteColorLookupTableData 1 DICOM
+(0028,1224) OW SegmentedAlphaPaletteColorLookupTableData 1 DICOM
(0028,1300) CS BreastImplantPresent 1 DICOM
(0028,1350) CS PartialView 1 DICOM
(0028,1351) ST PartialViewDescription 1 DICOM
@@ -1634,6 +1666,7 @@
(0028,140F) CS RGBLUTTransferFunction 1 DICOM
(0028,1410) CS AlphaLUTTransferFunction 1 DICOM
(0028,2000) OB ICCProfile 1 DICOM
+(0028,2002) CS ColorSpace 1 DICOM
(0028,2110) CS LossyImageCompression 1 DICOM
(0028,2112) DS LossyImageCompressionRatio 1-n DICOM
(0028,2114) CS LossyImageCompressionMethod 1-n DICOM
@@ -1936,6 +1969,11 @@
(0040,4050) DT PerformedProcedureStepStartDateTime 1 DICOM
(0040,4051) DT PerformedProcedureStepEndDateTime 1 DICOM
(0040,4052) DT ProcedureStepCancellationDateTime 1 DICOM
+(0040,4070) SQ OutputDestinationSequence 1 DICOM
+(0040,4071) SQ DICOMStorageSequence 1 DICOM
+(0040,4072) SQ STOWRSStorageSequence 1 DICOM
+(0040,4073) UR StorageURL 1 DICOM
+(0040,4074) SQ XDSStorageSequence 1 DICOM
(0040,8302) DS EntranceDoseInmGy 1 DICOM
(0040,9092) SQ ParametricMapFrameTypeSequence 1 DICOM
(0040,9094) SQ ReferencedImageRealWorldValueMappingSequence 1 DICOM
@@ -1944,6 +1982,8 @@
(0040,9210) SH LUTLabel 1 DICOM
(0040,9211) xs RealWorldValueLastValueMapped 1 DICOM
(0040,9212) FD RealWorldValueLUTData 1-n DICOM
+(0040,9213) FD DoubleFloatRealWorldValueLastValueMapped 1 DICOM
+(0040,9214) FD DoubleFloatRealWorldValueFirstValueMapped 1 DICOM
(0040,9216) xs RealWorldValueFirstValueMapped 1 DICOM
(0040,9220) SQ QuantityDefinitionSequence 1 DICOM
(0040,9224) FD RealWorldValueIntercept 1 DICOM
@@ -2292,6 +2332,8 @@
(0062,0010) CS SegmentationFractionalType 1 DICOM
(0062,0011) SQ SegmentedPropertyTypeModifierCodeSequence 1 DICOM
(0062,0012) SQ UsedSegmentsSequence 1 DICOM
+(0062,0020) UT TrackingID 1 DICOM
+(0062,0021) UI TrackingUID 1 DICOM
(0064,0002) SQ DeformableRegistrationSequence 1 DICOM
(0064,0003) UI SourceFrameOfReferenceUID 1 DICOM
(0064,0005) SQ DeformableRegistrationGridSequence 1 DICOM
@@ -2326,13 +2368,9 @@
(0066,001F) US VectorDimensionality 1 DICOM
(0066,0020) FL VectorAccuracy 1-n DICOM
(0066,0021) OF VectorCoordinateData 1 DICOM
-(0066,0023) OW TrianglePointIndexList 1 DICOM
-(0066,0024) OW EdgePointIndexList 1 DICOM
-(0066,0025) OW VertexPointIndexList 1 DICOM
(0066,0026) SQ TriangleStripSequence 1 DICOM
(0066,0027) SQ TriangleFanSequence 1 DICOM
(0066,0028) SQ LineSequence 1 DICOM
-(0066,0029) OW PrimitivePointIndexList 1 DICOM
(0066,002A) UL SurfaceCount 1 DICOM
(0066,002B) SQ ReferencedSurfaceSequence 1 DICOM
(0066,002C) UL ReferencedSurfaceNumber 1 DICOM
@@ -2347,10 +2385,26 @@
(0066,0036) LO AlgorithmName 1 DICOM
(0066,0037) FL RecommendedPointRadius 1 DICOM
(0066,0038) FL RecommendedLineThickness 1 DICOM
-(0066,0040) UL LongPrimitivePointIndexList 1-n DICOM
-(0066,0041) UL LongTrianglePointIndexList 3-3n DICOM
-(0066,0042) UL LongEdgePointIndexList 2-2n DICOM
-(0066,0043) UL LongVertexPointIndexList 1-n DICOM
+(0066,0040) OL LongPrimitivePointIndexList 1 DICOM
+(0066,0041) OL LongTrianglePointIndexList 1 DICOM
+(0066,0042) OL LongEdgePointIndexList 1 DICOM
+(0066,0043) OL LongVertexPointIndexList 1 DICOM
+(0066,0101) SQ TrackSetSequence 1 DICOM
+(0066,0102) SQ TrackSequence 1 DICOM
+(0066,0103) OW RecommendedDisplayCIELabValueList 1 DICOM
+(0066,0104) SQ TrackingAlgorithmIdentificationSequence 1 DICOM
+(0066,0105) UL TrackSetNumber 1 DICOM
+(0066,0106) LO TrackSetLabel 1 DICOM
+(0066,0107) UT TrackSetDescription 1 DICOM
+(0066,0108) SQ TrackSetAnatomicalTypeCodeSequence 1 DICOM
+(0066,0121) SQ MeasurementsSequence 1 DICOM
+(0066,0124) SQ TrackSetStatisticsSequence 1 DICOM
+(0066,0125) OF FloatingPointValues 1 DICOM
+(0066,0129) OL TrackPointIndexList 1 DICOM
+(0066,0130) SQ TrackStatisticsSequence 1 DICOM
+(0066,0132) SQ MeasurementValuesSequence 1 DICOM
+(0066,0133) SQ DiffusionAcquisitionCodeSequence 1 DICOM
+(0066,0134) SQ DiffusionModelCodeSequence 1 DICOM
(0068,6210) LO ImplantSize 1 DICOM
(0068,6221) LO ImplantTemplateVersion 1 DICOM
(0068,6222) SQ ReplacedImplantTemplateSequence 1 DICOM
@@ -2507,6 +2561,7 @@
(0070,0308) SQ RegistrationSequence 1 DICOM
(0070,0309) SQ MatrixRegistrationSequence 1 DICOM
(0070,030A) SQ MatrixSequence 1 DICOM
+(0070,030B) FD FrameOfReferenceToDisplayedCoordinateSystemTransformationMatrix 16 DICOM
(0070,030C) CS FrameOfReferenceTransformationMatrixType 1 DICOM
(0070,030D) SQ RegistrationTypeCodeSequence 1 DICOM
(0070,030F) ST FiducialDescription 1 DICOM
@@ -2523,6 +2578,52 @@
(0070,0403) FL RelativeOpacity 1 DICOM
(0070,0404) SQ ReferencedSpatialRegistrationSequence 1 DICOM
(0070,0405) CS BlendingPosition 1 DICOM
+(0070,1101) UI PresentationDisplayCollectionUID 1 DICOM
+(0070,1102) UI PresentationSequenceCollectionUID 1 DICOM
+(0070,1103) US PresentationSequencePositionIndex 1 DICOM
+(0070,1104) SQ RenderedImageReferenceSequence 1 DICOM
+(0070,1201) SQ VolumetricPresentationStateInputSequence 1 DICOM
+(0070,1202) CS PresentationInputType 1 DICOM
+(0070,1203) US InputSequencePositionIndex 1 DICOM
+(0070,1204) CS Crop 1 DICOM
+(0070,1205) US CroppingSpecificationIndex 1-n DICOM
+(0070,1206) CS CompositingMethod 1 DICOM
+(0070,1207) US VolumetricPresentationInputNumber 1 DICOM
+(0070,1208) CS ImageVolumeGeometry 1 DICOM
+(0070,1301) SQ VolumeCroppingSequence 1 DICOM
+(0070,1302) CS VolumeCroppingMethod 1 DICOM
+(0070,1303) FD BoundingBoxCrop 6 DICOM
+(0070,1304) SQ ObliqueCroppingPlaneSequence 1 DICOM
+(0070,1305) FD Plane 4 DICOM
+(0070,1306) FD PlaneNormal 3 DICOM
+(0070,1309) US CroppingSpecificationNumber 1 DICOM
+(0070,1501) CS MultiPlanarReconstructionStyle 1 DICOM
+(0070,1502) CS MPRThicknessType 1 DICOM
+(0070,1503) FD MPRSlabThickness 1 DICOM
+(0070,1505) FD MPRTopLeftHandCorner 3 DICOM
+(0070,1507) FD MPRViewWidthDirection 3 DICOM
+(0070,1508) FD MPRViewWidth 1 DICOM
+(0070,150C) UL NumberOfVolumetricCurvePoints 1 DICOM
+(0070,150D) OD VolumetricCurvePoints 1 DICOM
+(0070,1511) FD MPRViewHeightDirection 3 DICOM
+(0070,1512) FD MPRViewHeight 1 DICOM
+(0070,1801) SQ PresentationStateClassificationComponentSequence 1 DICOM
+(0070,1802) CS ComponentType 1 DICOM
+(0070,1803) SQ ComponentInputSequence 1 DICOM
+(0070,1804) US VolumetricPresentationInputIndex 1 DICOM
+(0070,1805) SQ PresentationStateCompositorComponentSequence 1 DICOM
+(0070,1806) SQ WeightingTransferFunctionSequence 1 DICOM
+(0070,1807) US WeightingLookupTableDescriptor 3 DICOM
+(0070,1808) OB WeightingLookupTableData 1 DICOM
+(0070,1901) SQ VolumetricAnnotationSequence 1 DICOM
+(0070,1903) SQ ReferencedStructuredContextSequence 1 DICOM
+(0070,1904) UI ReferencedContentItem 1 DICOM
+(0070,1905) SQ VolumetricPresentationInputAnnotationSequence 1 DICOM
+(0070,1907) CS AnnotationClipping 1 DICOM
+(0070,1A01) CS PresentationAnimationStyle 1 DICOM
+(0070,1A03) FD RecommendedAnimationRate 1 DICOM
+(0070,1A04) SQ AnimationCurveSequence 1 DICOM
+(0070,1A05) FD AnimationStepSize 1 DICOM
(0072,0002) SH HangingProtocolName 1 DICOM
(0072,0004) LO HangingProtocolDescription 1 DICOM
(0072,0006) CS HangingProtocolLevel 1 DICOM
@@ -2550,17 +2651,30 @@
(0072,0052) AT SelectorSequencePointer 1-n DICOM
(0072,0054) LO SelectorSequencePointerPrivateCreator 1-n DICOM
(0072,0056) LO SelectorAttributePrivateCreator 1 DICOM
+(0072,005E) AE SelectorAEValue 1-n DICOM
+(0072,005F) AS SelectorASValue 1-n DICOM
(0072,0060) AT SelectorATValue 1-n DICOM
+(0072,0061) DA SelectorDAValue 1-n DICOM
(0072,0062) CS SelectorCSValue 1-n DICOM
+(0072,0063) DT SelectorDTValue 1-n DICOM
(0072,0064) IS SelectorISValue 1-n DICOM
+(0072,0065) OB SelectorOBValue 1 DICOM
(0072,0066) LO SelectorLOValue 1-n DICOM
+(0072,0067) OF SelectorOFValue 1 DICOM
(0072,0068) LT SelectorLTValue 1 DICOM
+(0072,0069) OW SelectorOWValue 1 DICOM
(0072,006A) PN SelectorPNValue 1-n DICOM
+(0072,006B) TM SelectorTMValue 1-n DICOM
(0072,006C) SH SelectorSHValue 1-n DICOM
+(0072,006D) UN SelectorUNValue 1 DICOM
(0072,006E) ST SelectorSTValue 1 DICOM
+(0072,006F) UC SelectorUCValue 1-n DICOM
(0072,0070) UT SelectorUTValue 1 DICOM
+(0072,0071) UR SelectorURValue 1 DICOM
(0072,0072) DS SelectorDSValue 1-n DICOM
+(0072,0073) OD SelectorODValue 1 DICOM
(0072,0074) FD SelectorFDValue 1-n DICOM
+(0072,0075) OL SelectorOLValue 1 DICOM
(0072,0076) FL SelectorFLValue 1-n DICOM
(0072,0078) UL SelectorULValue 1-n DICOM
(0072,007A) US SelectorUSValue 1-n DICOM
@@ -2685,6 +2799,20 @@
(0074,1324) UL BeamOrderIndex 1 DICOM
(0074,1338) FD DoubleExposureMeterset 1 DICOM
(0074,133A) FD DoubleExposureFieldDelta 4 DICOM
+(0074,1401) SQ BrachyTaskSequence 1 DICOM
+(0074,1402) DS ContinuationStartTotalReferenceAirKerma 1 DICOM
+(0074,1403) DS ContinuationEndTotalReferenceAirKerma 1 DICOM
+(0074,1404) IS ContinuationPulseNumber 1 DICOM
+(0074,1405) SQ ChannelDeliveryOrderSequence 1 DICOM
+(0074,1406) IS ReferencedChannelNumber 1 DICOM
+(0074,1407) DS StartCumulativeTimeWeight 1 DICOM
+(0074,1408) DS EndCumulativeTimeWeight 1 DICOM
+(0074,1409) SQ OmittedChannelSequence 1 DICOM
+(0074,140A) CS ReasonForChannelOmission 1 DICOM
+(0074,140B) LO ReasonForChannelOmissionDescription 1 DICOM
+(0074,140C) IS ChannelDeliveryOrderIndex 1 DICOM
+(0074,140D) SQ ChannelDeliveryContinuationSequence 1 DICOM
+(0074,140E) SQ OmittedApplicationSetupSequence 1 DICOM
(0076,0001) LO ImplantAssemblyTemplateName 1 DICOM
(0076,0003) LO ImplantAssemblyTemplateIssuer 1 DICOM
(0076,0006) LO ImplantAssemblyTemplateVersion 1 DICOM
@@ -2739,6 +2867,29 @@
(0080,0011) OF VValueData 1-n DICOM
(0080,0012) SQ ReferencedTextureSequence 1 DICOM
(0080,0013) SQ ReferencedSurfaceDataSequence 1 DICOM
+(0082,0001) CS AssessmentSummary 1 DICOM
+(0082,0003) UT AssessmentSummaryDescription 1 DICOM
+(0082,0004) SQ AssessedSOPInstanceSequence 1 DICOM
+(0082,0005) SQ ReferencedComparisonSOPInstanceSequence 1 DICOM
+(0082,0006) UL NumberOfAssessmentObservations 1 DICOM
+(0082,0007) SQ AssessmentObservationsSequence 1 DICOM
+(0082,0008) CS ObservationSignificance 1 DICOM
+(0082,000A) UT ObservationDescription 1 DICOM
+(0082,000C) SQ StructuredContraintObservationSequence 1 DICOM
+(0082,0010) SQ AssessedAttributeValueSequence 1 DICOM
+(0082,0016) LO AssessmentSetID 1 DICOM
+(0082,0017) SQ AssessmentRequesterSequence 1 DICOM
+(0082,0018) LO SelectorAttributeName 1 DICOM
+(0082,0019) LO SelectorAttributeKeyword 1 DICOM
+(0082,0021) SQ AssessmentTypeCodeSequence 1 DICOM
+(0082,0022) SQ ObservationBasisCodeSequence 1 DICOM
+(0082,0023) LO AssessmentLabel 1 DICOM
+(0082,0032) CS ConstraintType 1 DICOM
+(0082,0033) UT SpecificationSelectionGuidance 1 DICOM
+(0082,0034) SQ ConstraintValueSequence 1 DICOM
+(0082,0035) SQ RecommendedDefaultValueSequence 1 DICOM
+(0082,0036) CS ConstraintViolationSignificance 1 DICOM
+(0082,0037) UT ConstraintViolationCondition 1 DICOM
(0088,0130) SH StorageMediaFileSetID 1 DICOM
(0088,0140) UI StorageMediaFileSetUID 1 DICOM
(0088,0200) SQ IconImageSequence 1 DICOM
@@ -2829,6 +2980,7 @@
(2100,0040) DA CreationDate 1 DICOM
(2100,0050) TM CreationTime 1 DICOM
(2100,0070) AE Originator 1 DICOM
+(2100,0140) AE DestinationAE 1 DICOM
(2100,0160) SH OwnerID 1 DICOM
(2100,0170) IS NumberOfFilms 1 DICOM
(2110,0010) CS PrinterStatus 1 DICOM
@@ -3103,6 +3255,9 @@
(300A,008D) FL AverageBeamDosePointDepth 1 DICOM
(300A,008E) FL AverageBeamDosePointEquivalentDepth 1 DICOM
(300A,008F) FL AverageBeamDosePointSSD 1 DICOM
+(300A,0090) CS BeamDoseType 1 DICOM
+(300A,0091) DS AlternateBeamDose 1 DICOM
+(300A,0092) CS AlternateBeamDoseType 1 DICOM
(300A,00A0) IS NumberOfBrachyApplicationSetups 1 DICOM
(300A,00A2) DS BrachyApplicationSetupDoseSpecificationPoint 3 DICOM
(300A,00A4) DS BrachyApplicationSetupDose 1 DICOM
@@ -3205,7 +3360,7 @@
(300A,012C) DS IsocenterPosition 3 DICOM
(300A,012E) DS SurfaceEntryPoint 3 DICOM
(300A,0130) DS SourceToSurfaceDistance 1 DICOM
-(300A,0131) FL AverageBeamDosePointSourceToExternalContourSurfaceDistance 1 DICOM
+(300A,0131) FL AverageBeamDosePointSourceToExternalContourDistance 1 DICOM
(300A,0132) FL SourceToExternalContourDistance 1 DICOM
(300A,0133) FL ExternalContourEntryPoint 3 DICOM
(300A,0134) DS CumulativeMetersetWeight 1 DICOM
@@ -3217,6 +3372,12 @@
(300A,014A) FL GantryPitchAngle 1 DICOM
(300A,014C) CS GantryPitchRotationDirection 1 DICOM
(300A,014E) FL GantryPitchAngleTolerance 1 DICOM
+(300A,0150) CS FixationEye 1 DICOM
+(300A,0151) DS ChairHeadFramePosition 1 DICOM
+(300A,0152) DS HeadFixationAngleTolerance 1 DICOM
+(300A,0153) DS ChairHeadFramePositionTolerance 1 DICOM
+(300A,0154) DS FixationLightAzimuthalAngleTolerance 1 DICOM
+(300A,0155) DS FixationLightPolarAngleTolerance 1 DICOM
(300A,0180) SQ PatientSetupSequence 1 DICOM
(300A,0182) IS PatientSetupNumber 1 DICOM
(300A,0183) LO PatientSetupLabel 1 DICOM
@@ -3324,6 +3485,7 @@
(300A,0304) IS RadiationAtomicNumber 1 DICOM
(300A,0306) SS RadiationChargeState 1 DICOM
(300A,0308) CS ScanMode 1 DICOM
+(300A,0309) CS ModulatedScanModeType 1 DICOM
(300A,030A) FL VirtualSourceAxisDistances 2 DICOM
(300A,030C) SQ SnoutSequence 1 DICOM
(300A,030D) FL SnoutPosition 1 DICOM
@@ -3351,6 +3513,7 @@
(300A,0350) CS PatientSupportType 1 DICOM
(300A,0352) SH PatientSupportID 1 DICOM
(300A,0354) LO PatientSupportAccessoryCode 1 DICOM
+(300A,0355) LO TrayAccessoryCode 1 DICOM
(300A,0356) FL FixationLightAzimuthalAngle 1 DICOM
(300A,0358) FL FixationLightPolarAngle 1 DICOM
(300A,035A) FL MetersetRate 1 DICOM
@@ -3368,8 +3531,11 @@
(300A,0388) FL RangeModulatorGatingStopWaterEquivalentThickness 1 DICOM
(300A,038A) FL IsocenterToRangeModulatorDistance 1 DICOM
(300A,0390) SH ScanSpotTuneID 1 DICOM
+(300A,0391) IS ScanSpotPrescribedIndices 1-n DICOM
(300A,0392) IS NumberOfScanSpotPositions 1 DICOM
+(300A,0393) CS ScanSpotReordered 1 DICOM
(300A,0394) FL ScanSpotPositionMap 1-n DICOM
+(300A,0395) CS ScanSpotReorderingAllowed 1 DICOM
(300A,0396) FL ScanSpotMetersetWeights 1-n DICOM
(300A,0398) FL ScanningSpotSize 2 DICOM
(300A,039A) IS NumberOfPaintings 1 DICOM
@@ -3404,6 +3570,18 @@
(300A,0451) CS DeviceMotionExecutionMode 1 DICOM
(300A,0452) CS DeviceMotionObservationMode 1 DICOM
(300A,0453) SQ DeviceMotionParameterCodeSequence 1 DICOM
+(300A,0501) FL DistalDepthFraction 1 DICOM
+(300A,0502) FL DistalDepth 1 DICOM
+(300A,0503) FL NominalRangeModulationFractions 2 DICOM
+(300A,0504) FL NominalRangeModulatedRegionDepths 2 DICOM
+(300A,0505) SQ DepthDoseParametersSequence 1 DICOM
+(300A,0506) SQ DeliveredDepthDoseParametersSequence 1 DICOM
+(300A,0507) FL DeliveredDistalDepthFraction 1 DICOM
+(300A,0508) FL DeliveredDistalDepth 1 DICOM
+(300A,0509) FL DeliveredNominalRangeModulationFractions 2 DICOM
+(300A,0510) FL DeliveredNominalRangeModulatedRegionDepths 2 DICOM
+(300A,0511) CS DeliveredReferenceDoseDefinition 1 DICOM
+(300A,0512) CS ReferenceDoseDefinition 1 DICOM
(300C,0002) SQ ReferencedRTPlanSequence 1 DICOM
(300C,0004) SQ ReferencedBeamSequence 1 DICOM
(300C,0006) IS ReferencedBeamNumber 1 DICOM
@@ -3565,149 +3743,468 @@
(FFFE,E00D) na ItemDelimitationItem 1 DICOM
(FFFE,E0DD) na SequenceDelimitationItem 1 DICOM
#
-#---------------------------------------------------------------------------
-#
-# Supplement 156 (Planar MPR Volumetric Presentation State)
-#
-(0028,1224) OW SegmentedAlphaPaletteColorLookupTableData 1 Supplement_156
-(0070,1101) UI PresentationDisplayCollectionUID 1 Supplement_156
-(0070,1102) UI PresentationSequenceCollectionUID 1 Supplement_156
-(0070,1103) US PresentationSequencePositionIndex 1 Supplement_156
-(0070,1104) SQ RenderedImageReferenceSequence 1 Supplement_156
-(0070,1201) SQ VolumetricPresentationStateInputSequence 1 Supplement_156
-(0070,1202) CS PresentationInputType 1 Supplement_156
-(0070,1203) US InputSequencePositionIndex 1 Supplement_156
-(0070,1204) CS Crop 1 Supplement_156
-(0070,1205) US CroppingSpecificationIndex 1-n Supplement_156
-(0070,1206) CS CompositingMethod 1 Supplement_156
-(0070,1207) US VolumetricPresentationInputNumber 1 Supplement_156
-(0070,1208) CS ImageVolumeGeometry 1 Supplement_156
-(0070,1301) SQ VolumeCroppingSequence 1 Supplement_156
-(0070,1302) CS VolumeCroppingMethod 1 Supplement_156
-(0070,1303) FD BoundingBoxCrop 6 Supplement_156
-(0070,1304) SQ ObliqueCroppingPlaneSequence 1 Supplement_156
-(0070,1305) FD ObliqueCroppingPlane 4 Supplement_156
-(0070,1306) FD ObliqueCroppingPlaneNormal 3 Supplement_156
-(0070,1309) US CroppingSpecificationNumber 1 Supplement_156
-(0070,1501) CS MultiPlanarReconstructionStyle 1 Supplement_156
-(0070,1502) CS MPRThicknessType 1 Supplement_156
-(0070,1503) FD MPRSlabThickness 1 Supplement_156
-(0070,1505) FD MPRTopLeftHandCorner 3 Supplement_156
-(0070,1507) FD MPRViewWidthDirection 3 Supplement_156
-(0070,1508) FD MPRViewWidth 1 Supplement_156
-(0070,150C) FL NumberOfVolumetricCurvePoints 1 Supplement_156
-(0070,150D) OD VolumetricCurvePoints 1 Supplement_156
-(0070,1511) FD MPRViewHeightDirection 3 Supplement_156
-(0070,1512) FD MPRViewHeight 1 Supplement_156
-(0070,1801) SQ PresentationStateClassificationComponentSequence 1 Supplement_156
-(0070,1802) CS ComponentType 1 Supplement_156
-(0070,1803) SQ ComponentInputSequence 1 Supplement_156
-(0070,1804) US VolumetricPresentationInputIndex 1 Supplement_156
-(0070,1805) SQ PresentationStateCompositorComponentSequence 1 Supplement_156
-(0070,1806) SQ WeightingTransferFunctionSequence 1 Supplement_156
-(0070,1807) US WeightingLookupTableDescriptor 3 Supplement_156
-(0070,1808) OB WeightingLookupTableData 1 Supplement_156
-(0070,1901) SQ VolumetricAnnotationSequence 1 Supplement_156
-(0070,1903) SQ ReferencedStructuredContextSequence 1 Supplement_156
-(0070,1904) UI ReferencedContentItem 1 Supplement_156
-(0070,1905) SQ VolumetricPresentationInputAnnotationSequence 1 Supplement_156
-(0070,1907) CS AnnotationClipping 1 Supplement_156
-(0070,1A01) CS PresentationAnimationStyle 1 Supplement_156
-(0070,1A03) FD RecommendedAnimationRate 1 Supplement_156
-(0070,1A04) SQ AnimationCurveSequence 1 Supplement_156
-(0070,1A05) FD AnimationStepSize 1 Supplement_156
-#
-#---------------------------------------------------------------------------
-#
-# Supplement 181 (Tractography Results Storage SOP Class)
+# Retired (generated automatically)
#
-(0066,0101) SQ TrackSetSequence 1 Supplement_181
-(0066,0102) SQ TrackSequence 1 Supplement_181
-(0066,0103) OW RecommendedDisplayCIELabValueList 1 Supplement_181
-(0066,0104) SQ TrackingAlgorithmIdentificationSequence 1 Supplement_181
-(0066,0105) UL TrackSetNumber 1 Supplement_181
-(0066,0106) LO TrackSetLabel 1 Supplement_181
-(0066,0107) UT TrackSetDescription 1 Supplement_181
-(0066,0108) SQ TrackSetAnatomicalTypeCodeSequence 1 Supplement_181
-(0066,0121) SQ MeasurementsSequence 1 Supplement_181
-(0066,0124) SQ TrackSetStatisticsSequence 1 Supplement_181
-(0066,0125) OF FloatingPointValues 1 Supplement_181
-(0066,0129) OL TrackPointIndexList 1 Supplement_181
-(0066,0130) SQ TrackStatisticsSequence 1 Supplement_181
-(0066,0132) SQ MeasurementValuesSequence 1 Supplement_181
-(0066,0133) SQ DiffusionAcquisitionCodeSequence 1 Supplement_181
-(0066,0134) SQ DiffusionModelCodeSequence 1 Supplement_181
-#
-#---------------------------------------------------------------------------
-#
-# Supplement 184 (Brachytherapy Delivery Instruction)
-#
-(0074,1401) SQ BrachyTaskSequence 1 Supplement_184
-(0074,1402) DS ContinuationStartTotalReferenceAirKerma 1 Supplement_184
-(0074,1403) DS ContinuationEndTotalReferenceAirKerma 1 Supplement_184
-(0074,1404) IS ContinuationPulseNumber 1 Supplement_184
-(0074,1405) SQ ChannelDeliveryOrderSequence 1 Supplement_184
-(0074,1406) IS ReferencedChannelNumber 1 Supplement_184
-(0074,1407) DS StartCumulativeTimeWeight 1 Supplement_184
-(0074,1408) DS EndCumulativeTimeWeight 1 Supplement_184
-(0074,1409) SQ OmittedChannelSequence 1 Supplement_184
-(0074,140A) CS ReasonForChannelOmission 1 Supplement_184
-(0074,140B) LO ReasonForChannelOmissionDescription 1 Supplement_184
-(0074,140C) IS ChannelDeliveryOrderIndex 1 Supplement_184
-(0074,140D) SQ ChannelDeliveryContinuationSequence 1 Supplement_184
-(0074,140E) SQ OmittedApplicationSetupSequence 1 Supplement_184
-#
-#---------------------------------------------------------------------------
-#
-# Correction Items 1364, 1431, 1432, 1441, 1454, 1457, 1458, 1460, 1461, 1478 (WC),
-# 1487, 1496, 1499, 1504, 1516
-#
-(0008,119A) SQ OtherFailuresSequence 1 CP_1364
-(300A,0090) CS BeamDoseType 1 CP_1431
-(300A,0091) DS AlternateBeamDose 1 CP_1431
-(300A,0092) CS AlternateBeamDoseType 1 CP_1431
-(300A,0309) CS ModulatedScanModeType 1 CP_1432
-(0040,4070) SQ OutputDestinationSequence 1 CP_1441
-(0040,4071) SQ DICOMStorageSequence 1 CP_1441
-(0040,4072) SQ STOWRSStorageSequence 1 CP_1441
-(0040,4073) UR StorageURL 1 CP_1441
-(0040,4074) SQ XDSStorageSequence 1 CP_1441
-(0028,2002) CS ColorSpace 1 CP_1454
-(0010,0026) SQ SourcePatientGroupIdentificationSequence 1 CP_1457
-(0010,0027) SQ GroupOfPatientsIdentificationSequence 1 CP_1457
-(0010,0028) US SubjectRelativePositionInImage 3 CP_1457
-(0040,9213) FD DoubleFloatRealWorldValueLastValueMapped 1 CP_1458
-(0040,9214) FD DoubleFloatRealWorldValueFirstValueMapped 1 CP_1458
-(300A,0501) FL DistalDepthFraction 1 CP_1460
-(300A,0502) FL DistalDepth 1 CP_1460
-(300A,0503) FL NominalRangeModulatioFractions 2 CP_1460
-(300A,0504) FL NominalRangeModulatedRegionDepths 2 CP_1460
-(300A,0505) SQ DepthDoseParametersSequence 1 CP_1460
-(300A,0506) SQ DeliveredDepthDoseParametersSequence 1 CP_1460
-(300A,0507) FL DeliveredDistalDepthFraction 1 CP_1460
-(300A,0508) FL DeliveredDistalDepth 1 CP_1460
-(300A,0509) FL DeliveredNominalRangeModulationFractions 2 CP_1460
-(300A,0510) FL DeliveredNominalRangeModulatedRegionDepths 2 CP_1460
-(300A,0511) CS DeliveredReferenceDoseDefinition 1 CP_1460
-(300A,0512) CS ReferenceDoseDefinition 1 CP_1460
-(0018,1320) FL B1rms 1 CP_1461
-(0010,0212) UC StrainDescription 1 CP_1478
-(0010,0213) LO StrainNomenclature 1 CP_1478
-(0010,0214) LO StrainStockNumber 1 CP_1478
-(0010,0215) SQ StrainSourceRegistryCodeSequence 1 CP_1478
-(0010,0216) SQ StrainStockSequence 1 CP_1478
-(0010,0217) LO StrainSource 1 CP_1478
-(0010,0218) UT StrainAdditionalInformation 1 CP_1478
-(0010,0219) SQ StrainCodeSequence 1 CP_1478
-(0070,030B) FD FrameOfReferenceToDisplayedCoordinateSystemTransformationMatrix 16 CP_1487
-(0062,0020) UT TrackingID 1 CP_1496
-(0062,0021) UI TrackingUID 1 CP_1496
-(0066,0040) OL LongPrimitivePointIndexList 1 CP_1499
-(0066,0041) OL LongTrianglePointIndexList 1 CP_1499
-(0066,0042) OL LongEdgePointIndexList 1 CP_1499
-(0066,0043) OL LongVertexPointIndexList 1 CP_1499
-(300A,0355) LO TrayAccessoryCode 1 CP_1504
-(0008,0055) AE StationAETitle 1 CP_1516
+(0000,0001) UL RETIRED_CommandLengthToEnd 1 DICOM/retired
+(0000,0010) SH RETIRED_CommandRecognitionCode 1 DICOM/retired
+(0000,0200) AE RETIRED_Initiator 1 DICOM/retired
+(0000,0300) AE RETIRED_Receiver 1 DICOM/retired
+(0000,0400) AE RETIRED_FindLocation 1 DICOM/retired
+(0000,0850) US RETIRED_NumberOfMatches 1 DICOM/retired
+(0000,0860) US RETIRED_ResponseSequenceNumber 1 DICOM/retired
+(0000,4000) LT RETIRED_DialogReceiver 1 DICOM/retired
+(0000,4010) LT RETIRED_TerminalType 1 DICOM/retired
+(0000,5010) SH RETIRED_MessageSetID 1 DICOM/retired
+(0000,5020) SH RETIRED_EndMessageID 1 DICOM/retired
+(0000,5110) LT RETIRED_DisplayFormat 1 DICOM/retired
+(0000,5120) LT RETIRED_PagePositionID 1 DICOM/retired
+(0000,5130) CS RETIRED_TextFormatID 1 DICOM/retired
+(0000,5140) CS RETIRED_NormalReverse 1 DICOM/retired
+(0000,5150) CS RETIRED_AddGrayScale 1 DICOM/retired
+(0000,5160) CS RETIRED_Borders 1 DICOM/retired
+(0000,5170) IS RETIRED_Copies 1 DICOM/retired
+(0000,5180) CS RETIRED_CommandMagnificationType 1 DICOM/retired
+(0000,5190) CS RETIRED_Erase 1 DICOM/retired
+(0000,51A0) CS RETIRED_Print 1 DICOM/retired
+(0000,51B0) US RETIRED_Overlays 1-n DICOM/retired
+(0004,1504) up RETIRED_MRDRDirectoryRecordOffset 1 DICOM/retired
+(0004,1600) UL RETIRED_NumberOfReferences 1 DICOM/retired
+(0008,0001) UL RETIRED_LengthToEnd 1 DICOM/retired
+(0008,0010) SH RETIRED_RecognitionCode 1 DICOM/retired
+(0008,0024) DA RETIRED_OverlayDate 1 DICOM/retired
+(0008,0025) DA RETIRED_CurveDate 1 DICOM/retired
+(0008,0034) TM RETIRED_OverlayTime 1 DICOM/retired
+(0008,0035) TM RETIRED_CurveTime 1 DICOM/retired
+(0008,0040) US RETIRED_DataSetType 1 DICOM/retired
+(0008,0041) LO RETIRED_DataSetSubtype 1 DICOM/retired
+(0008,0042) CS RETIRED_NuclearMedicineSeriesType 1 DICOM/retired
+(0008,1000) AE RETIRED_NetworkID 1 DICOM/retired
+(0008,1100) SQ RETIRED_ReferencedResultsSequence 1 DICOM/retired
+(0008,1130) SQ RETIRED_ReferencedOverlaySequence 1 DICOM/retired
+(0008,1145) SQ RETIRED_ReferencedCurveSequence 1 DICOM/retired
+(0008,2110) CS RETIRED_LossyImageCompressionRetired 1 DICOM/retired
+(0008,2200) CS RETIRED_TransducerPosition 1 DICOM/retired
+(0008,2204) CS RETIRED_TransducerOrientation 1 DICOM/retired
+(0008,2208) CS RETIRED_AnatomicStructure 1 DICOM/retired
+(0008,2240) SQ RETIRED_TransducerPositionSequence 1 DICOM/retired
+(0008,2242) SQ RETIRED_TransducerPositionModifierSequence 1 DICOM/retired
+(0008,2244) SQ RETIRED_TransducerOrientationSequence 1 DICOM/retired
+(0008,2246) SQ RETIRED_TransducerOrientationModifierSequence 1 DICOM/retired
+(0008,2251) SQ RETIRED_AnatomicStructureSpaceOrRegionCodeSequenceTrial 1 DICOM/retired
+(0008,2253) SQ RETIRED_AnatomicPortalOfEntranceCodeSequenceTrial 1 DICOM/retired
+(0008,2255) SQ RETIRED_AnatomicApproachDirectionCodeSequenceTrial 1 DICOM/retired
+(0008,2256) ST RETIRED_AnatomicPerspectiveDescriptionTrial 1 DICOM/retired
+(0008,2257) SQ RETIRED_AnatomicPerspectiveCodeSequenceTrial 1 DICOM/retired
+(0008,2258) ST RETIRED_AnatomicLocationOfExaminingInstrumentDescriptionTrial 1 DICOM/retired
+(0008,2259) SQ RETIRED_AnatomicLocationOfExaminingInstrumentCodeSequenceTrial 1 DICOM/retired
+(0008,225A) SQ RETIRED_AnatomicStructureSpaceOrRegionModifierCodeSequenceTrial 1 DICOM/retired
+(0008,225C) SQ RETIRED_OnAxisBackgroundAnatomicStructureCodeSequenceTrial 1 DICOM/retired
+(0008,4000) LT RETIRED_IdentifyingComments 1 DICOM/retired
+(0010,1050) LO RETIRED_InsurancePlanIdentification 1-n DICOM/retired
+(0014,0023) ST RETIRED_CADFileFormat 1 DICOM/retired
+(0014,0024) ST RETIRED_ComponentReferenceSystem 1 DICOM/retired
+(0014,0045) ST RETIRED_MaterialPropertiesFileFormatRetired 1 DICOM/retired
+(0018,0030) LO RETIRED_Radionuclide 1-n DICOM/retired
+(0018,0032) DS RETIRED_EnergyWindowCenterline 1 DICOM/retired
+(0018,0033) DS RETIRED_EnergyWindowTotalWidth 1-n DICOM/retired
+(0018,0037) CS RETIRED_TherapyType 1 DICOM/retired
+(0018,0039) CS RETIRED_TherapyDescription 1 DICOM/retired
+(0018,1011) LO RETIRED_HardcopyCreationDeviceID 1 DICOM/retired
+(0018,1017) LO RETIRED_HardcopyDeviceManufacturer 1 DICOM/retired
+(0018,101A) LO RETIRED_HardcopyDeviceSoftwareVersion 1-n DICOM/retired
+(0018,101B) LO RETIRED_HardcopyDeviceManufacturerModelName 1 DICOM/retired
+(0018,1141) DS RETIRED_AngularPosition 1 DICOM/retired
+(0018,1146) DS RETIRED_RotationOffset 1-n DICOM/retired
+(0018,1240) IS RETIRED_UpperLowerPixelValues 1-n DICOM/retired
+(0018,4000) LT RETIRED_AcquisitionComments 1 DICOM/retired
+(0018,5021) LO RETIRED_PostprocessingFunction 1 DICOM/retired
+(0018,5030) DS RETIRED_DynamicRange 1 DICOM/retired
+(0018,5040) DS RETIRED_TotalGain 1 DICOM/retired
+(0018,5210) DS RETIRED_ImageTransformationMatrix 6 DICOM/retired
+(0018,5212) DS RETIRED_ImageTranslationVector 3 DICOM/retired
+(0018,6038) UL RETIRED_DopplerSampleVolumeXPositionRetired 1 DICOM/retired
+(0018,603A) UL RETIRED_DopplerSampleVolumeYPositionRetired 1 DICOM/retired
+(0018,603C) UL RETIRED_TMLinePositionX0Retired 1 DICOM/retired
+(0018,603E) UL RETIRED_TMLinePositionY0Retired 1 DICOM/retired
+(0018,6040) UL RETIRED_TMLinePositionX1Retired 1 DICOM/retired
+(0018,6042) UL RETIRED_TMLinePositionY1Retired 1 DICOM/retired
+(0018,9096) FD RETIRED_ParallelReductionFactorInPlaneRetired 1 DICOM/retired
+(0018,9166) CS RETIRED_BulkMotionStatus 1 DICOM/retired
+(0018,9195) FD RETIRED_ChemicalShiftMinimumIntegrationLimitInHz 1 DICOM/retired
+(0018,9196) FD RETIRED_ChemicalShiftMaximumIntegrationLimitInHz 1 DICOM/retired
+(0020,0014) IS RETIRED_IsotopeNumber 1 DICOM/retired
+(0020,0015) IS RETIRED_PhaseNumber 1 DICOM/retired
+(0020,0016) IS RETIRED_IntervalNumber 1 DICOM/retired
+(0020,0017) IS RETIRED_TimeSlotNumber 1 DICOM/retired
+(0020,0018) IS RETIRED_AngleNumber 1 DICOM/retired
+(0020,0022) IS RETIRED_OverlayNumber 1 DICOM/retired
+(0020,0024) IS RETIRED_CurveNumber 1 DICOM/retired
+(0020,0026) IS RETIRED_LUTNumber 1 DICOM/retired
+(0020,0030) DS RETIRED_ImagePosition 3 DICOM/retired
+(0020,0035) DS RETIRED_ImageOrientation 6 DICOM/retired
+(0020,0050) DS RETIRED_Location 1 DICOM/retired
+(0020,0070) LO RETIRED_ImageGeometryType 1 DICOM/retired
+(0020,0080) CS RETIRED_MaskingImage 1-n DICOM/retired
+(0020,00AA) IS RETIRED_ReportNumber 1 DICOM/retired
+(0020,1000) IS RETIRED_SeriesInStudy 1 DICOM/retired
+(0020,1001) IS RETIRED_AcquisitionsInSeries 1 DICOM/retired
+(0020,1003) IS RETIRED_ImagesInSeries 1 DICOM/retired
+(0020,1004) IS RETIRED_AcquisitionsInStudy 1 DICOM/retired
+(0020,1005) IS RETIRED_ImagesInStudy 1 DICOM/retired
+(0020,1020) LO RETIRED_Reference 1-n DICOM/retired
+(0020,1070) IS RETIRED_OtherStudyNumbers 1-n DICOM/retired
+(0020,3100-31FF) CS RETIRED_SourceImageIDs 1-n DICOM/retired
+(0020,3401) CS RETIRED_ModifyingDeviceID 1 DICOM/retired
+(0020,3402) CS RETIRED_ModifiedImageID 1 DICOM/retired
+(0020,3403) DA RETIRED_ModifiedImageDate 1 DICOM/retired
+(0020,3404) LO RETIRED_ModifyingDeviceManufacturer 1 DICOM/retired
+(0020,3405) TM RETIRED_ModifiedImageTime 1 DICOM/retired
+(0020,3406) LO RETIRED_ModifiedImageDescription 1 DICOM/retired
+(0020,5000) AT RETIRED_OriginalImageIdentification 1-n DICOM/retired
+(0020,5002) LO RETIRED_OriginalImageIdentificationNomenclature 1-n DICOM/retired
+(0022,1094) LO RETIRED_LensConstantDescription 1 DICOM/retired
+(0022,1153) SQ RETIRED_OphthalmicAxialLengthAcquisitionMethodCodeSequence 1 DICOM/retired
+(0022,1265) SQ RETIRED_OphthalmicAxialLengthQualityMetricTypeCodeSequence 1 DICOM/retired
+(0022,1273) LO RETIRED_OphthalmicAxialLengthQualityMetricTypeDescription 1 DICOM/retired
+(0028,0005) US RETIRED_ImageDimensions 1 DICOM/retired
+(0028,0012) US RETIRED_Planes 1 DICOM/retired
+(0028,0040) CS RETIRED_ImageFormat 1 DICOM/retired
+(0028,0050) LO RETIRED_ManipulatedImage 1-n DICOM/retired
+(0028,005F) LO RETIRED_CompressionRecognitionCode 1 DICOM/retired
+(0028,0060) CS RETIRED_CompressionCode 1 DICOM/retired
+(0028,0061) SH RETIRED_CompressionOriginator 1 DICOM/retired
+(0028,0062) LO RETIRED_CompressionLabel 1 DICOM/retired
+(0028,0063) SH RETIRED_CompressionDescription 1 DICOM/retired
+(0028,0065) CS RETIRED_CompressionSequence 1-n DICOM/retired
+(0028,0066) AT RETIRED_CompressionStepPointers 1-n DICOM/retired
+(0028,0068) US RETIRED_RepeatInterval 1 DICOM/retired
+(0028,0069) US RETIRED_BitsGrouped 1 DICOM/retired
+(0028,0070) US RETIRED_PerimeterTable 1-n DICOM/retired
+(0028,0071) xs RETIRED_PerimeterValue 1 DICOM/retired
+(0028,0080) US RETIRED_PredictorRows 1 DICOM/retired
+(0028,0081) US RETIRED_PredictorColumns 1 DICOM/retired
+(0028,0082) US RETIRED_PredictorConstants 1-n DICOM/retired
+(0028,0090) CS RETIRED_BlockedPixels 1 DICOM/retired
+(0028,0091) US RETIRED_BlockRows 1 DICOM/retired
+(0028,0092) US RETIRED_BlockColumns 1 DICOM/retired
+(0028,0093) US RETIRED_RowOverlap 1 DICOM/retired
+(0028,0094) US RETIRED_ColumnOverlap 1 DICOM/retired
+(0028,0104) xs RETIRED_SmallestValidPixelValue 1 DICOM/retired
+(0028,0105) xs RETIRED_LargestValidPixelValue 1 DICOM/retired
+(0028,0110) xs RETIRED_SmallestImagePixelValueInPlane 1 DICOM/retired
+(0028,0111) xs RETIRED_LargestImagePixelValueInPlane 1 DICOM/retired
+(0028,0200) US RETIRED_ImageLocation 1 DICOM/retired
+(0028,0400) LO RETIRED_TransformLabel 1 DICOM/retired
+(0028,0401) LO RETIRED_TransformVersionNumber 1 DICOM/retired
+(0028,0402) US RETIRED_NumberOfTransformSteps 1 DICOM/retired
+(0028,0403) LO RETIRED_SequenceOfCompressedData 1-n DICOM/retired
+(0028,0404) AT RETIRED_DetailsOfCoefficients 1-n DICOM/retired
+#(0028,04X0) US RETIRED_RowsForNthOrderCoefficients 1 DICOM/retired
+#(0028,04X1) US RETIRED_ColumnsForNthOrderCoefficients 1 DICOM/retired
+#(0028,04X2) LO RETIRED_CoefficientCoding 1-n DICOM/retired
+#(0028,04X3) AT RETIRED_CoefficientCodingPointers 1-n DICOM/retired
+(0028,0700) LO RETIRED_DCTLabel 1 DICOM/retired
+(0028,0701) CS RETIRED_DataBlockDescription 1-n DICOM/retired
+(0028,0702) AT RETIRED_DataBlock 1-n DICOM/retired
+(0028,0710) US RETIRED_NormalizationFactorFormat 1 DICOM/retired
+(0028,0720) US RETIRED_ZonalMapNumberFormat 1 DICOM/retired
+(0028,0721) AT RETIRED_ZonalMapLocation 1-n DICOM/retired
+(0028,0722) US RETIRED_ZonalMapFormat 1 DICOM/retired
+(0028,0730) US RETIRED_AdaptiveMapFormat 1 DICOM/retired
+(0028,0740) US RETIRED_CodeNumberFormat 1 DICOM/retired
+#(0028,08X0) CS RETIRED_CodeLabel 1-n DICOM/retired
+#(0028,08X2) US RETIRED_NumberOfTables 1 DICOM/retired
+#(0028,08X3) AT RETIRED_CodeTableLocation 1-n DICOM/retired
+#(0028,08X4) US RETIRED_BitsForCodeWord 1 DICOM/retired
+#(0028,08X8) AT RETIRED_ImageDataLocation 1-n DICOM/retired
+(0028,1080) CS RETIRED_GrayScale 1 DICOM/retired
+(0028,1100) xs RETIRED_GrayLookupTableDescriptor 3 DICOM/retired
+(0028,1111) xs RETIRED_LargeRedPaletteColorLookupTableDescriptor 4 DICOM/retired
+(0028,1112) xs RETIRED_LargeGreenPaletteColorLookupTableDescriptor 4 DICOM/retired
+(0028,1113) xs RETIRED_LargeBluePaletteColorLookupTableDescriptor 4 DICOM/retired
+(0028,1200) lt RETIRED_GrayLookupTableData 1-n DICOM/retired
+(0028,1211) OW RETIRED_LargeRedPaletteColorLookupTableData 1 DICOM/retired
+(0028,1212) OW RETIRED_LargeGreenPaletteColorLookupTableData 1 DICOM/retired
+(0028,1213) OW RETIRED_LargeBluePaletteColorLookupTableData 1 DICOM/retired
+(0028,1214) UI RETIRED_LargePaletteColorLookupTableUID 1 DICOM/retired
+(0028,4000) LT RETIRED_ImagePresentationComments 1 DICOM/retired
+(0028,5000) SQ RETIRED_BiPlaneAcquisitionSequence 1 DICOM/retired
+(0028,6030) US RETIRED_MaskPointers 1-n DICOM/retired
+(0028,9099) US RETIRED_LargestMonochromePixelValue 1 DICOM/retired
+(0032,000A) CS RETIRED_StudyStatusID 1 DICOM/retired
+(0032,000C) CS RETIRED_StudyPriorityID 1 DICOM/retired
+(0032,0012) LO RETIRED_StudyIDIssuer 1 DICOM/retired
+(0032,0032) DA RETIRED_StudyVerifiedDate 1 DICOM/retired
+(0032,0033) TM RETIRED_StudyVerifiedTime 1 DICOM/retired
+(0032,0034) DA RETIRED_StudyReadDate 1 DICOM/retired
+(0032,0035) TM RETIRED_StudyReadTime 1 DICOM/retired
+(0032,1000) DA RETIRED_ScheduledStudyStartDate 1 DICOM/retired
+(0032,1001) TM RETIRED_ScheduledStudyStartTime 1 DICOM/retired
+(0032,1010) DA RETIRED_ScheduledStudyStopDate 1 DICOM/retired
+(0032,1011) TM RETIRED_ScheduledStudyStopTime 1 DICOM/retired
+(0032,1020) LO RETIRED_ScheduledStudyLocation 1 DICOM/retired
+(0032,1021) AE RETIRED_ScheduledStudyLocationAETitle 1-n DICOM/retired
+(0032,1030) LO RETIRED_ReasonForStudy 1 DICOM/retired
+(0032,1040) DA RETIRED_StudyArrivalDate 1 DICOM/retired
+(0032,1041) TM RETIRED_StudyArrivalTime 1 DICOM/retired
+(0032,1050) DA RETIRED_StudyCompletionDate 1 DICOM/retired
+(0032,1051) TM RETIRED_StudyCompletionTime 1 DICOM/retired
+(0032,1055) CS RETIRED_StudyComponentStatusID 1 DICOM/retired
+(0032,4000) LT RETIRED_StudyComments 1 DICOM/retired
+(0038,0011) LO RETIRED_IssuerOfAdmissionID 1 DICOM/retired
+(0038,001A) DA RETIRED_ScheduledAdmissionDate 1 DICOM/retired
+(0038,001B) TM RETIRED_ScheduledAdmissionTime 1 DICOM/retired
+(0038,001C) DA RETIRED_ScheduledDischargeDate 1 DICOM/retired
+(0038,001D) TM RETIRED_ScheduledDischargeTime 1 DICOM/retired
+(0038,001E) LO RETIRED_ScheduledPatientInstitutionResidence 1 DICOM/retired
+(0038,0030) DA RETIRED_DischargeDate 1 DICOM/retired
+(0038,0032) TM RETIRED_DischargeTime 1 DICOM/retired
+(0038,0040) LO RETIRED_DischargeDiagnosisDescription 1 DICOM/retired
+(0038,0044) SQ RETIRED_DischargeDiagnosisCodeSequence 1 DICOM/retired
+(0038,0061) LO RETIRED_IssuerOfServiceEpisodeID 1 DICOM/retired
+(0040,0307) DS RETIRED_DistanceSourceToSupport 1 DICOM/retired
+(0040,0330) SQ RETIRED_ReferencedProcedureStepSequence 1 DICOM/retired
+(0040,050A) LO RETIRED_SpecimenAccessionNumber 1 DICOM/retired
+(0040,0550) SQ RETIRED_SpecimenSequence 1 DICOM/retired
+(0040,0552) SQ RETIRED_SpecimenDescriptionSequenceTrial 1 DICOM/retired
+(0040,0553) ST RETIRED_SpecimenDescriptionTrial 1 DICOM/retired
+(0040,06FA) LO RETIRED_SlideIdentifier 1 DICOM/retired
+(0040,08D8) SQ RETIRED_PixelSpacingSequence 1 DICOM/retired
+(0040,08DA) SQ RETIRED_CoordinateSystemAxisCodeSequence 1 DICOM/retired
+(0040,09F8) SQ RETIRED_VitalStainCodeSequenceTrial 1 DICOM/retired
+(0040,1006) SH RETIRED_PlacerOrderNumberProcedure 1 DICOM/retired
+(0040,1007) SH RETIRED_FillerOrderNumberProcedure 1 DICOM/retired
+(0040,1060) LO RETIRED_RequestedProcedureDescriptionTrial 1 DICOM/retired
+(0040,2001) LO RETIRED_ReasonForTheImagingServiceRequest 1 DICOM/retired
+(0040,2006) SH RETIRED_PlacerOrderNumberImagingServiceRequestRetired 1 DICOM/retired
+(0040,2007) SH RETIRED_FillerOrderNumberImagingServiceRequestRetired 1 DICOM/retired
+(0040,4001) CS RETIRED_GeneralPurposeScheduledProcedureStepStatus 1 DICOM/retired
+(0040,4002) CS RETIRED_GeneralPurposePerformedProcedureStepStatus 1 DICOM/retired
+(0040,4003) CS RETIRED_GeneralPurposeScheduledProcedureStepPriority 1 DICOM/retired
+(0040,4004) SQ RETIRED_ScheduledProcessingApplicationsCodeSequence 1 DICOM/retired
+(0040,4006) CS RETIRED_MultipleCopiesFlag 1 DICOM/retired
+(0040,4015) SQ RETIRED_ResultingGeneralPurposePerformedProcedureStepsSequence 1 DICOM/retired
+(0040,4016) SQ RETIRED_ReferencedGeneralPurposeScheduledProcedureStepSequence 1 DICOM/retired
+(0040,4022) SQ RETIRED_RelevantInformationSequence 1 DICOM/retired
+(0040,4023) UI RETIRED_ReferencedGeneralPurposeScheduledProcedureStepTransactionUID 1 DICOM/retired
+(0040,4031) SQ RETIRED_RequestedSubsequentWorkitemCodeSequence 1 DICOM/retired
+(0040,4032) SQ RETIRED_NonDICOMOutputCodeSequence 1 DICOM/retired
+(0040,A007) CS RETIRED_FindingsFlagTrial 1 DICOM/retired
+(0040,A020) SQ RETIRED_FindingsSequenceTrial 1 DICOM/retired
+(0040,A021) UI RETIRED_FindingsGroupUIDTrial 1 DICOM/retired
+(0040,A022) UI RETIRED_ReferencedFindingsGroupUIDTrial 1 DICOM/retired
+(0040,A023) DA RETIRED_FindingsGroupRecordingDateTrial 1 DICOM/retired
+(0040,A024) TM RETIRED_FindingsGroupRecordingTimeTrial 1 DICOM/retired
+(0040,A026) SQ RETIRED_FindingsSourceCategoryCodeSequenceTrial 1 DICOM/retired
+(0040,A028) SQ RETIRED_DocumentingOrganizationIdentifierCodeSequenceTrial 1 DICOM/retired
+(0040,A047) LO RETIRED_MeasurementPrecisionDescriptionTrial 1 DICOM/retired
+(0040,A057) CS RETIRED_UrgencyOrPriorityAlertsTrial 1-n DICOM/retired
+(0040,A060) LO RETIRED_SequencingIndicatorTrial 1 DICOM/retired
+(0040,A066) SQ RETIRED_DocumentIdentifierCodeSequenceTrial 1 DICOM/retired
+(0040,A067) PN RETIRED_DocumentAuthorTrial 1 DICOM/retired
+(0040,A068) SQ RETIRED_DocumentAuthorIdentifierCodeSequenceTrial 1 DICOM/retired
+(0040,A070) SQ RETIRED_IdentifierCodeSequenceTrial 1 DICOM/retired
+(0040,A074) OB RETIRED_ObjectBinaryIdentifierTrial 1 DICOM/retired
+(0040,A076) SQ RETIRED_DocumentingObserverIdentifierCodeSequenceTrial 1 DICOM/retired
+(0040,A085) SQ RETIRED_ProcedureIdentifierCodeSequenceTrial 1 DICOM/retired
+(0040,A089) OB RETIRED_ObjectDirectoryBinaryIdentifierTrial 1 DICOM/retired
+(0040,A090) SQ RETIRED_EquivalentCDADocumentSequence 1 DICOM/retired
+(0040,A110) DA RETIRED_DateOfDocumentOrVerbalTransactionTrial 1 DICOM/retired
+(0040,A112) TM RETIRED_TimeOfDocumentCreationOrVerbalTransactionTrial 1 DICOM/retired
+(0040,A125) CS RETIRED_ReportStatusIDTrial 2 DICOM/retired
+(0040,A167) SQ RETIRED_ObservationCategoryCodeSequenceTrial 1 DICOM/retired
+(0040,A16A) ST RETIRED_BibliographicCitationTrial 1 DICOM/retired
+(0040,A172) UI RETIRED_ReferencedObservationUIDTrial 1 DICOM/retired
+(0040,A173) CS RETIRED_ReferencedObservationClassTrial 1 DICOM/retired
+(0040,A174) CS RETIRED_ReferencedObjectObservationClassTrial 1 DICOM/retired
+(0040,A192) DA RETIRED_ObservationDateTrial 1 DICOM/retired
+(0040,A193) TM RETIRED_ObservationTimeTrial 1 DICOM/retired
+(0040,A194) CS RETIRED_MeasurementAutomationTrial 1 DICOM/retired
+(0040,A224) ST RETIRED_IdentificationDescriptionTrial 1 DICOM/retired
+(0040,A290) CS RETIRED_CoordinatesSetGeometricTypeTrial 1 DICOM/retired
+(0040,A296) SQ RETIRED_AlgorithmCodeSequenceTrial 1 DICOM/retired
+(0040,A297) ST RETIRED_AlgorithmDescriptionTrial 1 DICOM/retired
+(0040,A29A) SL RETIRED_PixelCoordinatesSetTrial 2-2n DICOM/retired
+(0040,A307) PN RETIRED_CurrentObserverTrial 1 DICOM/retired
+(0040,A313) SQ RETIRED_ReferencedAccessionSequenceTrial 1 DICOM/retired
+(0040,A33A) ST RETIRED_ReportStatusCommentTrial 1 DICOM/retired
+(0040,A340) SQ RETIRED_ProcedureContextSequenceTrial 1 DICOM/retired
+(0040,A352) PN RETIRED_VerbalSourceTrial 1 DICOM/retired
+(0040,A353) ST RETIRED_AddressTrial 1 DICOM/retired
+(0040,A354) LO RETIRED_TelephoneNumberTrial 1 DICOM/retired
+(0040,A358) SQ RETIRED_VerbalSourceIdentifierCodeSequenceTrial 1 DICOM/retired
+(0040,A380) SQ RETIRED_ReportDetailSequenceTrial 1 DICOM/retired
+(0040,A402) UI RETIRED_ObservationSubjectUIDTrial 1 DICOM/retired
+(0040,A403) CS RETIRED_ObservationSubjectClassTrial 1 DICOM/retired
+(0040,A404) SQ RETIRED_ObservationSubjectTypeCodeSequenceTrial 1 DICOM/retired
+(0040,A600) CS RETIRED_ObservationSubjectContextFlagTrial 1 DICOM/retired
+(0040,A601) CS RETIRED_ObserverContextFlagTrial 1 DICOM/retired
+(0040,A603) CS RETIRED_ProcedureContextFlagTrial 1 DICOM/retired
+(0040,A731) SQ RETIRED_RelationshipSequenceTrial 1 DICOM/retired
+(0040,A732) SQ RETIRED_RelationshipTypeCodeSequenceTrial 1 DICOM/retired
+(0040,A744) SQ RETIRED_LanguageCodeSequenceTrial 1 DICOM/retired
+(0040,A992) ST RETIRED_UniformResourceLocatorTrial 1 DICOM/retired
+(0040,DB06) DT RETIRED_TemplateVersion 1 DICOM/retired
+(0040,DB07) DT RETIRED_TemplateLocalVersion 1 DICOM/retired
+(0040,DB0B) CS RETIRED_TemplateExtensionFlag 1 DICOM/retired
+(0040,DB0C) UI RETIRED_TemplateExtensionOrganizationUID 1 DICOM/retired
+(0040,DB0D) UI RETIRED_TemplateExtensionCreatorUID 1 DICOM/retired
+(0054,1400) CS RETIRED_CountsIncluded 1-n DICOM/retired
+(0054,1401) CS RETIRED_DeadTimeCorrectionFlag 1 DICOM/retired
+(0066,0023) OW RETIRED_TrianglePointIndexList 1 DICOM/retired
+(0066,0024) OW RETIRED_EdgePointIndexList 1 DICOM/retired
+(0066,0025) OW RETIRED_VertexPointIndexList 1 DICOM/retired
+(0066,0029) OW RETIRED_PrimitivePointIndexList 1 DICOM/retired
+(0070,0040) IS RETIRED_ImageRotationRetired 1 DICOM/retired
+(0070,0050) US RETIRED_DisplayedAreaTopLeftHandCornerTrial 2 DICOM/retired
+(0070,0051) US RETIRED_DisplayedAreaBottomRightHandCornerTrial 2 DICOM/retired
+(0070,0067) US RETIRED_GraphicLayerRecommendedDisplayRGBValue 3 DICOM/retired
+(0074,1024) IS RETIRED_BeamOrderIndexTrial 1 DICOM/retired
+(0074,1038) DS RETIRED_DoubleExposureMetersetTrial 1 DICOM/retired
+(0074,103A) DS RETIRED_DoubleExposureFieldDeltaTrial 4 DICOM/retired
+(0074,1220) SQ RETIRED_RelatedProcedureStepSequence 1 DICOM/retired
+(0074,1222) LO RETIRED_ProcedureStepRelationshipType 1 DICOM/retired
+(0088,0904) LO RETIRED_TopicTitle 1 DICOM/retired
+(0088,0906) ST RETIRED_TopicSubject 1 DICOM/retired
+(0088,0910) LO RETIRED_TopicAuthor 1 DICOM/retired
+(0088,0912) LO RETIRED_TopicKeywords 1-32 DICOM/retired
+#(1000,XX00-XXFF) US RETIRED_EscapeTriplet 3 DICOM/retired
+#(1000,XX00-XXFF) US RETIRED_RunLengthTriplet 3 DICOM/retired
+#(1000,XX00-XXFF) US RETIRED_HuffmanTableSize 1 DICOM/retired
+#(1000,XX00-XXFF) US RETIRED_HuffmanTableTriplet 3 DICOM/retired
+#(1000,XX00-XXFF) US RETIRED_ShiftTableSize 1 DICOM/retired
+#(1000,XX00-XXFF) US RETIRED_ShiftTableTriplet 3 DICOM/retired
+#(1010,XX00-XXFF) US RETIRED_ZonalMap 1-n DICOM/retired
+(2000,0062) CS RETIRED_ColorImagePrintingFlag 1 DICOM/retired
+(2000,0063) CS RETIRED_CollationFlag 1 DICOM/retired
+(2000,0065) CS RETIRED_AnnotationFlag 1 DICOM/retired
+(2000,0067) CS RETIRED_ImageOverlayFlag 1 DICOM/retired
+(2000,0069) CS RETIRED_PresentationLUTFlag 1 DICOM/retired
+(2000,006A) CS RETIRED_ImageBoxPresentationLUTFlag 1 DICOM/retired
+(2000,0510) SQ RETIRED_ReferencedStoredPrintSequence 1 DICOM/retired
+(2020,0130) SQ RETIRED_ReferencedImageOverlayBoxSequence 1 DICOM/retired
+(2020,0140) SQ RETIRED_ReferencedVOILUTBoxSequence 1 DICOM/retired
+(2040,0010) SQ RETIRED_ReferencedOverlayPlaneSequence 1 DICOM/retired
+(2040,0011) US RETIRED_ReferencedOverlayPlaneGroups 1-99 DICOM/retired
+(2040,0020) SQ RETIRED_OverlayPixelDataSequence 1 DICOM/retired
+(2040,0060) CS RETIRED_OverlayMagnificationType 1 DICOM/retired
+(2040,0070) CS RETIRED_OverlaySmoothingType 1 DICOM/retired
+(2040,0072) CS RETIRED_OverlayOrImageMagnification 1 DICOM/retired
+(2040,0074) US RETIRED_MagnifyToNumberOfColumns 1 DICOM/retired
+(2040,0080) CS RETIRED_OverlayForegroundDensity 1 DICOM/retired
+(2040,0082) CS RETIRED_OverlayBackgroundDensity 1 DICOM/retired
+(2040,0090) CS RETIRED_OverlayMode 1 DICOM/retired
+(2040,0100) CS RETIRED_ThresholdDensity 1 DICOM/retired
+(2040,0500) SQ RETIRED_ReferencedImageBoxSequenceRetired 1 DICOM/retired
+(2100,0010) SH RETIRED_PrintJobID 1 DICOM/retired
+(2100,0500) SQ RETIRED_ReferencedPrintJobSequencePullStoredPrint 1 DICOM/retired
+(2110,0099) SH RETIRED_PrintQueueID 1 DICOM/retired
+(2120,0010) CS RETIRED_QueueStatus 1 DICOM/retired
+(2120,0050) SQ RETIRED_PrintJobDescriptionSequence 1 DICOM/retired
+(2120,0070) SQ RETIRED_ReferencedPrintJobSequence 1 DICOM/retired
+(2130,0010) SQ RETIRED_PrintManagementCapabilitiesSequence 1 DICOM/retired
+(2130,0015) SQ RETIRED_PrinterCharacteristicsSequence 1 DICOM/retired
+(2130,0030) SQ RETIRED_FilmBoxContentSequence 1 DICOM/retired
+(2130,0040) SQ RETIRED_ImageBoxContentSequence 1 DICOM/retired
+(2130,0050) SQ RETIRED_AnnotationContentSequence 1 DICOM/retired
+(2130,0060) SQ RETIRED_ImageOverlayBoxContentSequence 1 DICOM/retired
+(2130,0080) SQ RETIRED_PresentationLUTContentSequence 1 DICOM/retired
+(2130,00A0) SQ RETIRED_ProposedStudySequence 1 DICOM/retired
+(2130,00C0) SQ RETIRED_OriginalImageSequence 1 DICOM/retired
+(3006,00C0) SQ RETIRED_FrameOfReferenceRelationshipSequence 1 DICOM/retired
+(3006,00C2) UI RETIRED_RelatedFrameOfReferenceUID 1 DICOM/retired
+(3006,00C4) CS RETIRED_FrameOfReferenceTransformationType 1 DICOM/retired
+(300A,0088) FL RETIRED_BeamDosePointDepth 1 DICOM/retired
+(300A,0089) FL RETIRED_BeamDosePointEquivalentDepth 1 DICOM/retired
+(300A,008A) FL RETIRED_BeamDosePointSSD 1 DICOM/retired
+(4000,0010) LT RETIRED_Arbitrary 1 DICOM/retired
+(4000,4000) LT RETIRED_TextComments 1 DICOM/retired
+(4008,0040) SH RETIRED_ResultsID 1 DICOM/retired
+(4008,0042) LO RETIRED_ResultsIDIssuer 1 DICOM/retired
+(4008,0050) SQ RETIRED_ReferencedInterpretationSequence 1 DICOM/retired
+(4008,00FF) CS RETIRED_ReportProductionStatusTrial 1 DICOM/retired
+(4008,0100) DA RETIRED_InterpretationRecordedDate 1 DICOM/retired
+(4008,0101) TM RETIRED_InterpretationRecordedTime 1 DICOM/retired
+(4008,0102) PN RETIRED_InterpretationRecorder 1 DICOM/retired
+(4008,0103) LO RETIRED_ReferenceToRecordedSound 1 DICOM/retired
+(4008,0108) DA RETIRED_InterpretationTranscriptionDate 1 DICOM/retired
+(4008,0109) TM RETIRED_InterpretationTranscriptionTime 1 DICOM/retired
+(4008,010A) PN RETIRED_InterpretationTranscriber 1 DICOM/retired
+(4008,010B) ST RETIRED_InterpretationText 1 DICOM/retired
+(4008,010C) PN RETIRED_InterpretationAuthor 1 DICOM/retired
+(4008,0111) SQ RETIRED_InterpretationApproverSequence 1 DICOM/retired
+(4008,0112) DA RETIRED_InterpretationApprovalDate 1 DICOM/retired
+(4008,0113) TM RETIRED_InterpretationApprovalTime 1 DICOM/retired
+(4008,0114) PN RETIRED_PhysicianApprovingInterpretation 1 DICOM/retired
+(4008,0115) LT RETIRED_InterpretationDiagnosisDescription 1 DICOM/retired
+(4008,0117) SQ RETIRED_InterpretationDiagnosisCodeSequence 1 DICOM/retired
+(4008,0118) SQ RETIRED_ResultsDistributionListSequence 1 DICOM/retired
+(4008,0119) PN RETIRED_DistributionName 1 DICOM/retired
+(4008,011A) LO RETIRED_DistributionAddress 1 DICOM/retired
+(4008,0200) SH RETIRED_InterpretationID 1 DICOM/retired
+(4008,0202) LO RETIRED_InterpretationIDIssuer 1 DICOM/retired
+(4008,0210) CS RETIRED_InterpretationTypeID 1 DICOM/retired
+(4008,0212) CS RETIRED_InterpretationStatusID 1 DICOM/retired
+(4008,0300) ST RETIRED_Impressions 1 DICOM/retired
+(4008,4000) ST RETIRED_ResultsComments 1 DICOM/retired
+(5000-50FF,0005) US RETIRED_CurveDimensions 1 DICOM/retired
+(5000-50FF,0010) US RETIRED_NumberOfPoints 1 DICOM/retired
+(5000-50FF,0020) CS RETIRED_TypeOfData 1 DICOM/retired
+(5000-50FF,0022) LO RETIRED_CurveDescription 1 DICOM/retired
+(5000-50FF,0030) SH RETIRED_AxisUnits 1-n DICOM/retired
+(5000-50FF,0040) SH RETIRED_AxisLabels 1-n DICOM/retired
+(5000-50FF,0103) US RETIRED_DataValueRepresentation 1 DICOM/retired
+(5000-50FF,0104) US RETIRED_MinimumCoordinateValue 1-n DICOM/retired
+(5000-50FF,0105) US RETIRED_MaximumCoordinateValue 1-n DICOM/retired
+(5000-50FF,0106) SH RETIRED_CurveRange 1-n DICOM/retired
+(5000-50FF,0110) US RETIRED_CurveDataDescriptor 1-n DICOM/retired
+(5000-50FF,0112) US RETIRED_CoordinateStartValue 1-n DICOM/retired
+(5000-50FF,0114) US RETIRED_CoordinateStepValue 1-n DICOM/retired
+(5000-50FF,1001) CS RETIRED_CurveActivationLayer 1 DICOM/retired
+(5000-50FF,2000) US RETIRED_AudioType 1 DICOM/retired
+(5000-50FF,2002) US RETIRED_AudioSampleFormat 1 DICOM/retired
+(5000-50FF,2004) US RETIRED_NumberOfChannels 1 DICOM/retired
+(5000-50FF,2006) UL RETIRED_NumberOfSamples 1 DICOM/retired
+(5000-50FF,2008) UL RETIRED_SampleRate 1 DICOM/retired
+(5000-50FF,200A) UL RETIRED_TotalTime 1 DICOM/retired
+(5000-50FF,200C) ox RETIRED_AudioSampleData 1 DICOM/retired
+(5000-50FF,200E) LT RETIRED_AudioComments 1 DICOM/retired
+(5000-50FF,2500) LO RETIRED_CurveLabel 1 DICOM/retired
+(5000-50FF,2600) SQ RETIRED_CurveReferencedOverlaySequence 1 DICOM/retired
+(5000-50FF,2610) US RETIRED_CurveReferencedOverlayGroup 1 DICOM/retired
+(5000-50FF,3000) ox RETIRED_CurveData 1 DICOM/retired
+(6000-60FF,0012) US RETIRED_OverlayPlanes 1 DICOM/retired
+(6000-60FF,0052) US RETIRED_OverlayPlaneOrigin 1 DICOM/retired
+(6000-60FF,0060) CS RETIRED_OverlayCompressionCode 1 DICOM/retired
+(6000-60FF,0061) SH RETIRED_OverlayCompressionOriginator 1 DICOM/retired
+(6000-60FF,0062) SH RETIRED_OverlayCompressionLabel 1 DICOM/retired
+(6000-60FF,0063) CS RETIRED_OverlayCompressionDescription 1 DICOM/retired
+(6000-60FF,0066) AT RETIRED_OverlayCompressionStepPointers 1-n DICOM/retired
+(6000-60FF,0068) US RETIRED_OverlayRepeatInterval 1 DICOM/retired
+(6000-60FF,0069) US RETIRED_OverlayBitsGrouped 1 DICOM/retired
+(6000-60FF,0110) CS RETIRED_OverlayFormat 1 DICOM/retired
+(6000-60FF,0200) US RETIRED_OverlayLocation 1 DICOM/retired
+(6000-60FF,0800) CS RETIRED_OverlayCodeLabel 1-n DICOM/retired
+(6000-60FF,0802) US RETIRED_OverlayNumberOfTables 1 DICOM/retired
+(6000-60FF,0803) AT RETIRED_OverlayCodeTableLocation 1-n DICOM/retired
+(6000-60FF,0804) US RETIRED_OverlayBitsForCodeWord 1 DICOM/retired
+(6000-60FF,1100) US RETIRED_OverlayDescriptorGray 1 DICOM/retired
+(6000-60FF,1101) US RETIRED_OverlayDescriptorRed 1 DICOM/retired
+(6000-60FF,1102) US RETIRED_OverlayDescriptorGreen 1 DICOM/retired
+(6000-60FF,1103) US RETIRED_OverlayDescriptorBlue 1 DICOM/retired
+(6000-60FF,1200) US RETIRED_OverlaysGray 1-n DICOM/retired
+(6000-60FF,1201) US RETIRED_OverlaysRed 1-n DICOM/retired
+(6000-60FF,1202) US RETIRED_OverlaysGreen 1-n DICOM/retired
+(6000-60FF,1203) US RETIRED_OverlaysBlue 1-n DICOM/retired
+(6000-60FF,4000) LT RETIRED_OverlayComments 1 DICOM/retired
+(7FE0,0020) OW RETIRED_CoefficientsSDVN 1 DICOM/retired
+(7FE0,0030) OW RETIRED_CoefficientsSDHN 1 DICOM/retired
+(7FE0,0040) OW RETIRED_CoefficientsSDDN 1 DICOM/retired
+(7F00-7FFF,0010) ox RETIRED_VariablePixelData 1 DICOM/retired
+(7F00-7FFF,0011) US RETIRED_VariableNextDataGroup 1 DICOM/retired
+(7F00-7FFF,0020) OW RETIRED_VariableCoefficientsSDVN 1 DICOM/retired
+(7F00-7FFF,0030) OW RETIRED_VariableCoefficientsSDHN 1 DICOM/retired
+(7F00-7FFF,0040) OW RETIRED_VariableCoefficientsSDDN 1 DICOM/retired
#
#---------------------------------------------------------------------------
#
diff --git a/dcmdata/docs/dcmgpdir.man b/dcmdata/docs/dcmgpdir.man
index 6c2a671..ff287ab 100644
--- a/dcmdata/docs/dcmgpdir.man
+++ b/dcmdata/docs/dcmgpdir.man
@@ -24,8 +24,8 @@ Currently, the following profiles are supported:
\li General Purpose Interchange on DVD-RAM Media (STD-GEN-DVD-RAM)
\b dcmmkdir is an extended version of this tool which also supports other
-Media Storage Application Profiles than the general purpose one (e.g. both
-cardio profiles requiring the use of icon images).
+Media Storage Application Profiles than the general purpose one (e.g. the
+cardio profiles require the use of icon images).
\section parameters PARAMETERS
@@ -296,6 +296,6 @@ It is an error if no data dictionary can be loaded.
\section copyright COPYRIGHT
-Copyright (C) 1996-2014 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany.
+Copyright (C) 1996-2016 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany.
*/
diff --git a/dcmdata/docs/img2dcm.man b/dcmdata/docs/img2dcm.man
index 3998999..53c6d07 100644
--- a/dcmdata/docs/img2dcm.man
+++ b/dcmdata/docs/img2dcm.man
@@ -335,8 +335,8 @@ such data. JFIF information is \b always removed by \b img2dcm.
\subsubsection bmp_input_plugin BMP Input Plugin
-\b img2dcm supports BMP as input format. However, so far only the most commmon
-BMP images are supported. In particular, BMP images which use bitfields or
+\b img2dcm supports BMP as input format. However, so far only the most common
+BMP images are supported. In particular, BMP images which use bit fields or
run length encoding will be rejected. Such images are uncommon. All input images
will be converted into a DICOM image with RGB color model and a bit depth of 24.
There are no specific options for fine-tuning BMP format conversion.
@@ -386,7 +386,7 @@ left empty.
<li>
img2dcm image.jpg out.dcm --series-from template.dcm -k
"PatientName=Bond^James"
-<br>Same as 1), but imports patient/study/series infomation from DICOM file
+<br>Same as 1), but imports patient/study/series information from DICOM file
"template.dcm". Please note that attribute PatientName will contain
"Bond^James" at the end, any value from "template.dcm" will be overwritten.
That is, because the -k option is applied at the very end of the conversion
@@ -491,6 +491,6 @@ images
\section copyright COPYRIGHT
-Copyright (C) 2007-2014 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany.
+Copyright (C) 2007-2016 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany.
*/
diff --git a/dcmdata/include/dcmtk/dcmdata/dcbytstr.h b/dcmdata/include/dcmtk/dcmdata/dcbytstr.h
index 1c0077d..3b739e2 100644
--- a/dcmdata/include/dcmtk/dcmdata/dcbytstr.h
+++ b/dcmdata/include/dcmtk/dcmdata/dcbytstr.h
@@ -30,6 +30,12 @@
#include "dcmtk/ofstd/ofstring.h"
+// include this file in doxygen documentation
+
+/** @file dcbytstr.h
+ * @brief base class for all DICOM value representations storing a character string
+ */
+
/** This flag defines whether the VR checker is actually used by the various
* checkStringValue() methods. Since this checker is currently limited to
* ASCII and Latin-1, and the detection of the character set might fail for
@@ -75,7 +81,7 @@ class DCMTK_DCMDATA_EXPORT DcmByteString: public DcmElement
* with a given object of the same type. The tag of the element is also
* considered as the first component that is compared, followed by the
* object types (VR, i.e. DCMTK'S EVR) and the comparison of all value
- * components of the object, preferrably in the order declared in the
+ * components of the object, preferably in the order declared in the
* object (if applicable).
* @param rhs the right hand side of the comparison
* @return 0 if the object values are equal.
@@ -349,6 +355,19 @@ class DCMTK_DCMDATA_EXPORT DcmByteString: public DcmElement
/* --- static helper functions --- */
+ /** check if a given character string contains non-ASCII characters.
+ * Please note that this check is pretty simple and only works for single-byte character
+ * sets that do include the 7-bit ASCII codes, e.g. for the ISO 8859 family. In other
+ * words: All character codes below 128 are considered to be ASCII codes and all others
+ * are considered to be non-ASCII.
+ * @param stringVal character string to be checked
+ * @param stringLen length of the string (number of characters without the trailing
+ * NULL byte)
+ * @return true if character string contains non-ASCII characters, false otherwise
+ */
+ static OFBool containsExtendedCharacters(const char *stringVal,
+ const size_t stringLen);
+
/** check whether given string value conforms to a certain VR and VM.
* @param value string value to be checked (possibly multi-valued)
* @param vm value multiplicity (according to the data dictionary) to be checked for.
diff --git a/dcmdata/include/dcmtk/dcmdata/dcddirif.h b/dcmdata/include/dcmtk/dcmdata/dcddirif.h
index 3ffc06d..4f0e273 100644
--- a/dcmdata/include/dcmtk/dcmdata/dcddirif.h
+++ b/dcmdata/include/dcmtk/dcmdata/dcddirif.h
@@ -1092,6 +1092,18 @@ class DCMTK_DCMDATA_EXPORT DicomDirInterface
const OFString &referencedFileID,
const OFFilename &sourceFilename);
+ /** create or update assessment record and copy required values from dataset
+ * @param record record to be updated, use NULL to create a new one
+ * @param fileformat DICOM dataset of the current file
+ * @param referencedFileID value of the Referenced File ID attribute
+ * @param sourceFilename name of the source DICOM file
+ * @return pointer to new or updated record, NULL if an error occurred
+ */
+ DcmDirectoryRecord *buildAssessmentRecord(DcmDirectoryRecord *record,
+ DcmFileFormat *fileformat,
+ const OFString &referencedFileID,
+ const OFFilename &sourceFilename);
+
/** create or update image record and copy required values from dataset
* @param record record to be updated, use NULL to create a new one
* @param fileformat DICOM dataset of the current file
diff --git a/dcmdata/include/dcmtk/dcmdata/dcdeftag.h b/dcmdata/include/dcmtk/dcmdata/dcdeftag.h
index 829d379..87606fc 100644
--- a/dcmdata/include/dcmtk/dcmdata/dcdeftag.h
+++ b/dcmdata/include/dcmtk/dcmdata/dcdeftag.h
@@ -4,7 +4,7 @@
**
** User: joergr
** Host: thinkpad
-** Date: 2016-01-25 17:53:33
+** Date: 2016-06-13 09:57:12
** Prog: /home/joergr/Source/dcmtk-full/public/dcmdata/libsrc/mkdeftag
**
** From: ../data/dicom.dic
@@ -17,12 +17,12 @@
#include "dcmtk/dcmdata/dctagkey.h"
-#define DCM_DICT_DEFTAG_BUILD_DATE "2016-01-25 17:53:33"
+#define DCM_DICT_DEFTAG_BUILD_DATE "2016-06-13 09:57:12"
/*
** Fixed Tags in ascending (gggg,eeee) order.
-** Number of entries: 4019
+** Number of entries: 4085
** Tags with a repeating component (repeating tags) are listed later.
*/
#define DCM_CommandGroupLength DcmTagKey(0x0000, 0x0000)
@@ -177,6 +177,9 @@
#define DCM_LongCodeValue DcmTagKey(0x0008, 0x0119)
#define DCM_URNCodeValue DcmTagKey(0x0008, 0x0120)
#define DCM_EquivalentCodeSequence DcmTagKey(0x0008, 0x0121)
+#define DCM_MappingResourceName DcmTagKey(0x0008, 0x0122)
+#define DCM_ContextGroupIdentificationSequence DcmTagKey(0x0008, 0x0123)
+#define DCM_MappingResourceIdentificationSequence DcmTagKey(0x0008, 0x0124)
#define DCM_TimezoneOffsetFromUTC DcmTagKey(0x0008, 0x0201)
#define DCM_PrivateDataElementCharacteristicsSequence DcmTagKey(0x0008, 0x0300)
#define DCM_PrivateGroupReference DcmTagKey(0x0008, 0x0301)
@@ -306,6 +309,9 @@
#define DCM_SubjectRelativePositionInImage DcmTagKey(0x0010, 0x0028)
#define DCM_PatientBirthDate DcmTagKey(0x0010, 0x0030)
#define DCM_PatientBirthTime DcmTagKey(0x0010, 0x0032)
+#define DCM_PatientBirthDateInAlternativeCalendar DcmTagKey(0x0010, 0x0033)
+#define DCM_PatientDeathDateInAlternativeCalendar DcmTagKey(0x0010, 0x0034)
+#define DCM_PatientAlternativeCalendar DcmTagKey(0x0010, 0x0035)
#define DCM_PatientSex DcmTagKey(0x0010, 0x0040)
#define DCM_PatientInsurancePlanCodeSequence DcmTagKey(0x0010, 0x0050)
#define DCM_PatientPrimaryLanguageCodeSequence DcmTagKey(0x0010, 0x0101)
@@ -397,6 +403,15 @@
#define DCM_CurvatureType DcmTagKey(0x0014, 0x0052)
#define DCM_OuterDiameter DcmTagKey(0x0014, 0x0054)
#define DCM_InnerDiameter DcmTagKey(0x0014, 0x0056)
+#define DCM_ComponentWelderIDs DcmTagKey(0x0014, 0x0100)
+#define DCM_SecondaryApprovalStatus DcmTagKey(0x0014, 0x0101)
+#define DCM_SecondaryReviewDate DcmTagKey(0x0014, 0x0102)
+#define DCM_SecondaryReviewTime DcmTagKey(0x0014, 0x0103)
+#define DCM_SecondaryReviewerName DcmTagKey(0x0014, 0x0104)
+#define DCM_RepairID DcmTagKey(0x0014, 0x0105)
+#define DCM_MultipleComponentApprovalSequence DcmTagKey(0x0014, 0x0106)
+#define DCM_OtherApprovalStatus DcmTagKey(0x0014, 0x0107)
+#define DCM_OtherSecondaryApprovalStatus DcmTagKey(0x0014, 0x0108)
#define DCM_ActualEnvironmentalConditions DcmTagKey(0x0014, 0x1010)
#define DCM_ExpiryDate DcmTagKey(0x0014, 0x1020)
#define DCM_EnvironmentalConditions DcmTagKey(0x0014, 0x1040)
@@ -743,6 +758,8 @@
#define DCM_TransmitCoilName DcmTagKey(0x0018, 0x1251)
#define DCM_PlateType DcmTagKey(0x0018, 0x1260)
#define DCM_PhosphorType DcmTagKey(0x0018, 0x1261)
+#define DCM_WaterEquivalentDiameter DcmTagKey(0x0018, 0x1271)
+#define DCM_WaterEquivalentDiameterCalculationMethodCodeSequence DcmTagKey(0x0018, 0x1272)
#define DCM_ScanVelocity DcmTagKey(0x0018, 0x1300)
#define DCM_WholeBodyTechnique DcmTagKey(0x0018, 0x1301)
#define DCM_ScanLength DcmTagKey(0x0018, 0x1302)
@@ -1241,6 +1258,10 @@
#define DCM_DiffusionBValueYY DcmTagKey(0x0018, 0x9605)
#define DCM_DiffusionBValueYZ DcmTagKey(0x0018, 0x9606)
#define DCM_DiffusionBValueZZ DcmTagKey(0x0018, 0x9607)
+#define DCM_FunctionalMRSequence DcmTagKey(0x0018, 0x9621)
+#define DCM_FunctionalSettlingPhaseFramesPresent DcmTagKey(0x0018, 0x9622)
+#define DCM_FunctionalSyncPulse DcmTagKey(0x0018, 0x9623)
+#define DCM_SettlingPhaseFrame DcmTagKey(0x0018, 0x9624)
#define DCM_DecayCorrectionDateTime DcmTagKey(0x0018, 0x9701)
#define DCM_StartDensityThreshold DcmTagKey(0x0018, 0x9715)
#define DCM_StartRelativeDensityDifferenceThreshold DcmTagKey(0x0018, 0x9716)
@@ -2632,13 +2653,13 @@
#define DCM_VectorDimensionality DcmTagKey(0x0066, 0x001f)
#define DCM_VectorAccuracy DcmTagKey(0x0066, 0x0020)
#define DCM_VectorCoordinateData DcmTagKey(0x0066, 0x0021)
-#define DCM_TrianglePointIndexList DcmTagKey(0x0066, 0x0023)
-#define DCM_EdgePointIndexList DcmTagKey(0x0066, 0x0024)
-#define DCM_VertexPointIndexList DcmTagKey(0x0066, 0x0025)
+#define DCM_RETIRED_TrianglePointIndexList DcmTagKey(0x0066, 0x0023)
+#define DCM_RETIRED_EdgePointIndexList DcmTagKey(0x0066, 0x0024)
+#define DCM_RETIRED_VertexPointIndexList DcmTagKey(0x0066, 0x0025)
#define DCM_TriangleStripSequence DcmTagKey(0x0066, 0x0026)
#define DCM_TriangleFanSequence DcmTagKey(0x0066, 0x0027)
#define DCM_LineSequence DcmTagKey(0x0066, 0x0028)
-#define DCM_PrimitivePointIndexList DcmTagKey(0x0066, 0x0029)
+#define DCM_RETIRED_PrimitivePointIndexList DcmTagKey(0x0066, 0x0029)
#define DCM_SurfaceCount DcmTagKey(0x0066, 0x002a)
#define DCM_ReferencedSurfaceSequence DcmTagKey(0x0066, 0x002b)
#define DCM_ReferencedSurfaceNumber DcmTagKey(0x0066, 0x002c)
@@ -2866,8 +2887,8 @@
#define DCM_VolumeCroppingMethod DcmTagKey(0x0070, 0x1302)
#define DCM_BoundingBoxCrop DcmTagKey(0x0070, 0x1303)
#define DCM_ObliqueCroppingPlaneSequence DcmTagKey(0x0070, 0x1304)
-#define DCM_ObliqueCroppingPlane DcmTagKey(0x0070, 0x1305)
-#define DCM_ObliqueCroppingPlaneNormal DcmTagKey(0x0070, 0x1306)
+#define DCM_Plane DcmTagKey(0x0070, 0x1305)
+#define DCM_PlaneNormal DcmTagKey(0x0070, 0x1306)
#define DCM_CroppingSpecificationNumber DcmTagKey(0x0070, 0x1309)
#define DCM_MultiPlanarReconstructionStyle DcmTagKey(0x0070, 0x1501)
#define DCM_MPRThicknessType DcmTagKey(0x0070, 0x1502)
@@ -2923,17 +2944,30 @@
#define DCM_SelectorSequencePointer DcmTagKey(0x0072, 0x0052)
#define DCM_SelectorSequencePointerPrivateCreator DcmTagKey(0x0072, 0x0054)
#define DCM_SelectorAttributePrivateCreator DcmTagKey(0x0072, 0x0056)
+#define DCM_SelectorAEValue DcmTagKey(0x0072, 0x005e)
+#define DCM_SelectorASValue DcmTagKey(0x0072, 0x005f)
#define DCM_SelectorATValue DcmTagKey(0x0072, 0x0060)
+#define DCM_SelectorDAValue DcmTagKey(0x0072, 0x0061)
#define DCM_SelectorCSValue DcmTagKey(0x0072, 0x0062)
+#define DCM_SelectorDTValue DcmTagKey(0x0072, 0x0063)
#define DCM_SelectorISValue DcmTagKey(0x0072, 0x0064)
+#define DCM_SelectorOBValue DcmTagKey(0x0072, 0x0065)
#define DCM_SelectorLOValue DcmTagKey(0x0072, 0x0066)
+#define DCM_SelectorOFValue DcmTagKey(0x0072, 0x0067)
#define DCM_SelectorLTValue DcmTagKey(0x0072, 0x0068)
+#define DCM_SelectorOWValue DcmTagKey(0x0072, 0x0069)
#define DCM_SelectorPNValue DcmTagKey(0x0072, 0x006a)
+#define DCM_SelectorTMValue DcmTagKey(0x0072, 0x006b)
#define DCM_SelectorSHValue DcmTagKey(0x0072, 0x006c)
+#define DCM_SelectorUNValue DcmTagKey(0x0072, 0x006d)
#define DCM_SelectorSTValue DcmTagKey(0x0072, 0x006e)
+#define DCM_SelectorUCValue DcmTagKey(0x0072, 0x006f)
#define DCM_SelectorUTValue DcmTagKey(0x0072, 0x0070)
+#define DCM_SelectorURValue DcmTagKey(0x0072, 0x0071)
#define DCM_SelectorDSValue DcmTagKey(0x0072, 0x0072)
+#define DCM_SelectorODValue DcmTagKey(0x0072, 0x0073)
#define DCM_SelectorFDValue DcmTagKey(0x0072, 0x0074)
+#define DCM_SelectorOLValue DcmTagKey(0x0072, 0x0075)
#define DCM_SelectorFLValue DcmTagKey(0x0072, 0x0076)
#define DCM_SelectorULValue DcmTagKey(0x0072, 0x0078)
#define DCM_SelectorUSValue DcmTagKey(0x0072, 0x007a)
@@ -3131,6 +3165,29 @@
#define DCM_VValueData DcmTagKey(0x0080, 0x0011)
#define DCM_ReferencedTextureSequence DcmTagKey(0x0080, 0x0012)
#define DCM_ReferencedSurfaceDataSequence DcmTagKey(0x0080, 0x0013)
+#define DCM_AssessmentSummary DcmTagKey(0x0082, 0x0001)
+#define DCM_AssessmentSummaryDescription DcmTagKey(0x0082, 0x0003)
+#define DCM_AssessedSOPInstanceSequence DcmTagKey(0x0082, 0x0004)
+#define DCM_ReferencedComparisonSOPInstanceSequence DcmTagKey(0x0082, 0x0005)
+#define DCM_NumberOfAssessmentObservations DcmTagKey(0x0082, 0x0006)
+#define DCM_AssessmentObservationsSequence DcmTagKey(0x0082, 0x0007)
+#define DCM_ObservationSignificance DcmTagKey(0x0082, 0x0008)
+#define DCM_ObservationDescription DcmTagKey(0x0082, 0x000a)
+#define DCM_StructuredContraintObservationSequence DcmTagKey(0x0082, 0x000c)
+#define DCM_AssessedAttributeValueSequence DcmTagKey(0x0082, 0x0010)
+#define DCM_AssessmentSetID DcmTagKey(0x0082, 0x0016)
+#define DCM_AssessmentRequesterSequence DcmTagKey(0x0082, 0x0017)
+#define DCM_SelectorAttributeName DcmTagKey(0x0082, 0x0018)
+#define DCM_SelectorAttributeKeyword DcmTagKey(0x0082, 0x0019)
+#define DCM_AssessmentTypeCodeSequence DcmTagKey(0x0082, 0x0021)
+#define DCM_ObservationBasisCodeSequence DcmTagKey(0x0082, 0x0022)
+#define DCM_AssessmentLabel DcmTagKey(0x0082, 0x0023)
+#define DCM_ConstraintType DcmTagKey(0x0082, 0x0032)
+#define DCM_SpecificationSelectionGuidance DcmTagKey(0x0082, 0x0033)
+#define DCM_ConstraintValueSequence DcmTagKey(0x0082, 0x0034)
+#define DCM_RecommendedDefaultValueSequence DcmTagKey(0x0082, 0x0035)
+#define DCM_ConstraintViolationSignificance DcmTagKey(0x0082, 0x0036)
+#define DCM_ConstraintViolationCondition DcmTagKey(0x0082, 0x0037)
#define DCM_StorageMediaFileSetID DcmTagKey(0x0088, 0x0130)
#define DCM_StorageMediaFileSetUID DcmTagKey(0x0088, 0x0140)
#define DCM_IconImageSequence DcmTagKey(0x0088, 0x0200)
@@ -3654,7 +3711,7 @@
#define DCM_IsocenterPosition DcmTagKey(0x300a, 0x012c)
#define DCM_SurfaceEntryPoint DcmTagKey(0x300a, 0x012e)
#define DCM_SourceToSurfaceDistance DcmTagKey(0x300a, 0x0130)
-#define DCM_AverageBeamDosePointSourceToExternalContourSurfaceDistance DcmTagKey(0x300a, 0x0131)
+#define DCM_AverageBeamDosePointSourceToExternalContourDistance DcmTagKey(0x300a, 0x0131)
#define DCM_SourceToExternalContourDistance DcmTagKey(0x300a, 0x0132)
#define DCM_ExternalContourEntryPoint DcmTagKey(0x300a, 0x0133)
#define DCM_CumulativeMetersetWeight DcmTagKey(0x300a, 0x0134)
@@ -3666,6 +3723,12 @@
#define DCM_GantryPitchAngle DcmTagKey(0x300a, 0x014a)
#define DCM_GantryPitchRotationDirection DcmTagKey(0x300a, 0x014c)
#define DCM_GantryPitchAngleTolerance DcmTagKey(0x300a, 0x014e)
+#define DCM_FixationEye DcmTagKey(0x300a, 0x0150)
+#define DCM_ChairHeadFramePosition DcmTagKey(0x300a, 0x0151)
+#define DCM_HeadFixationAngleTolerance DcmTagKey(0x300a, 0x0152)
+#define DCM_ChairHeadFramePositionTolerance DcmTagKey(0x300a, 0x0153)
+#define DCM_FixationLightAzimuthalAngleTolerance DcmTagKey(0x300a, 0x0154)
+#define DCM_FixationLightPolarAngleTolerance DcmTagKey(0x300a, 0x0155)
#define DCM_PatientSetupSequence DcmTagKey(0x300a, 0x0180)
#define DCM_PatientSetupNumber DcmTagKey(0x300a, 0x0182)
#define DCM_PatientSetupLabel DcmTagKey(0x300a, 0x0183)
@@ -3819,8 +3882,11 @@
#define DCM_RangeModulatorGatingStopWaterEquivalentThickness DcmTagKey(0x300a, 0x0388)
#define DCM_IsocenterToRangeModulatorDistance DcmTagKey(0x300a, 0x038a)
#define DCM_ScanSpotTuneID DcmTagKey(0x300a, 0x0390)
+#define DCM_ScanSpotPrescribedIndices DcmTagKey(0x300a, 0x0391)
#define DCM_NumberOfScanSpotPositions DcmTagKey(0x300a, 0x0392)
+#define DCM_ScanSpotReordered DcmTagKey(0x300a, 0x0393)
#define DCM_ScanSpotPositionMap DcmTagKey(0x300a, 0x0394)
+#define DCM_ScanSpotReorderingAllowed DcmTagKey(0x300a, 0x0395)
#define DCM_ScanSpotMetersetWeights DcmTagKey(0x300a, 0x0396)
#define DCM_ScanningSpotSize DcmTagKey(0x300a, 0x0398)
#define DCM_NumberOfPaintings DcmTagKey(0x300a, 0x039a)
@@ -3857,7 +3923,7 @@
#define DCM_DeviceMotionParameterCodeSequence DcmTagKey(0x300a, 0x0453)
#define DCM_DistalDepthFraction DcmTagKey(0x300a, 0x0501)
#define DCM_DistalDepth DcmTagKey(0x300a, 0x0502)
-#define DCM_NominalRangeModulatioFractions DcmTagKey(0x300a, 0x0503)
+#define DCM_NominalRangeModulationFractions DcmTagKey(0x300a, 0x0503)
#define DCM_NominalRangeModulatedRegionDepths DcmTagKey(0x300a, 0x0504)
#define DCM_DepthDoseParametersSequence DcmTagKey(0x300a, 0x0505)
#define DCM_DeliveredDepthDoseParametersSequence DcmTagKey(0x300a, 0x0506)
@@ -4065,32 +4131,13 @@
#define DCM_ROIStandardDeviation DcmTagKey(0x6000, 0x1303) /* (0x6000-0x60ff,0x1303) */
#define DCM_OverlayLabel DcmTagKey(0x6000, 0x1500) /* (0x6000-0x60ff,0x1500) */
#define DCM_OverlayData DcmTagKey(0x6000, 0x3000) /* (0x6000-0x60ff,0x3000) */
-#define DCM_PrivateGroupLength DcmTagKey(0x0009, 0x0000) /* (0x0009-o-0xffff,0x0000) */
+#define DCM_RETIRED_SourceImageIDs DcmTagKey(0x0020, 0x3100) /* (0x0020,0x3100-0x31ff) */
+#define DCM_RETIRED_CurveDimensions DcmTagKey(0x5000, 0x0005) /* (0x5000-0x50ff,0x0005) */
#define DCM_RETIRED_NumberOfPoints DcmTagKey(0x5000, 0x0010) /* (0x5000-0x50ff,0x0010) */
#define DCM_RETIRED_TypeOfData DcmTagKey(0x5000, 0x0020) /* (0x5000-0x50ff,0x0020) */
#define DCM_RETIRED_CurveDescription DcmTagKey(0x5000, 0x0022) /* (0x5000-0x50ff,0x0022) */
#define DCM_RETIRED_AxisUnits DcmTagKey(0x5000, 0x0030) /* (0x5000-0x50ff,0x0030) */
#define DCM_RETIRED_AxisLabels DcmTagKey(0x5000, 0x0040) /* (0x5000-0x50ff,0x0040) */
-#define DCM_RETIRED_OverlayPlanes DcmTagKey(0x6000, 0x0012) /* (0x6000-0x60ff,0x0012) */
-#define DCM_RETIRED_OverlayPlaneOrigin DcmTagKey(0x6000, 0x0052) /* (0x6000-0x60ff,0x0052) */
-#define DCM_RETIRED_OverlayCompressionCode DcmTagKey(0x6000, 0x0060) /* (0x6000-0x60ff,0x0060) */
-#define DCM_RETIRED_OverlayCompressionOriginator DcmTagKey(0x6000, 0x0061) /* (0x6000-0x60ff,0x0061) */
-#define DCM_RETIRED_OverlayCompressionLabel DcmTagKey(0x6000, 0x0062) /* (0x6000-0x60ff,0x0062) */
-#define DCM_RETIRED_OverlayCompressionDescription DcmTagKey(0x6000, 0x0063) /* (0x6000-0x60ff,0x0063) */
-#define DCM_RETIRED_OverlayCompressionStepPointers DcmTagKey(0x6000, 0x0066) /* (0x6000-0x60ff,0x0066) */
-#define DCM_RETIRED_OverlayRepeatInterval DcmTagKey(0x6000, 0x0068) /* (0x6000-0x60ff,0x0068) */
-#define DCM_RETIRED_OverlayBitsGrouped DcmTagKey(0x6000, 0x0069) /* (0x6000-0x60ff,0x0069) */
-#define DCM_RETIRED_VariablePixelData DcmTagKey(0x7f00, 0x0010) /* (0x7f00-0x7fff,0x0010) */
-#define DCM_RETIRED_VariableNextDataGroup DcmTagKey(0x7f00, 0x0011) /* (0x7f00-0x7fff,0x0011) */
-#define DCM_RETIRED_VariableCoefficientsSDVN DcmTagKey(0x7f00, 0x0020) /* (0x7f00-0x7fff,0x0020) */
-#define DCM_RETIRED_VariableCoefficientsSDHN DcmTagKey(0x7f00, 0x0030) /* (0x7f00-0x7fff,0x0030) */
-#define DCM_RETIRED_VariableCoefficientsSDDN DcmTagKey(0x7f00, 0x0040) /* (0x7f00-0x7fff,0x0040) */
-#define DCM_PrivateCreator DcmTagKey(0x0009, 0x0010) /* (0x0009-o-0xffff,0x0010-u-0x00ff) */
-#define DCM_IllegalGroupLength DcmTagKey(0x0001, 0x0000) /* (0x0001-o-0x0007,0x0000) */
-#define DCM_IllegalPrivateCreator DcmTagKey(0x0001, 0x0010) /* (0x0001-o-0x0007,0x0010-u-0x00ff) */
-#define DCM_GenericGroupLength DcmTagKey(0x0000, 0x0000) /* (0x0000-u-0xffff,0x0000) */
-#define DCM_RETIRED_SourceImageIDs DcmTagKey(0x0020, 0x3100) /* (0x0020,0x3100-0x31ff) */
-#define DCM_RETIRED_CurveDimensions DcmTagKey(0x5000, 0x0005) /* (0x5000-0x50ff,0x0005) */
#define DCM_RETIRED_DataValueRepresentation DcmTagKey(0x5000, 0x0103) /* (0x5000-0x50ff,0x0103) */
#define DCM_RETIRED_MinimumCoordinateValue DcmTagKey(0x5000, 0x0104) /* (0x5000-0x50ff,0x0104) */
#define DCM_RETIRED_MaximumCoordinateValue DcmTagKey(0x5000, 0x0105) /* (0x5000-0x50ff,0x0105) */
@@ -4111,6 +4158,15 @@
#define DCM_RETIRED_CurveReferencedOverlaySequence DcmTagKey(0x5000, 0x2600) /* (0x5000-0x50ff,0x2600) */
#define DCM_RETIRED_CurveReferencedOverlayGroup DcmTagKey(0x5000, 0x2610) /* (0x5000-0x50ff,0x2610) */
#define DCM_RETIRED_CurveData DcmTagKey(0x5000, 0x3000) /* (0x5000-0x50ff,0x3000) */
+#define DCM_RETIRED_OverlayPlanes DcmTagKey(0x6000, 0x0012) /* (0x6000-0x60ff,0x0012) */
+#define DCM_RETIRED_OverlayPlaneOrigin DcmTagKey(0x6000, 0x0052) /* (0x6000-0x60ff,0x0052) */
+#define DCM_RETIRED_OverlayCompressionCode DcmTagKey(0x6000, 0x0060) /* (0x6000-0x60ff,0x0060) */
+#define DCM_RETIRED_OverlayCompressionOriginator DcmTagKey(0x6000, 0x0061) /* (0x6000-0x60ff,0x0061) */
+#define DCM_RETIRED_OverlayCompressionLabel DcmTagKey(0x6000, 0x0062) /* (0x6000-0x60ff,0x0062) */
+#define DCM_RETIRED_OverlayCompressionDescription DcmTagKey(0x6000, 0x0063) /* (0x6000-0x60ff,0x0063) */
+#define DCM_RETIRED_OverlayCompressionStepPointers DcmTagKey(0x6000, 0x0066) /* (0x6000-0x60ff,0x0066) */
+#define DCM_RETIRED_OverlayRepeatInterval DcmTagKey(0x6000, 0x0068) /* (0x6000-0x60ff,0x0068) */
+#define DCM_RETIRED_OverlayBitsGrouped DcmTagKey(0x6000, 0x0069) /* (0x6000-0x60ff,0x0069) */
#define DCM_RETIRED_OverlayFormat DcmTagKey(0x6000, 0x0110) /* (0x6000-0x60ff,0x0110) */
#define DCM_RETIRED_OverlayLocation DcmTagKey(0x6000, 0x0200) /* (0x6000-0x60ff,0x0200) */
#define DCM_RETIRED_OverlayCodeLabel DcmTagKey(0x6000, 0x0800) /* (0x6000-0x60ff,0x0800) */
@@ -4126,5 +4182,15 @@
#define DCM_RETIRED_OverlaysGreen DcmTagKey(0x6000, 0x1202) /* (0x6000-0x60ff,0x1202) */
#define DCM_RETIRED_OverlaysBlue DcmTagKey(0x6000, 0x1203) /* (0x6000-0x60ff,0x1203) */
#define DCM_RETIRED_OverlayComments DcmTagKey(0x6000, 0x4000) /* (0x6000-0x60ff,0x4000) */
+#define DCM_RETIRED_VariablePixelData DcmTagKey(0x7f00, 0x0010) /* (0x7f00-0x7fff,0x0010) */
+#define DCM_RETIRED_VariableNextDataGroup DcmTagKey(0x7f00, 0x0011) /* (0x7f00-0x7fff,0x0011) */
+#define DCM_RETIRED_VariableCoefficientsSDVN DcmTagKey(0x7f00, 0x0020) /* (0x7f00-0x7fff,0x0020) */
+#define DCM_RETIRED_VariableCoefficientsSDHN DcmTagKey(0x7f00, 0x0030) /* (0x7f00-0x7fff,0x0030) */
+#define DCM_RETIRED_VariableCoefficientsSDDN DcmTagKey(0x7f00, 0x0040) /* (0x7f00-0x7fff,0x0040) */
+#define DCM_PrivateGroupLength DcmTagKey(0x0009, 0x0000) /* (0x0009-o-0xffff,0x0000) */
+#define DCM_PrivateCreator DcmTagKey(0x0009, 0x0010) /* (0x0009-o-0xffff,0x0010-u-0x00ff) */
+#define DCM_IllegalGroupLength DcmTagKey(0x0001, 0x0000) /* (0x0001-o-0x0007,0x0000) */
+#define DCM_IllegalPrivateCreator DcmTagKey(0x0001, 0x0010) /* (0x0001-o-0x0007,0x0010-u-0x00ff) */
+#define DCM_GenericGroupLength DcmTagKey(0x0000, 0x0000) /* (0x0000-u-0xffff,0x0000) */
#endif /* !DCDEFTAG_H */
diff --git a/dcmdata/include/dcmtk/dcmdata/dcdirrec.h b/dcmdata/include/dcmtk/dcmdata/dcdirrec.h
index 249b5d8..b53c7ff 100644
--- a/dcmdata/include/dcmtk/dcmdata/dcdirrec.h
+++ b/dcmdata/include/dcmtk/dcmdata/dcdirrec.h
@@ -124,7 +124,9 @@ typedef enum {
/// surface scan
ERT_SurfaceScan = 45,
/// tractography
- ERT_Tract = 46
+ ERT_Tract = 46,
+ /// assessment
+ ERT_Assessment = 47
} E_DirRecType;
diff --git a/dcmdata/include/dcmtk/dcmdata/dcerror.h b/dcmdata/include/dcmtk/dcmdata/dcerror.h
index ad41eaf..5aa0262 100644
--- a/dcmdata/include/dcmtk/dcmdata/dcerror.h
+++ b/dcmdata/include/dcmtk/dcmdata/dcerror.h
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 1994-2015, OFFIS e.V.
+ * Copyright (C) 1994-2016, OFFIS e.V.
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation were developed by
@@ -69,6 +69,7 @@ const unsigned short OFM_dcmenc = 28;
const unsigned short OFM_dcmiod = 29;
const unsigned short OFM_dcmseg = 30;
const unsigned short OFM_dcmfg = 31;
+const unsigned short OFM_dcmtract = 32;
// condition constants
@@ -148,7 +149,7 @@ extern DCMTK_DCMDATA_EXPORT const OFConditionConst EC_UnknownVR;
extern DCMTK_DCMDATA_EXPORT const OFConditionConst EC_InvalidValue;
/// An expected Item was not found
extern DCMTK_DCMDATA_EXPORT const OFConditionConst EC_ItemNotFound;
-/// Given transfersyntax is unknown
+/// Given transfer syntax is unknown
extern DCMTK_DCMDATA_EXPORT const OFConditionConst EC_UnknownTransferSyntax;
/// Cannot check
extern DCMTK_DCMDATA_EXPORT const OFConditionConst EC_CannotCheck;
@@ -158,6 +159,8 @@ extern DCMTK_DCMDATA_EXPORT const OFConditionConst EC_MissingValue;
extern DCMTK_DCMDATA_EXPORT const OFConditionConst EC_MissingAttribute;
/// Internal error
extern DCMTK_DCMDATA_EXPORT const OFConditionConst EC_InternalError;
+/// Invalid character, e.g. non-ASCII character used but no Specific Character Set defined
+extern DCMTK_DCMDATA_EXPORT const OFConditionConst EC_InvalidCharacter;
//@}
// status code constants
@@ -168,6 +171,8 @@ extern DCMTK_DCMDATA_EXPORT const unsigned short EC_CODE_CannotSelectCharacterSe
extern DCMTK_DCMDATA_EXPORT const unsigned short EC_CODE_CannotConvertCharacterSet;
/// error, cannot convert to XML
extern DCMTK_DCMDATA_EXPORT const unsigned short EC_CODE_CannotConvertToXML;
+/// error, cannot determine start fragment (of compressed pixel data)
+extern DCMTK_DCMDATA_EXPORT const unsigned short EC_CODE_CannotDetermineStartFragment;
#endif /* !DCERROR_H */
diff --git a/dcmdata/include/dcmtk/dcmdata/dcuid.h b/dcmdata/include/dcmtk/dcmdata/dcuid.h
index 7d2254a..c8b8e00 100644
--- a/dcmdata/include/dcmtk/dcmdata/dcuid.h
+++ b/dcmdata/include/dcmtk/dcmdata/dcuid.h
@@ -479,6 +479,7 @@ DCMTK_DCMDATA_EXPORT unsigned long dcmGuessModalityBytes(const char *sopClassUID
#define UID_ColonCADSRStorage "1.2.840.10008.5.1.4.1.1.88.69"
#define UID_ImplantationPlanSRDocumentStorage "1.2.840.10008.5.1.4.1.1.88.70"
#define UID_AcquisitionContextSRStorage "1.2.840.10008.5.1.4.1.1.88.71"
+#define UID_ContentAssessmentResultsStorage "1.2.840.10008.5.1.4.1.1.90.1"
#define UID_EncapsulatedPDFStorage "1.2.840.10008.5.1.4.1.1.104.1"
#define UID_EncapsulatedCDAStorage "1.2.840.10008.5.1.4.1.1.104.2"
#define UID_PositronEmissionTomographyImageStorage "1.2.840.10008.5.1.4.1.1.128"
@@ -510,6 +511,9 @@ DCMTK_DCMDATA_EXPORT unsigned long dcmGuessModalityBytes(const char *sopClassUID
#define UID_DICOS_DigitalXRayImageStorageForPresentation "1.2.840.10008.5.1.4.1.1.501.2.1"
#define UID_DICOS_DigitalXRayImageStorageForProcessing "1.2.840.10008.5.1.4.1.1.501.2.2"
#define UID_DICOS_ThreatDetectionReportStorage "1.2.840.10008.5.1.4.1.1.501.3"
+#define UID_DICOS_2DAITStorage "1.2.840.10008.5.1.4.1.1.501.4"
+#define UID_DICOS_3DAITStorage "1.2.840.10008.5.1.4.1.1.501.5"
+#define UID_DICOS_QuadrupoleResonanceStorage "1.2.840.10008.5.1.4.1.1.501.6"
// DICONDE Storage
#define UID_DICONDE_EddyCurrentImageStorage "1.2.840.10008.5.1.4.1.1.601.1"
diff --git a/dcmdata/libi2d/i2djpgs.cc b/dcmdata/libi2d/i2djpgs.cc
index bad687b..d90eb4c 100644
--- a/dcmdata/libi2d/i2djpgs.cc
+++ b/dcmdata/libi2d/i2djpgs.cc
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2007-2013, OFFIS e.V.
+ * Copyright (C) 2007-2016, OFFIS e.V.
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation were developed by
@@ -688,7 +688,7 @@ OFString I2DJpegSource::jpegMarkerToString(const E_JPGMARKER& marker)
/* Read one byte, testing for EOF */
int I2DJpegSource::read1Byte(Uint8& result)
{
- register int c;
+ int c;
c = jpegFile.fgetc();
if (c == EOF)
return EOF;
diff --git a/dcmdata/libsrc/dcbytstr.cc b/dcmdata/libsrc/dcbytstr.cc
index 1a471be..e3c6c74 100644
--- a/dcmdata/libsrc/dcbytstr.cc
+++ b/dcmdata/libsrc/dcbytstr.cc
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 1994-2014, OFFIS e.V.
+ * Copyright (C) 1994-2016, OFFIS e.V.
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation were developed by
@@ -151,7 +151,7 @@ int DcmByteString::compare(const DcmElement& rhs) const
OFString rhsVal;
if (myRhs->getOFString(rhsVal, count).good())
{
- int result = val.compare(rhsVal);
+ result = val.compare(rhsVal);
if (result != 0)
{
return result;
@@ -690,6 +690,7 @@ OFCondition DcmByteString::verify(const OFBool autocorrect)
OFBool DcmByteString::containsExtendedCharacters(const OFBool checkAllStrings)
{
+ OFBool result = OFFalse;
/* only check if parameter is true since derived VRs are not affected
by the attribute SpecificCharacterSet (0008,0005) */
if (checkAllStrings)
@@ -697,18 +698,10 @@ OFBool DcmByteString::containsExtendedCharacters(const OFBool checkAllStrings)
char *str = NULL;
Uint32 len = 0;
/* determine length in order to support possibly embedded NULL bytes */
- if (getString(str, len).good() && (str != NULL))
- {
- const char *p = str;
- for (Uint32 i = 0; i < len; i++)
- {
- /* check for 8 bit characters */
- if (OFstatic_cast(unsigned char, *p++) > 127)
- return OFTrue;
- }
- }
+ if (getString(str, len).good())
+ result = containsExtendedCharacters(str, len);
}
- return OFFalse;
+ return result;
}
@@ -801,6 +794,25 @@ void normalizeString(OFString &string,
// ********************************
+OFBool DcmByteString::containsExtendedCharacters(const char *stringVal,
+ const size_t stringLen)
+{
+ if (stringVal != NULL)
+ {
+ for (size_t i = stringLen; i != 0; --i)
+ {
+ /* check for 8 bit characters */
+ if (OFstatic_cast(unsigned char, *stringVal++) > 127)
+ return OFTrue;
+ }
+ }
+ return OFFalse;
+}
+
+
+// ********************************
+
+
OFCondition DcmByteString::checkStringValue(const OFString &value,
const OFString &vm,
const OFString &vr,
@@ -820,12 +832,21 @@ OFCondition DcmByteString::checkStringValue(const OFString &value,
result = EC_MaximumLengthViolated;
else if (dcmEnableVRCheckerForStringValues.get())
{
- /* currently, the VR checker only supports ASCII and Latin-1 */
- if (charset.empty() || (charset == "ISO_IR 6") || (charset == "ISO_IR 100"))
+ /* check for non-ASCII characters (if default character set used) */
+ if (charset.empty() || (charset == "ISO_IR 6"))
{
- /* check value representation */
- if (DcmElement::scanValue(value, vr) != vrID)
- result = EC_ValueRepresentationViolated;
+ if (containsExtendedCharacters(value.c_str(), value.length()))
+ result = EC_InvalidCharacter;
+ }
+ if (result.good())
+ {
+ /* currently, the VR checker only supports ASCII and Latin-1 */
+ if (charset.empty() || (charset == "ISO_IR 6") || (charset == "ISO_IR 100"))
+ {
+ /* check value representation (VR) */
+ if (DcmElement::scanValue(value, vr) != vrID)
+ result = EC_ValueRepresentationViolated;
+ }
}
}
} else {
@@ -846,10 +867,19 @@ OFCondition DcmByteString::checkStringValue(const OFString &value,
}
else if (dcmEnableVRCheckerForStringValues.get())
{
+ /* check for non-ASCII characters (if default character set used) */
+ if (charset.empty() || (charset == "ISO_IR 6"))
+ {
+ if (containsExtendedCharacters(value.c_str() + posStart, length))
+ {
+ result = EC_InvalidCharacter;
+ break;
+ }
+ }
/* currently, the VR checker only supports ASCII and Latin-1 */
if (charset.empty() || (charset == "ISO_IR 6") || (charset == "ISO_IR 100"))
{
- /* check value representation */
+ /* check value representation (VR) */
if (DcmElement::scanValue(value, vr, posStart, length) != vrID)
{
result = EC_ValueRepresentationViolated;
@@ -861,7 +891,7 @@ OFCondition DcmByteString::checkStringValue(const OFString &value,
}
if (result.good())
{
- /* check value multiplicity */
+ /* check value multiplicity (VM) */
result = DcmElement::checkVM(vmNum, vm);
}
}
diff --git a/dcmdata/libsrc/dcchrstr.cc b/dcmdata/libsrc/dcchrstr.cc
index 8b27925..8a6f955 100644
--- a/dcmdata/libsrc/dcchrstr.cc
+++ b/dcmdata/libsrc/dcchrstr.cc
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 1994-2015, OFFIS e.V.
+ * Copyright (C) 1994-2016, OFFIS e.V.
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation were developed by
@@ -147,20 +147,13 @@ OFCondition DcmCharString::verify(const OFBool autocorrect)
OFBool DcmCharString::containsExtendedCharacters(const OFBool /*checkAllStrings*/)
{
+ OFBool result = OFFalse;
char *str = NULL;
Uint32 len = 0;
/* determine length in order to support possibly embedded NULL bytes */
- if (getString(str, len).good() && (str != NULL))
- {
- const char *p = str;
- for (Uint32 i = 0; i < len; i++)
- {
- /* check for 8 bit characters */
- if (OFstatic_cast(unsigned char, *p++) > 127)
- return OFTrue;
- }
- }
- return OFFalse;
+ if (getString(str, len).good())
+ result = DcmByteString::containsExtendedCharacters(str, len);
+ return result;
}
diff --git a/dcmdata/libsrc/dccodec.cc b/dcmdata/libsrc/dccodec.cc
index aa64799..bb32f38 100644
--- a/dcmdata/libsrc/dccodec.cc
+++ b/dcmdata/libsrc/dccodec.cc
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 1997-2010, OFFIS e.V.
+ * Copyright (C) 1997-2016, OFFIS e.V.
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation were developed by
@@ -231,7 +231,8 @@ OFCondition DcmCodec::determineStartFragment(
Uint32& currentItem)
{
Uint32 numberOfFragments = OFstatic_cast(Uint32, fromPixSeq->card());
- if (numberOfFrames < 1 || numberOfFragments <= OFstatic_cast(Uint32, numberOfFrames) || frameNo >= OFstatic_cast(Uint32, numberOfFrames)) return EC_IllegalCall;
+ if (numberOfFrames < 1 || numberOfFragments <= OFstatic_cast(Uint32, numberOfFrames) || frameNo >= OFstatic_cast(Uint32, numberOfFrames))
+ return EC_IllegalCall;
if (frameNo == 0)
{
@@ -250,7 +251,7 @@ OFCondition DcmCodec::determineStartFragment(
// non-standard case: multiple fragments per frame.
// We now try to consult the offset table.
DcmPixelItem *pixItem = NULL;
- Uint8 * rawOffsetTable = NULL;
+ Uint8 *rawOffsetTable = NULL;
// get first pixel item, i.e. the fragment containing the offset table
OFCondition result = fromPixSeq->getItem(pixItem, 0);
@@ -260,45 +261,54 @@ OFCondition DcmCodec::determineStartFragment(
result = pixItem->getUint8Array(rawOffsetTable);
if (result.good())
{
+ // check if the offset table is empty
+ if (tableLength == 0)
+ result = makeOFCondition(OFM_dcmdata, EC_CODE_CannotDetermineStartFragment, OF_error, "Cannot determine start fragment: basic offset table is empty");
// check if the offset table has the right size: 4 bytes for each frame (not fragment!)
- if (tableLength != 4* OFstatic_cast(Uint32, numberOfFrames)) return EC_IllegalCall;
+ else if (tableLength != 4 * OFstatic_cast(Uint32, numberOfFrames))
+ result = makeOFCondition(OFM_dcmdata, EC_CODE_CannotDetermineStartFragment, OF_error, "Cannot determine start fragment: basic offset table has wrong size");
+ else {
- // byte swap offset table into local byte order. In file, the offset table is always in little endian
- swapIfNecessary(gLocalByteOrder, EBO_LittleEndian, rawOffsetTable, tableLength, sizeof(Uint32));
+ // byte swap offset table into local byte order. In file, the offset table is always in little endian
+ swapIfNecessary(gLocalByteOrder, EBO_LittleEndian, rawOffsetTable, tableLength, sizeof(Uint32));
- // cast offset table to Uint32.
- Uint32 *offsetTable = OFreinterpret_cast(Uint32 *, rawOffsetTable);
+ // cast offset table to Uint32.
+ Uint32 *offsetTable = OFreinterpret_cast(Uint32 *, rawOffsetTable);
- // now access offset of the frame we're looking for
- Uint32 offset = offsetTable[frameNo];
+ // now access offset of the frame we're looking for
+ Uint32 offset = offsetTable[frameNo];
- // OK, now let's look if we can find a fragment that actually corresponds to that offset.
- // In counter we compute the offset for each frame by adding all fragment lenghts
- Uint32 counter = 0;
- // now iterate over all fragments except the index table. The start of the first fragment
- // is defined as zero.
- for (Uint32 idx = 1; idx < numberOfFragments; ++idx)
- {
- if (counter == offset)
+ // OK, now let's look if we can find a fragment that actually corresponds to that offset.
+ // In counter we compute the offset for each frame by adding all fragment lengths
+ Uint32 counter = 0;
+ // now iterate over all fragments except the index table. The start of the first fragment
+ // is defined as zero.
+ for (Uint32 idx = 1; idx < numberOfFragments; ++idx)
{
- // hooray, we are lucky. We have found the fragment we're looking for
- currentItem = idx;
- return EC_Normal;
- }
+ if (counter == offset)
+ {
+ // hooray, we are lucky. We have found the fragment we're looking for
+ currentItem = idx;
+ return EC_Normal;
+ }
- // access pixel item in order to determine its length
- result = fromPixSeq->getItem(pixItem, idx);
- if (result.bad()) return result;
+ // access pixel item in order to determine its length
+ result = fromPixSeq->getItem(pixItem, idx);
+ if (result.bad())
+ return makeOFCondition(OFM_dcmdata, EC_CODE_CannotDetermineStartFragment, OF_error, "Cannot determine start fragment: cannot access referenced pixel item");
- // add pixel item length plus 8 bytes overhead for the item tag and length field
- counter += pixItem->getLength() + 8;
- }
+ // add pixel item length plus 8 bytes overhead for the item tag and length field
+ counter += pixItem->getLength() + 8;
+ }
- // bad luck. We have not found a fragment corresponding to the offset in the offset table.
- // Either we cannot correctly add numbers, or they cannot :-)
- return EC_TagNotFound;
- }
- }
+ // bad luck. We have not found a fragment corresponding to the offset in the offset table.
+ // Either we cannot correctly add numbers, or they cannot :-)
+ result = makeOFCondition(OFM_dcmdata, EC_CODE_CannotDetermineStartFragment, OF_error, "Cannot determine start fragment: possibly wrong value in basic offset table");
+ }
+ } else
+ result = makeOFCondition(OFM_dcmdata, EC_CODE_CannotDetermineStartFragment, OF_error, "Cannot determine start fragment: cannot access content of basic offset table");
+ } else
+ result = makeOFCondition(OFM_dcmdata, EC_CODE_CannotDetermineStartFragment, OF_error, "Cannot determine start fragment: cannot access basic offset table (first item)");
return result;
}
diff --git a/dcmdata/libsrc/dcddirif.cc b/dcmdata/libsrc/dcddirif.cc
index e58b064..b31bf12 100644
--- a/dcmdata/libsrc/dcddirif.cc
+++ b/dcmdata/libsrc/dcddirif.cc
@@ -625,6 +625,9 @@ OFString DicomDirInterface::recordTypeToName(const E_DirRecType recordType)
case ERT_Tract:
recordName = "Tract";
break;
+ case ERT_Assessment:
+ recordName = "Assessment";
+ break;
default:
recordName = "(unknown-directory-record-type)";
break;
@@ -766,6 +769,8 @@ static E_DirRecType sopClassToRecordType(const OFString &sopClass)
}
else if (compare(sopClass, UID_TractographyResultsStorage))
result = ERT_Tract;
+ else if (compare(sopClass, UID_ContentAssessmentResultsStorage))
+ result = ERT_Assessment;
return result;
}
@@ -953,6 +958,7 @@ static OFCondition insertSortedUnder(DcmDirectoryRecord *parent,
case ERT_Measurement:
case ERT_SurfaceScan:
case ERT_Tract:
+ case ERT_Assessment:
/* try to insert based on InstanceNumber */
result = insertWithISCriterion(parent, child, DCM_InstanceNumber);
break;
@@ -1642,7 +1648,8 @@ OFCondition DicomDirInterface::checkSOPClassAndXfer(DcmMetaInfo *metainfo,
compare(mediaSOPClassUID, UID_HangingProtocolStorage) ||
compare(mediaSOPClassUID, UID_StereometricRelationshipStorage) ||
compare(mediaSOPClassUID, UID_ColorPaletteStorage) ||
- compare(mediaSOPClassUID, UID_TractographyResultsStorage);
+ compare(mediaSOPClassUID, UID_TractographyResultsStorage) ||
+ compare(mediaSOPClassUID, UID_ContentAssessmentResultsStorage);
}
/* the following SOP classes have been retired with previous editions of the DICOM standard */
if (!found && RetiredSOPClassSupport)
@@ -2046,7 +2053,7 @@ OFCondition DicomDirInterface::checkXrayAngiographicAttributes(DcmItem *dataset,
if (!checkExistsWithMinMaxValue(dataset, DCM_Columns, 1, 1024, filename, ResolutionCheck))
result = EC_ApplicationProfileViolated;
if (!checkExistsWithValue(dataset, DCM_BitsStored, filename))
- result = EC_InvalidTag;
+ result = EC_MissingAttribute;
else
{
long bs;
@@ -2118,7 +2125,7 @@ OFCondition DicomDirInterface::checkDentalRadiographAttributes(DcmItem *dataset,
else if (!checkExistsWithValue(dataset, DCM_BitsAllocated, filename) ||
!checkExistsWithValue(dataset, DCM_BitsStored, filename))
{
- result = EC_InvalidTag;
+ result = EC_MissingAttribute;
} else {
long bs;
dataset->findAndGetLongInt(DCM_BitsStored, bs);
@@ -2153,7 +2160,7 @@ OFCondition DicomDirInterface::checkCTandMRAttributes(DcmItem *dataset,
if (!checkExistsWithValue(dataset, DCM_Rows, filename) ||
!checkExistsWithValue(dataset, DCM_Columns, filename))
{
- result = EC_InvalidTag;
+ result = EC_MissingAttribute;
}
/* requirements depend on SOP class */
if (compare(sopClass, UID_CTImageStorage))
@@ -2174,7 +2181,7 @@ OFCondition DicomDirInterface::checkCTandMRAttributes(DcmItem *dataset,
if (!checkExistsWithValue(dataset, DCM_BitsStored, filename) ||
!checkExistsWithValue(dataset, DCM_HighBit, filename))
{
- result = EC_InvalidTag;
+ result = EC_MissingAttribute;
} else {
long bs;
dataset->findAndGetLongInt(DCM_BitsStored, bs);
@@ -2211,7 +2218,7 @@ OFCondition DicomDirInterface::checkCTandMRAttributes(DcmItem *dataset,
!checkExistsWithValue(dataset, DCM_BitsStored, filename) ||
!checkExistsWithValue(dataset, DCM_HighBit, filename))
{
- result = EC_InvalidTag;
+ result = EC_MissingAttribute;
} else {
long ba;
dataset->findAndGetLongInt(DCM_BitsAllocated, ba);
@@ -2270,7 +2277,7 @@ OFCondition DicomDirInterface::checkUltrasoundAttributes(DcmItem *dataset,
OFCondition result = EC_Normal;
/* a US image */
if (!checkExistsWithValue(dataset, DCM_PhotometricInterpretation, filename))
- result = EC_InvalidTag;
+ result = EC_MissingAttribute;
else
{
OFString pi;
@@ -2395,59 +2402,59 @@ OFCondition DicomDirInterface::checkMandatoryAttributes(DcmMetaInfo *metainfo,
{
/* check whether all type 1 elements are really present */
if (!checkExistsWithValue(dataset, DCM_HangingProtocolName, filename))
- result = EC_InvalidTag;
+ result = EC_MissingAttribute;
if (!checkExistsWithValue(dataset, DCM_HangingProtocolDescription, filename))
- result = EC_InvalidTag;
+ result = EC_MissingAttribute;
if (!checkExistsWithValue(dataset, DCM_HangingProtocolLevel, filename))
- result = EC_InvalidTag;
+ result = EC_MissingAttribute;
if (!checkExistsWithValue(dataset, DCM_HangingProtocolCreator, filename))
- result = EC_InvalidTag;
+ result = EC_MissingAttribute;
if (!checkExistsWithValue(dataset, DCM_HangingProtocolCreationDateTime, filename))
- result = EC_InvalidTag;
+ result = EC_MissingAttribute;
if (!checkExistsWithValue(dataset, DCM_HangingProtocolDefinitionSequence, filename))
- result = EC_InvalidTag;
+ result = EC_MissingAttribute;
if (!checkExistsWithValue(dataset, DCM_NumberOfPriorsReferenced, filename))
- result = EC_InvalidTag;
+ result = EC_MissingAttribute;
}
else if (recordType == ERT_Palette)
{
/* check whether all type 1 elements are really present */
if (!checkExistsWithValue(dataset, DCM_ContentLabel, filename))
- result = EC_InvalidTag;
+ result = EC_MissingAttribute;
}
else if (recordType == ERT_Implant)
{
/* check whether all type 1 elements are really present */
if (!checkExistsWithValue(dataset, DCM_Manufacturer, filename))
- result = EC_InvalidTag;
+ result = EC_MissingAttribute;
if (!checkExistsWithValue(dataset, DCM_ImplantName, filename))
- result = EC_InvalidTag;
+ result = EC_MissingAttribute;
if (!checkExistsWithValue(dataset, DCM_ImplantPartNumber, filename))
- result = EC_InvalidTag;
+ result = EC_MissingAttribute;
}
else if (recordType == ERT_ImplantGroup)
{
/* check whether all type 1 elements are really present */
if (!checkExistsWithValue(dataset, DCM_ImplantAssemblyTemplateName, filename))
- result = EC_InvalidTag;
+ result = EC_MissingAttribute;
if (!checkExistsWithValue(dataset, DCM_ImplantAssemblyTemplateIssuer, filename))
- result = EC_InvalidTag;
+ result = EC_MissingAttribute;
if (!checkExistsWithValue(dataset, DCM_ProcedureTypeCodeSequence, filename))
- result = EC_InvalidTag;
+ result = EC_MissingAttribute;
}
else if (recordType == ERT_ImplantAssy)
{
/* check whether all type 1 elements are really present */
if (!checkExistsWithValue(dataset, DCM_ImplantTemplateGroupName, filename))
- result = EC_InvalidTag;
+ result = EC_MissingAttribute;
if (!checkExistsWithValue(dataset, DCM_ImplantTemplateGroupIssuer, filename))
- result = EC_InvalidTag;
+ result = EC_MissingAttribute;
} else {
/* PatientID is type 1 in DICOMDIR and type 2 in images */
if (!InventMode)
{
if (!checkExistsWithValue(dataset, DCM_PatientID, filename))
- result = EC_InvalidTag;
+ result = EC_MissingAttribute;
}
/* PatientName is type 2 in DICOMDIR and images */
if (!checkExists(dataset, DCM_PatientName, filename))
@@ -2456,40 +2463,40 @@ OFCondition DicomDirInterface::checkMandatoryAttributes(DcmMetaInfo *metainfo,
if (!InventMode)
{
if (!checkExistsWithValue(dataset, DCM_StudyDate, filename))
- result = EC_InvalidTag;
+ result = EC_MissingAttribute;
}
/* StudyTime is type 1 in DICOMDIR and type 2 in images */
if (!InventMode)
{
if (!checkExistsWithValue(dataset, DCM_StudyTime, filename))
- result = EC_InvalidTag;
+ result = EC_MissingAttribute;
}
/* StudyDescription is type 2 in DICOMDIR and type 3 in images.
We can create an empty attribute in the directory
*/
/* StudyInstanceUID is type 1 in DICOMDIR and images */
if (!checkExistsWithValue(dataset, DCM_StudyInstanceUID, filename))
- result = EC_InvalidTag;
+ result = EC_MissingAttribute;
/* StudyID is type 1 in DICOMDIR and type 2 in images */
if (!InventMode)
{
if (!checkExistsWithValue(dataset, DCM_StudyID, filename))
- result = EC_InvalidTag;
+ result = EC_MissingAttribute;
}
/* AccessionNumber is type 2 in DICOMDIR and type 3 in images
We can create an empty attribute in the directory
*/
/* Modality is type 1 in DICOMDIR and type 1 in images */
if (!checkExistsWithValue(dataset, DCM_Modality, filename))
- result = EC_InvalidTag;
+ result = EC_MissingAttribute;
/* SeriesInstanceUID is type 1 in DICOMDIR and type 1 in images */
if (!checkExistsWithValue(dataset, DCM_SeriesInstanceUID, filename))
- result = EC_InvalidTag;
+ result = EC_MissingAttribute;
/* SeriesNumber is type 1 in DICOMDIR and type 2 in images */
if (!InventMode)
{
if (!checkExistsWithValue(dataset, DCM_SeriesNumber, filename))
- result = EC_InvalidTag;
+ result = EC_MissingAttribute;
}
/* image and other numbers are type 1 in DICOMDIR but type 2 in images */
/* (basically, check whether all type 1 elements are really present) */
@@ -2499,43 +2506,43 @@ OFCondition DicomDirInterface::checkMandatoryAttributes(DcmMetaInfo *metainfo,
if (!InventMode)
{
if (!checkExistsWithValue(dataset, DCM_RETIRED_OverlayNumber, filename))
- result = EC_InvalidTag;
+ result = EC_MissingAttribute;
}
break;
case ERT_ModalityLut:
if (!InventMode)
{
if (!checkExistsWithValue(dataset, DCM_RETIRED_LUTNumber, filename))
- result = EC_InvalidTag;
+ result = EC_MissingAttribute;
}
break;
case ERT_VoiLut:
if (!InventMode)
{
if (!checkExistsWithValue(dataset, DCM_RETIRED_LUTNumber, filename))
- result = EC_InvalidTag;
+ result = EC_MissingAttribute;
}
break;
case ERT_Curve:
if (!InventMode)
{
if (!checkExistsWithValue(dataset, DCM_RETIRED_CurveNumber, filename))
- result = EC_InvalidTag;
+ result = EC_MissingAttribute;
}
break;
case ERT_SRDocument:
if (!checkExistsWithValue(dataset, DCM_InstanceNumber, filename))
- result = EC_InvalidTag;
+ result = EC_MissingAttribute;
if (!checkExistsWithValue(dataset, DCM_CompletionFlag, filename))
- result = EC_InvalidTag;
+ result = EC_MissingAttribute;
if (!checkExistsWithValue(dataset, DCM_VerificationFlag, filename))
- result = EC_InvalidTag;
+ result = EC_MissingAttribute;
if (!checkExistsWithValue(dataset, DCM_ContentDate, filename))
- result = EC_InvalidTag;
+ result = EC_MissingAttribute;
if (!checkExistsWithValue(dataset, DCM_ContentTime, filename))
- result = EC_InvalidTag;
+ result = EC_MissingAttribute;
if (!checkExistsWithValue(dataset, DCM_ConceptNameCodeSequence, filename))
- result = EC_InvalidTag;
+ result = EC_MissingAttribute;
{
OFString tmpString;
if (compare(getStringFromDataset(dataset, DCM_VerificationFlag, tmpString), "VERIFIED"))
@@ -2547,7 +2554,7 @@ OFCondition DicomDirInterface::checkMandatoryAttributes(DcmMetaInfo *metainfo,
if (l_status.good())
{
if (!checkExistsWithValue(ditem, DCM_VerificationDateTime, filename))
- result = EC_InvalidTag;
+ result = EC_MissingAttribute;
} else
result = l_status;
}
@@ -2555,98 +2562,98 @@ OFCondition DicomDirInterface::checkMandatoryAttributes(DcmMetaInfo *metainfo,
break;
case ERT_Presentation:
if (!checkExistsWithValue(dataset, DCM_InstanceNumber, filename))
- result = EC_InvalidTag;
+ result = EC_MissingAttribute;
if (!checkExistsWithValue(dataset, DCM_ContentLabel, filename))
- result = EC_InvalidTag;
+ result = EC_MissingAttribute;
if (!checkExistsWithValue(dataset, DCM_PresentationCreationDate, filename))
- result = EC_InvalidTag;
+ result = EC_MissingAttribute;
if (!checkExistsWithValue(dataset, DCM_PresentationCreationTime, filename))
- result = EC_InvalidTag;
+ result = EC_MissingAttribute;
break;
case ERT_Waveform:
if (!checkExistsWithValue(dataset, DCM_InstanceNumber, filename))
- result = EC_InvalidTag;
+ result = EC_MissingAttribute;
if (!checkExistsWithValue(dataset, DCM_ContentDate, filename))
- result = EC_InvalidTag;
+ result = EC_MissingAttribute;
if (!checkExistsWithValue(dataset, DCM_ContentTime, filename))
- result = EC_InvalidTag;
+ result = EC_MissingAttribute;
break;
case ERT_RTDose:
if (!InventMode)
{
if (!checkExistsWithValue(dataset, DCM_InstanceNumber, filename))
- result = EC_InvalidTag;
+ result = EC_MissingAttribute;
}
if (!checkExistsWithValue(dataset, DCM_DoseSummationType, filename))
- result = EC_InvalidTag;
+ result = EC_MissingAttribute;
break;
case ERT_RTStructureSet:
if (!InventMode)
{
if (!checkExistsWithValue(dataset, DCM_InstanceNumber, filename))
- result = EC_InvalidTag;
+ result = EC_MissingAttribute;
}
if (!checkExistsWithValue(dataset, DCM_StructureSetLabel, filename))
- result = EC_InvalidTag;
+ result = EC_MissingAttribute;
break;
case ERT_RTPlan:
if (!InventMode)
{
if (!checkExistsWithValue(dataset, DCM_InstanceNumber, filename))
- result = EC_InvalidTag;
+ result = EC_MissingAttribute;
}
if (!checkExistsWithValue(dataset, DCM_RTPlanLabel, filename))
- result = EC_InvalidTag;
+ result = EC_MissingAttribute;
break;
case ERT_RTTreatRecord:
if (!checkExistsWithValue(dataset, DCM_InstanceNumber, filename))
- result = EC_InvalidTag;
+ result = EC_MissingAttribute;
break;
case ERT_StoredPrint:
/* (nothing to do) */
break;
case ERT_KeyObjectDoc:
if (!checkExistsWithValue(dataset, DCM_InstanceNumber, filename))
- result = EC_InvalidTag;
+ result = EC_MissingAttribute;
if (!checkExistsWithValue(dataset, DCM_ContentDate, filename))
- result = EC_InvalidTag;
+ result = EC_MissingAttribute;
if (!checkExistsWithValue(dataset, DCM_ContentTime, filename))
- result = EC_InvalidTag;
+ result = EC_MissingAttribute;
if (!checkExistsWithValue(dataset, DCM_ConceptNameCodeSequence, filename))
- result = EC_InvalidTag;
+ result = EC_MissingAttribute;
break;
case ERT_RawData:
if (!checkExistsWithValue(dataset, DCM_ContentDate, filename))
- result = EC_InvalidTag;
+ result = EC_MissingAttribute;
if (!checkExistsWithValue(dataset, DCM_ContentTime, filename))
- result = EC_InvalidTag;
+ result = EC_MissingAttribute;
/* InstanceNumber is type 2 in IOD and directory record! */
break;
case ERT_Spectroscopy:
if (!checkExistsWithValue(dataset, DCM_InstanceNumber, filename))
- result = EC_InvalidTag;
+ result = EC_MissingAttribute;
if (!checkExistsWithValue(dataset, DCM_ImageType, filename))
- result = EC_InvalidTag;
+ result = EC_MissingAttribute;
if (!checkExistsWithValue(dataset, DCM_ContentDate, filename))
- result = EC_InvalidTag;
+ result = EC_MissingAttribute;
if (!checkExistsWithValue(dataset, DCM_ContentTime, filename))
- result = EC_InvalidTag;
+ result = EC_MissingAttribute;
if (!checkExistsWithValue(dataset, DCM_NumberOfFrames, filename))
- result = EC_InvalidTag;
+ result = EC_MissingAttribute;
if (!checkExistsWithValue(dataset, DCM_Rows, filename))
- result = EC_InvalidTag;
+ result = EC_MissingAttribute;
if (!checkExistsWithValue(dataset, DCM_Columns, filename))
- result = EC_InvalidTag;
+ result = EC_MissingAttribute;
if (!checkExistsWithValue(dataset, DCM_DataPointRows, filename))
- result = EC_InvalidTag;
+ result = EC_MissingAttribute;
if (!checkExistsWithValue(dataset, DCM_DataPointColumns, filename))
- result = EC_InvalidTag;
+ result = EC_MissingAttribute;
break;
case ERT_EncapDoc:
if (!checkExistsWithValue(dataset, DCM_InstanceNumber, filename))
- result = EC_InvalidTag;
+ result = EC_MissingAttribute;
if (!checkExistsWithValue(dataset, DCM_MIMETypeOfEncapsulatedDocument, filename))
- result = EC_InvalidTag;
+ result = EC_MissingAttribute;
break;
case ERT_Stereometric:
case ERT_Plan:
@@ -2659,19 +2666,25 @@ OFCondition DicomDirInterface::checkMandatoryAttributes(DcmMetaInfo *metainfo,
case ERT_Measurement:
case ERT_Tract:
if (!checkExistsWithValue(dataset, DCM_InstanceNumber, filename))
- result = EC_InvalidTag;
+ result = EC_MissingAttribute;
if (!checkExistsWithValue(dataset, DCM_ContentDate, filename))
- result = EC_InvalidTag;
+ result = EC_MissingAttribute;
if (!checkExistsWithValue(dataset, DCM_ContentTime, filename))
- result = EC_InvalidTag;
+ result = EC_MissingAttribute;
if (!checkExistsWithValue(dataset, DCM_ContentLabel, filename))
- result = EC_InvalidTag;
+ result = EC_MissingAttribute;
break;
case ERT_SurfaceScan:
if (!checkExistsWithValue(dataset, DCM_ContentDate, filename))
- result = EC_InvalidTag;
+ result = EC_MissingAttribute;
if (!checkExistsWithValue(dataset, DCM_ContentTime, filename))
- result = EC_InvalidTag;
+ result = EC_MissingAttribute;
+ break;
+ case ERT_Assessment:
+ if (!checkExistsWithValue(dataset, DCM_InstanceNumber, filename))
+ result = EC_MissingAttribute;
+ if (!checkExistsWithValue(dataset, DCM_InstanceCreationDate, filename))
+ result = EC_MissingAttribute;
break;
case ERT_Image:
default:
@@ -2681,7 +2694,7 @@ OFCondition DicomDirInterface::checkMandatoryAttributes(DcmMetaInfo *metainfo,
if (!InventMode)
{
if (!checkExistsWithValue(dataset, DCM_InstanceNumber, filename))
- result = EC_InvalidTag;
+ result = EC_MissingAttribute;
}
/* check profile specific requirements */
if ((ApplicationProfile == AP_GeneralPurposeDVDJPEG) ||
@@ -2703,7 +2716,7 @@ OFCondition DicomDirInterface::checkMandatoryAttributes(DcmMetaInfo *metainfo,
if (!checkExistsWithValue(dataset, DCM_Rows, filename) ||
!checkExistsWithValue(dataset, DCM_Columns, filename))
{
- result = EC_InvalidTag;
+ result = EC_MissingAttribute;
}
}
else if (ApplicationProfile == AP_BasicCardiac)
@@ -2925,6 +2938,7 @@ OFBool DicomDirInterface::recordMatchesDataset(DcmDirectoryRecord *record,
case ERT_Plan:
case ERT_SurfaceScan:
case ERT_Tract:
+ case ERT_Assessment:
/* The attribute ReferencedSOPInstanceUID is automatically
* put into a Directory Record when a filename is present.
*/
@@ -4116,6 +4130,37 @@ DcmDirectoryRecord *DicomDirInterface::buildTractRecord(DcmDirectoryRecord *reco
}
+// create or update assessment record and copy required values from dataset
+DcmDirectoryRecord *DicomDirInterface::buildAssessmentRecord(DcmDirectoryRecord *record,
+ DcmFileFormat *fileformat,
+ const OFString &referencedFileID,
+ const OFFilename &sourceFilename)
+{
+ /* create new surface record */
+ if (record == NULL)
+ record = new DcmDirectoryRecord(ERT_Assessment, referencedFileID.c_str(), sourceFilename, fileformat);
+ if (record != NULL)
+ {
+ /* check whether new record is ok */
+ if (record->error().good())
+ {
+ DcmDataset *dataset = fileformat->getDataset();
+ /* copy attribute values from dataset to surface record */
+ copyElementType1(dataset, DCM_InstanceNumber, record, sourceFilename);
+ copyElementType1(dataset, DCM_InstanceCreationDate, record, sourceFilename);
+ copyElementType2(dataset, DCM_InstanceCreationTime, record, sourceFilename);
+ } else {
+ printRecordErrorMessage(record->error(), ERT_Assessment, "create");
+ /* free memory */
+ delete record;
+ record = NULL;
+ }
+ } else
+ printRecordErrorMessage(EC_MemoryExhausted, ERT_Assessment, "create");
+ return record;
+}
+
+
// create or update image record and copy required values from dataset
DcmDirectoryRecord *DicomDirInterface::buildImageRecord(DcmDirectoryRecord *record,
DcmFileFormat *fileformat,
@@ -4546,6 +4591,9 @@ DcmDirectoryRecord *DicomDirInterface::addRecord(DcmDirectoryRecord *parent,
case ERT_Tract:
record = buildTractRecord(record, fileformat, referencedFileID, sourceFilename);
break;
+ case ERT_Assessment:
+ record = buildAssessmentRecord(record, fileformat, referencedFileID, sourceFilename);
+ break;
default:
/* it can only be an image */
record = buildImageRecord(record, fileformat, referencedFileID, sourceFilename);
@@ -4728,6 +4776,7 @@ void DicomDirInterface::inventMissingInstanceLevelAttributes(DcmDirectoryRecord
case ERT_Plan:
case ERT_SurfaceScan:
case ERT_Tract:
+ case ERT_Assessment:
/* nothing to do */
break;
default:
diff --git a/dcmdata/libsrc/dcdict.cc b/dcmdata/libsrc/dcdict.cc
index da19a66..a3eb161 100644
--- a/dcmdata/libsrc/dcdict.cc
+++ b/dcmdata/libsrc/dcdict.cc
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 1994-2015, OFFIS e.V.
+ * Copyright (C) 1994-2016, OFFIS e.V.
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation were developed by
@@ -137,9 +137,9 @@ stripWhitespace(char* s)
{
if (s)
{
- register unsigned char c;
- register unsigned char *t;
- register unsigned char *p;
+ unsigned char c;
+ unsigned char *t;
+ unsigned char *p;
t=p=OFreinterpret_cast(unsigned char *, s);
while ((c = *t++)) if (!isspace(c)) *p++ = c;
*p = '\0';
@@ -164,9 +164,9 @@ stripLeadingWhitespace(char* s)
{
if (s)
{
- register unsigned char c;
- register unsigned char *t;
- register unsigned char *p;
+ unsigned char c;
+ unsigned char *t;
+ unsigned char *p;
t=p=OFreinterpret_cast(unsigned char *, s);
while (isspace(*t)) t++;
while ((c = *t++)) *p++ = c;
diff --git a/dcmdata/libsrc/dcdictbi.cc b/dcmdata/libsrc/dcdictbi.cc
index 5f98fe2..42ae3c2 100644
--- a/dcmdata/libsrc/dcdictbi.cc
+++ b/dcmdata/libsrc/dcdictbi.cc
@@ -4,7 +4,7 @@
**
** User: joergr
** Host: thinkpad
-** Date: 2016-01-25 17:53:36
+** Date: 2016-06-13 09:57:11
** Prog: /home/joergr/Source/dcmtk-full/public/dcmdata/libsrc/mkdictbi
**
** From: ../data/dicom.dic
@@ -521,7 +521,7 @@ static const DBI_SimpleEntry simpleBuiltinDict[] = {
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0008, 0x0055, 0x0008, 0x0055,
- EVR_AE, "StationAETitle", 1, 1, "CP_1516",
+ EVR_AE, "StationAETitle", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0008, 0x0056, 0x0008, 0x0056,
@@ -684,6 +684,18 @@ static const DBI_SimpleEntry simpleBuiltinDict[] = {
EVR_SQ, "EquivalentCodeSequence", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
+ , { 0x0008, 0x0122, 0x0008, 0x0122,
+ EVR_LO, "MappingResourceName", 1, 1, "DICOM",
+ DcmDictRange_Unspecified, DcmDictRange_Unspecified,
+ NULL }
+ , { 0x0008, 0x0123, 0x0008, 0x0123,
+ EVR_SQ, "ContextGroupIdentificationSequence", 1, 1, "DICOM",
+ DcmDictRange_Unspecified, DcmDictRange_Unspecified,
+ NULL }
+ , { 0x0008, 0x0124, 0x0008, 0x0124,
+ EVR_SQ, "MappingResourceIdentificationSequence", 1, 1, "DICOM",
+ DcmDictRange_Unspecified, DcmDictRange_Unspecified,
+ NULL }
, { 0x0008, 0x0201, 0x0008, 0x0201,
EVR_SH, "TimezoneOffsetFromUTC", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
@@ -905,7 +917,7 @@ static const DBI_SimpleEntry simpleBuiltinDict[] = {
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0008, 0x119a, 0x0008, 0x119a,
- EVR_SQ, "OtherFailuresSequence", 1, 1, "CP_1364",
+ EVR_SQ, "OtherFailuresSequence", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0008, 0x1200, 0x0008, 0x1200,
@@ -1975,15 +1987,15 @@ static const DBI_SimpleEntry simpleBuiltinDict[] = {
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0010, 0x0026, 0x0010, 0x0026,
- EVR_SQ, "SourcePatientGroupIdentificationSequence", 1, 1, "CP_1457",
+ EVR_SQ, "SourcePatientGroupIdentificationSequence", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0010, 0x0027, 0x0010, 0x0027,
- EVR_SQ, "GroupOfPatientsIdentificationSequence", 1, 1, "CP_1457",
+ EVR_SQ, "GroupOfPatientsIdentificationSequence", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0010, 0x0028, 0x0010, 0x0028,
- EVR_US, "SubjectRelativePositionInImage", 3, 3, "CP_1457",
+ EVR_US, "SubjectRelativePositionInImage", 3, 3, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0010, 0x0030, 0x0010, 0x0030,
@@ -1994,6 +2006,18 @@ static const DBI_SimpleEntry simpleBuiltinDict[] = {
EVR_TM, "PatientBirthTime", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
+ , { 0x0010, 0x0033, 0x0010, 0x0033,
+ EVR_LO, "PatientBirthDateInAlternativeCalendar", 1, 1, "DICOM",
+ DcmDictRange_Unspecified, DcmDictRange_Unspecified,
+ NULL }
+ , { 0x0010, 0x0034, 0x0010, 0x0034,
+ EVR_LO, "PatientDeathDateInAlternativeCalendar", 1, 1, "DICOM",
+ DcmDictRange_Unspecified, DcmDictRange_Unspecified,
+ NULL }
+ , { 0x0010, 0x0035, 0x0010, 0x0035,
+ EVR_CS, "PatientAlternativeCalendar", 1, 1, "DICOM",
+ DcmDictRange_Unspecified, DcmDictRange_Unspecified,
+ NULL }
, { 0x0010, 0x0040, 0x0010, 0x0040,
EVR_CS, "PatientSex", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
@@ -2019,35 +2043,35 @@ static const DBI_SimpleEntry simpleBuiltinDict[] = {
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0010, 0x0212, 0x0010, 0x0212,
- EVR_UC, "StrainDescription", 1, 1, "CP_1478",
+ EVR_UC, "StrainDescription", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0010, 0x0213, 0x0010, 0x0213,
- EVR_LO, "StrainNomenclature", 1, 1, "CP_1478",
+ EVR_LO, "StrainNomenclature", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0010, 0x0214, 0x0010, 0x0214,
- EVR_LO, "StrainStockNumber", 1, 1, "CP_1478",
+ EVR_LO, "StrainStockNumber", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0010, 0x0215, 0x0010, 0x0215,
- EVR_SQ, "StrainSourceRegistryCodeSequence", 1, 1, "CP_1478",
+ EVR_SQ, "StrainSourceRegistryCodeSequence", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0010, 0x0216, 0x0010, 0x0216,
- EVR_SQ, "StrainStockSequence", 1, 1, "CP_1478",
+ EVR_SQ, "StrainStockSequence", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0010, 0x0217, 0x0010, 0x0217,
- EVR_LO, "StrainSource", 1, 1, "CP_1478",
+ EVR_LO, "StrainSource", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0010, 0x0218, 0x0010, 0x0218,
- EVR_UT, "StrainAdditionalInformation", 1, 1, "CP_1478",
+ EVR_UT, "StrainAdditionalInformation", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0010, 0x0219, 0x0010, 0x0219,
- EVR_SQ, "StrainCodeSequence", 1, 1, "CP_1478",
+ EVR_SQ, "StrainCodeSequence", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0010, 0x1000, 0x0010, 0x1000,
@@ -2863,11 +2887,11 @@ static const DBI_SimpleEntry simpleBuiltinDict[] = {
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0014, 0x0025, 0x0014, 0x0025,
- EVR_ST, "ComponentManufacturingProcedure", 1, -1, "DICOM/DICONDE",
+ EVR_ST, "ComponentManufacturingProcedure", 1, 1, "DICOM/DICONDE",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0014, 0x0028, 0x0014, 0x0028,
- EVR_ST, "ComponentManufacturer", 1, -1, "DICOM/DICONDE",
+ EVR_ST, "ComponentManufacturer", 1, 1, "DICOM/DICONDE",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0014, 0x0030, 0x0014, 0x0030,
@@ -2883,11 +2907,11 @@ static const DBI_SimpleEntry simpleBuiltinDict[] = {
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0014, 0x0042, 0x0014, 0x0042,
- EVR_ST, "MaterialGrade", 1, -1, "DICOM/DICONDE",
+ EVR_ST, "MaterialGrade", 1, 1, "DICOM/DICONDE",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0014, 0x0044, 0x0014, 0x0044,
- EVR_ST, "MaterialPropertiesDescription", 1, -1, "DICOM/DICONDE",
+ EVR_ST, "MaterialPropertiesDescription", 1, 1, "DICOM/DICONDE",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0014, 0x0045, 0x0014, 0x0045,
@@ -2914,6 +2938,42 @@ static const DBI_SimpleEntry simpleBuiltinDict[] = {
EVR_DS, "InnerDiameter", 1, 1, "DICOM/DICONDE",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
+ , { 0x0014, 0x0100, 0x0014, 0x0100,
+ EVR_LO, "ComponentWelderIDs", 1, -1, "DICOM/DICONDE",
+ DcmDictRange_Unspecified, DcmDictRange_Unspecified,
+ NULL }
+ , { 0x0014, 0x0101, 0x0014, 0x0101,
+ EVR_CS, "SecondaryApprovalStatus", 1, 1, "DICOM/DICONDE",
+ DcmDictRange_Unspecified, DcmDictRange_Unspecified,
+ NULL }
+ , { 0x0014, 0x0102, 0x0014, 0x0102,
+ EVR_DA, "SecondaryReviewDate", 1, 1, "DICOM/DICONDE",
+ DcmDictRange_Unspecified, DcmDictRange_Unspecified,
+ NULL }
+ , { 0x0014, 0x0103, 0x0014, 0x0103,
+ EVR_TM, "SecondaryReviewTime", 1, 1, "DICOM/DICONDE",
+ DcmDictRange_Unspecified, DcmDictRange_Unspecified,
+ NULL }
+ , { 0x0014, 0x0104, 0x0014, 0x0104,
+ EVR_PN, "SecondaryReviewerName", 1, 1, "DICOM/DICONDE",
+ DcmDictRange_Unspecified, DcmDictRange_Unspecified,
+ NULL }
+ , { 0x0014, 0x0105, 0x0014, 0x0105,
+ EVR_ST, "RepairID", 1, 1, "DICOM/DICONDE",
+ DcmDictRange_Unspecified, DcmDictRange_Unspecified,
+ NULL }
+ , { 0x0014, 0x0106, 0x0014, 0x0106,
+ EVR_SQ, "MultipleComponentApprovalSequence", 1, 1, "DICOM/DICONDE",
+ DcmDictRange_Unspecified, DcmDictRange_Unspecified,
+ NULL }
+ , { 0x0014, 0x0107, 0x0014, 0x0107,
+ EVR_CS, "OtherApprovalStatus", 1, -1, "DICOM/DICONDE",
+ DcmDictRange_Unspecified, DcmDictRange_Unspecified,
+ NULL }
+ , { 0x0014, 0x0108, 0x0014, 0x0108,
+ EVR_CS, "OtherSecondaryApprovalStatus", 1, -1, "DICOM/DICONDE",
+ DcmDictRange_Unspecified, DcmDictRange_Unspecified,
+ NULL }
, { 0x0014, 0x1010, 0x0014, 0x1010,
EVR_ST, "ActualEnvironmentalConditions", 1, 1, "DICOM/DICONDE",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
@@ -4324,6 +4384,14 @@ static const DBI_SimpleEntry simpleBuiltinDict[] = {
EVR_LO, "PhosphorType", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
+ , { 0x0018, 0x1271, 0x0018, 0x1271,
+ EVR_FD, "WaterEquivalentDiameter", 1, 1, "DICOM",
+ DcmDictRange_Unspecified, DcmDictRange_Unspecified,
+ NULL }
+ , { 0x0018, 0x1272, 0x0018, 0x1272,
+ EVR_SQ, "WaterEquivalentDiameterCalculationMethodCodeSequence", 1, 1, "DICOM",
+ DcmDictRange_Unspecified, DcmDictRange_Unspecified,
+ NULL }
, { 0x0018, 0x1300, 0x0018, 0x1300,
EVR_DS, "ScanVelocity", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
@@ -4361,7 +4429,7 @@ static const DBI_SimpleEntry simpleBuiltinDict[] = {
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0018, 0x1320, 0x0018, 0x1320,
- EVR_FL, "B1rms", 1, 1, "CP_1461",
+ EVR_FL, "B1rms", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0018, 0x1400, 0x0018, 0x1400,
@@ -6316,6 +6384,22 @@ static const DBI_SimpleEntry simpleBuiltinDict[] = {
EVR_FD, "DiffusionBValueZZ", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
+ , { 0x0018, 0x9621, 0x0018, 0x9621,
+ EVR_SQ, "FunctionalMRSequence", 1, 1, "DICOM",
+ DcmDictRange_Unspecified, DcmDictRange_Unspecified,
+ NULL }
+ , { 0x0018, 0x9622, 0x0018, 0x9622,
+ EVR_CS, "FunctionalSettlingPhaseFramesPresent", 1, 1, "DICOM",
+ DcmDictRange_Unspecified, DcmDictRange_Unspecified,
+ NULL }
+ , { 0x0018, 0x9623, 0x0018, 0x9623,
+ EVR_DT, "FunctionalSyncPulse", 1, 1, "DICOM",
+ DcmDictRange_Unspecified, DcmDictRange_Unspecified,
+ NULL }
+ , { 0x0018, 0x9624, 0x0018, 0x9624,
+ EVR_CS, "SettlingPhaseFrame", 1, 1, "DICOM",
+ DcmDictRange_Unspecified, DcmDictRange_Unspecified,
+ NULL }
, { 0x0018, 0x9701, 0x0018, 0x9701,
EVR_DT, "DecayCorrectionDateTime", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
@@ -14829,7 +14913,7 @@ static const DBI_SimpleEntry simpleBuiltinDict[] = {
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0028, 0x1224, 0x0028, 0x1224,
- EVR_OW, "SegmentedAlphaPaletteColorLookupTableData", 1, 1, "Supplement_156",
+ EVR_OW, "SegmentedAlphaPaletteColorLookupTableData", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0028, 0x1300, 0x0028, 0x1300,
@@ -14913,7 +14997,7 @@ static const DBI_SimpleEntry simpleBuiltinDict[] = {
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0028, 0x2002, 0x0028, 0x2002,
- EVR_CS, "ColorSpace", 1, 1, "CP_1454",
+ EVR_CS, "ColorSpace", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0028, 0x2110, 0x0028, 0x2110,
@@ -17975,23 +18059,23 @@ static const DBI_SimpleEntry simpleBuiltinDict[] = {
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0040, 0x4070, 0x0040, 0x4070,
- EVR_SQ, "OutputDestinationSequence", 1, 1, "CP_1441",
+ EVR_SQ, "OutputDestinationSequence", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0040, 0x4071, 0x0040, 0x4071,
- EVR_SQ, "DICOMStorageSequence", 1, 1, "CP_1441",
+ EVR_SQ, "DICOMStorageSequence", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0040, 0x4072, 0x0040, 0x4072,
- EVR_SQ, "STOWRSStorageSequence", 1, 1, "CP_1441",
+ EVR_SQ, "STOWRSStorageSequence", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0040, 0x4073, 0x0040, 0x4073,
- EVR_UR, "StorageURL", 1, 1, "CP_1441",
+ EVR_UR, "StorageURL", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0040, 0x4074, 0x0040, 0x4074,
- EVR_SQ, "XDSStorageSequence", 1, 1, "CP_1441",
+ EVR_SQ, "XDSStorageSequence", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0040, 0x8302, 0x0040, 0x8302,
@@ -18027,11 +18111,11 @@ static const DBI_SimpleEntry simpleBuiltinDict[] = {
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0040, 0x9213, 0x0040, 0x9213,
- EVR_FD, "DoubleFloatRealWorldValueLastValueMapped", 1, 1, "CP_1458",
+ EVR_FD, "DoubleFloatRealWorldValueLastValueMapped", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0040, 0x9214, 0x0040, 0x9214,
- EVR_FD, "DoubleFloatRealWorldValueFirstValueMapped", 1, 1, "CP_1458",
+ EVR_FD, "DoubleFloatRealWorldValueFirstValueMapped", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0040, 0x9216, 0x0040, 0x9216,
@@ -20707,11 +20791,11 @@ static const DBI_SimpleEntry simpleBuiltinDict[] = {
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0062, 0x0020, 0x0062, 0x0020,
- EVR_UT, "TrackingID", 1, 1, "CP_1496",
+ EVR_UT, "TrackingID", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0062, 0x0021, 0x0062, 0x0021,
- EVR_UI, "TrackingUID", 1, 1, "CP_1496",
+ EVR_UI, "TrackingUID", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0064, 0x0002, 0x0064, 0x0002,
@@ -20851,15 +20935,15 @@ static const DBI_SimpleEntry simpleBuiltinDict[] = {
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0066, 0x0023, 0x0066, 0x0023,
- EVR_OW, "TrianglePointIndexList", 1, 1, "DICOM",
+ EVR_OW, "RETIRED_TrianglePointIndexList", 1, 1, "DICOM/retired",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0066, 0x0024, 0x0066, 0x0024,
- EVR_OW, "EdgePointIndexList", 1, 1, "DICOM",
+ EVR_OW, "RETIRED_EdgePointIndexList", 1, 1, "DICOM/retired",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0066, 0x0025, 0x0066, 0x0025,
- EVR_OW, "VertexPointIndexList", 1, 1, "DICOM",
+ EVR_OW, "RETIRED_VertexPointIndexList", 1, 1, "DICOM/retired",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0066, 0x0026, 0x0066, 0x0026,
@@ -20875,7 +20959,7 @@ static const DBI_SimpleEntry simpleBuiltinDict[] = {
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0066, 0x0029, 0x0066, 0x0029,
- EVR_OW, "PrimitivePointIndexList", 1, 1, "DICOM",
+ EVR_OW, "RETIRED_PrimitivePointIndexList", 1, 1, "DICOM/retired",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0066, 0x002a, 0x0066, 0x002a,
@@ -20935,83 +21019,83 @@ static const DBI_SimpleEntry simpleBuiltinDict[] = {
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0066, 0x0040, 0x0066, 0x0040,
- EVR_OL, "LongPrimitivePointIndexList", 1, 1, "CP_1499",
+ EVR_OL, "LongPrimitivePointIndexList", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0066, 0x0041, 0x0066, 0x0041,
- EVR_OL, "LongTrianglePointIndexList", 1, 1, "CP_1499",
+ EVR_OL, "LongTrianglePointIndexList", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0066, 0x0042, 0x0066, 0x0042,
- EVR_OL, "LongEdgePointIndexList", 1, 1, "CP_1499",
+ EVR_OL, "LongEdgePointIndexList", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0066, 0x0043, 0x0066, 0x0043,
- EVR_OL, "LongVertexPointIndexList", 1, 1, "CP_1499",
+ EVR_OL, "LongVertexPointIndexList", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0066, 0x0101, 0x0066, 0x0101,
- EVR_SQ, "TrackSetSequence", 1, 1, "Supplement_181",
+ EVR_SQ, "TrackSetSequence", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0066, 0x0102, 0x0066, 0x0102,
- EVR_SQ, "TrackSequence", 1, 1, "Supplement_181",
+ EVR_SQ, "TrackSequence", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0066, 0x0103, 0x0066, 0x0103,
- EVR_OW, "RecommendedDisplayCIELabValueList", 1, 1, "Supplement_181",
+ EVR_OW, "RecommendedDisplayCIELabValueList", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0066, 0x0104, 0x0066, 0x0104,
- EVR_SQ, "TrackingAlgorithmIdentificationSequence", 1, 1, "Supplement_181",
+ EVR_SQ, "TrackingAlgorithmIdentificationSequence", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0066, 0x0105, 0x0066, 0x0105,
- EVR_UL, "TrackSetNumber", 1, 1, "Supplement_181",
+ EVR_UL, "TrackSetNumber", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0066, 0x0106, 0x0066, 0x0106,
- EVR_LO, "TrackSetLabel", 1, 1, "Supplement_181",
+ EVR_LO, "TrackSetLabel", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0066, 0x0107, 0x0066, 0x0107,
- EVR_UT, "TrackSetDescription", 1, 1, "Supplement_181",
+ EVR_UT, "TrackSetDescription", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0066, 0x0108, 0x0066, 0x0108,
- EVR_SQ, "TrackSetAnatomicalTypeCodeSequence", 1, 1, "Supplement_181",
+ EVR_SQ, "TrackSetAnatomicalTypeCodeSequence", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0066, 0x0121, 0x0066, 0x0121,
- EVR_SQ, "MeasurementsSequence", 1, 1, "Supplement_181",
+ EVR_SQ, "MeasurementsSequence", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0066, 0x0124, 0x0066, 0x0124,
- EVR_SQ, "TrackSetStatisticsSequence", 1, 1, "Supplement_181",
+ EVR_SQ, "TrackSetStatisticsSequence", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0066, 0x0125, 0x0066, 0x0125,
- EVR_OF, "FloatingPointValues", 1, 1, "Supplement_181",
+ EVR_OF, "FloatingPointValues", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0066, 0x0129, 0x0066, 0x0129,
- EVR_OL, "TrackPointIndexList", 1, 1, "Supplement_181",
+ EVR_OL, "TrackPointIndexList", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0066, 0x0130, 0x0066, 0x0130,
- EVR_SQ, "TrackStatisticsSequence", 1, 1, "Supplement_181",
+ EVR_SQ, "TrackStatisticsSequence", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0066, 0x0132, 0x0066, 0x0132,
- EVR_SQ, "MeasurementValuesSequence", 1, 1, "Supplement_181",
+ EVR_SQ, "MeasurementValuesSequence", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0066, 0x0133, 0x0066, 0x0133,
- EVR_SQ, "DiffusionAcquisitionCodeSequence", 1, 1, "Supplement_181",
+ EVR_SQ, "DiffusionAcquisitionCodeSequence", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0066, 0x0134, 0x0066, 0x0134,
- EVR_SQ, "DiffusionModelCodeSequence", 1, 1, "Supplement_181",
+ EVR_SQ, "DiffusionModelCodeSequence", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0068, 0x6210, 0x0068, 0x6210,
@@ -21655,7 +21739,7 @@ static const DBI_SimpleEntry simpleBuiltinDict[] = {
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0070, 0x030b, 0x0070, 0x030b,
- EVR_FD, "FrameOfReferenceToDisplayedCoordinateSystemTransformationMatrix", 16, 16, "CP_1487",
+ EVR_FD, "FrameOfReferenceToDisplayedCoordinateSystemTransformationMatrix", 16, 16, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0070, 0x030c, 0x0070, 0x030c,
@@ -21723,187 +21807,187 @@ static const DBI_SimpleEntry simpleBuiltinDict[] = {
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0070, 0x1101, 0x0070, 0x1101,
- EVR_UI, "PresentationDisplayCollectionUID", 1, 1, "Supplement_156",
+ EVR_UI, "PresentationDisplayCollectionUID", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0070, 0x1102, 0x0070, 0x1102,
- EVR_UI, "PresentationSequenceCollectionUID", 1, 1, "Supplement_156",
+ EVR_UI, "PresentationSequenceCollectionUID", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0070, 0x1103, 0x0070, 0x1103,
- EVR_US, "PresentationSequencePositionIndex", 1, 1, "Supplement_156",
+ EVR_US, "PresentationSequencePositionIndex", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0070, 0x1104, 0x0070, 0x1104,
- EVR_SQ, "RenderedImageReferenceSequence", 1, 1, "Supplement_156",
+ EVR_SQ, "RenderedImageReferenceSequence", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0070, 0x1201, 0x0070, 0x1201,
- EVR_SQ, "VolumetricPresentationStateInputSequence", 1, 1, "Supplement_156",
+ EVR_SQ, "VolumetricPresentationStateInputSequence", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0070, 0x1202, 0x0070, 0x1202,
- EVR_CS, "PresentationInputType", 1, 1, "Supplement_156",
+ EVR_CS, "PresentationInputType", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0070, 0x1203, 0x0070, 0x1203,
- EVR_US, "InputSequencePositionIndex", 1, 1, "Supplement_156",
+ EVR_US, "InputSequencePositionIndex", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0070, 0x1204, 0x0070, 0x1204,
- EVR_CS, "Crop", 1, 1, "Supplement_156",
+ EVR_CS, "Crop", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0070, 0x1205, 0x0070, 0x1205,
- EVR_US, "CroppingSpecificationIndex", 1, -1, "Supplement_156",
+ EVR_US, "CroppingSpecificationIndex", 1, -1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0070, 0x1206, 0x0070, 0x1206,
- EVR_CS, "CompositingMethod", 1, 1, "Supplement_156",
+ EVR_CS, "CompositingMethod", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0070, 0x1207, 0x0070, 0x1207,
- EVR_US, "VolumetricPresentationInputNumber", 1, 1, "Supplement_156",
+ EVR_US, "VolumetricPresentationInputNumber", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0070, 0x1208, 0x0070, 0x1208,
- EVR_CS, "ImageVolumeGeometry", 1, 1, "Supplement_156",
+ EVR_CS, "ImageVolumeGeometry", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0070, 0x1301, 0x0070, 0x1301,
- EVR_SQ, "VolumeCroppingSequence", 1, 1, "Supplement_156",
+ EVR_SQ, "VolumeCroppingSequence", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0070, 0x1302, 0x0070, 0x1302,
- EVR_CS, "VolumeCroppingMethod", 1, 1, "Supplement_156",
+ EVR_CS, "VolumeCroppingMethod", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0070, 0x1303, 0x0070, 0x1303,
- EVR_FD, "BoundingBoxCrop", 6, 6, "Supplement_156",
+ EVR_FD, "BoundingBoxCrop", 6, 6, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0070, 0x1304, 0x0070, 0x1304,
- EVR_SQ, "ObliqueCroppingPlaneSequence", 1, 1, "Supplement_156",
+ EVR_SQ, "ObliqueCroppingPlaneSequence", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0070, 0x1305, 0x0070, 0x1305,
- EVR_FD, "ObliqueCroppingPlane", 4, 4, "Supplement_156",
+ EVR_FD, "Plane", 4, 4, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0070, 0x1306, 0x0070, 0x1306,
- EVR_FD, "ObliqueCroppingPlaneNormal", 3, 3, "Supplement_156",
+ EVR_FD, "PlaneNormal", 3, 3, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0070, 0x1309, 0x0070, 0x1309,
- EVR_US, "CroppingSpecificationNumber", 1, 1, "Supplement_156",
+ EVR_US, "CroppingSpecificationNumber", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0070, 0x1501, 0x0070, 0x1501,
- EVR_CS, "MultiPlanarReconstructionStyle", 1, 1, "Supplement_156",
+ EVR_CS, "MultiPlanarReconstructionStyle", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0070, 0x1502, 0x0070, 0x1502,
- EVR_CS, "MPRThicknessType", 1, 1, "Supplement_156",
+ EVR_CS, "MPRThicknessType", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0070, 0x1503, 0x0070, 0x1503,
- EVR_FD, "MPRSlabThickness", 1, 1, "Supplement_156",
+ EVR_FD, "MPRSlabThickness", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0070, 0x1505, 0x0070, 0x1505,
- EVR_FD, "MPRTopLeftHandCorner", 3, 3, "Supplement_156",
+ EVR_FD, "MPRTopLeftHandCorner", 3, 3, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0070, 0x1507, 0x0070, 0x1507,
- EVR_FD, "MPRViewWidthDirection", 3, 3, "Supplement_156",
+ EVR_FD, "MPRViewWidthDirection", 3, 3, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0070, 0x1508, 0x0070, 0x1508,
- EVR_FD, "MPRViewWidth", 1, 1, "Supplement_156",
+ EVR_FD, "MPRViewWidth", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0070, 0x150c, 0x0070, 0x150c,
- EVR_FL, "NumberOfVolumetricCurvePoints", 1, 1, "Supplement_156",
+ EVR_UL, "NumberOfVolumetricCurvePoints", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0070, 0x150d, 0x0070, 0x150d,
- EVR_OD, "VolumetricCurvePoints", 1, 1, "Supplement_156",
+ EVR_OD, "VolumetricCurvePoints", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0070, 0x1511, 0x0070, 0x1511,
- EVR_FD, "MPRViewHeightDirection", 3, 3, "Supplement_156",
+ EVR_FD, "MPRViewHeightDirection", 3, 3, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0070, 0x1512, 0x0070, 0x1512,
- EVR_FD, "MPRViewHeight", 1, 1, "Supplement_156",
+ EVR_FD, "MPRViewHeight", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0070, 0x1801, 0x0070, 0x1801,
- EVR_SQ, "PresentationStateClassificationComponentSequence", 1, 1, "Supplement_156",
+ EVR_SQ, "PresentationStateClassificationComponentSequence", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0070, 0x1802, 0x0070, 0x1802,
- EVR_CS, "ComponentType", 1, 1, "Supplement_156",
+ EVR_CS, "ComponentType", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0070, 0x1803, 0x0070, 0x1803,
- EVR_SQ, "ComponentInputSequence", 1, 1, "Supplement_156",
+ EVR_SQ, "ComponentInputSequence", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0070, 0x1804, 0x0070, 0x1804,
- EVR_US, "VolumetricPresentationInputIndex", 1, 1, "Supplement_156",
+ EVR_US, "VolumetricPresentationInputIndex", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0070, 0x1805, 0x0070, 0x1805,
- EVR_SQ, "PresentationStateCompositorComponentSequence", 1, 1, "Supplement_156",
+ EVR_SQ, "PresentationStateCompositorComponentSequence", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0070, 0x1806, 0x0070, 0x1806,
- EVR_SQ, "WeightingTransferFunctionSequence", 1, 1, "Supplement_156",
+ EVR_SQ, "WeightingTransferFunctionSequence", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0070, 0x1807, 0x0070, 0x1807,
- EVR_US, "WeightingLookupTableDescriptor", 3, 3, "Supplement_156",
+ EVR_US, "WeightingLookupTableDescriptor", 3, 3, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0070, 0x1808, 0x0070, 0x1808,
- EVR_OB, "WeightingLookupTableData", 1, 1, "Supplement_156",
+ EVR_OB, "WeightingLookupTableData", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0070, 0x1901, 0x0070, 0x1901,
- EVR_SQ, "VolumetricAnnotationSequence", 1, 1, "Supplement_156",
+ EVR_SQ, "VolumetricAnnotationSequence", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0070, 0x1903, 0x0070, 0x1903,
- EVR_SQ, "ReferencedStructuredContextSequence", 1, 1, "Supplement_156",
+ EVR_SQ, "ReferencedStructuredContextSequence", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0070, 0x1904, 0x0070, 0x1904,
- EVR_UI, "ReferencedContentItem", 1, 1, "Supplement_156",
+ EVR_UI, "ReferencedContentItem", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0070, 0x1905, 0x0070, 0x1905,
- EVR_SQ, "VolumetricPresentationInputAnnotationSequence", 1, 1, "Supplement_156",
+ EVR_SQ, "VolumetricPresentationInputAnnotationSequence", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0070, 0x1907, 0x0070, 0x1907,
- EVR_CS, "AnnotationClipping", 1, 1, "Supplement_156",
+ EVR_CS, "AnnotationClipping", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0070, 0x1a01, 0x0070, 0x1a01,
- EVR_CS, "PresentationAnimationStyle", 1, 1, "Supplement_156",
+ EVR_CS, "PresentationAnimationStyle", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0070, 0x1a03, 0x0070, 0x1a03,
- EVR_FD, "RecommendedAnimationRate", 1, 1, "Supplement_156",
+ EVR_FD, "RecommendedAnimationRate", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0070, 0x1a04, 0x0070, 0x1a04,
- EVR_SQ, "AnimationCurveSequence", 1, 1, "Supplement_156",
+ EVR_SQ, "AnimationCurveSequence", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0070, 0x1a05, 0x0070, 0x1a05,
- EVR_FD, "AnimationStepSize", 1, 1, "Supplement_156",
+ EVR_FD, "AnimationStepSize", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0072, 0x0002, 0x0072, 0x0002,
@@ -22014,50 +22098,102 @@ static const DBI_SimpleEntry simpleBuiltinDict[] = {
EVR_LO, "SelectorAttributePrivateCreator", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
+ , { 0x0072, 0x005e, 0x0072, 0x005e,
+ EVR_AE, "SelectorAEValue", 1, -1, "DICOM",
+ DcmDictRange_Unspecified, DcmDictRange_Unspecified,
+ NULL }
+ , { 0x0072, 0x005f, 0x0072, 0x005f,
+ EVR_AS, "SelectorASValue", 1, -1, "DICOM",
+ DcmDictRange_Unspecified, DcmDictRange_Unspecified,
+ NULL }
, { 0x0072, 0x0060, 0x0072, 0x0060,
EVR_AT, "SelectorATValue", 1, -1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
+ , { 0x0072, 0x0061, 0x0072, 0x0061,
+ EVR_DA, "SelectorDAValue", 1, -1, "DICOM",
+ DcmDictRange_Unspecified, DcmDictRange_Unspecified,
+ NULL }
, { 0x0072, 0x0062, 0x0072, 0x0062,
EVR_CS, "SelectorCSValue", 1, -1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
+ , { 0x0072, 0x0063, 0x0072, 0x0063,
+ EVR_DT, "SelectorDTValue", 1, -1, "DICOM",
+ DcmDictRange_Unspecified, DcmDictRange_Unspecified,
+ NULL }
, { 0x0072, 0x0064, 0x0072, 0x0064,
EVR_IS, "SelectorISValue", 1, -1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
+ , { 0x0072, 0x0065, 0x0072, 0x0065,
+ EVR_OB, "SelectorOBValue", 1, 1, "DICOM",
+ DcmDictRange_Unspecified, DcmDictRange_Unspecified,
+ NULL }
, { 0x0072, 0x0066, 0x0072, 0x0066,
EVR_LO, "SelectorLOValue", 1, -1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
+ , { 0x0072, 0x0067, 0x0072, 0x0067,
+ EVR_OF, "SelectorOFValue", 1, 1, "DICOM",
+ DcmDictRange_Unspecified, DcmDictRange_Unspecified,
+ NULL }
, { 0x0072, 0x0068, 0x0072, 0x0068,
EVR_LT, "SelectorLTValue", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
+ , { 0x0072, 0x0069, 0x0072, 0x0069,
+ EVR_OW, "SelectorOWValue", 1, 1, "DICOM",
+ DcmDictRange_Unspecified, DcmDictRange_Unspecified,
+ NULL }
, { 0x0072, 0x006a, 0x0072, 0x006a,
EVR_PN, "SelectorPNValue", 1, -1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
+ , { 0x0072, 0x006b, 0x0072, 0x006b,
+ EVR_TM, "SelectorTMValue", 1, -1, "DICOM",
+ DcmDictRange_Unspecified, DcmDictRange_Unspecified,
+ NULL }
, { 0x0072, 0x006c, 0x0072, 0x006c,
EVR_SH, "SelectorSHValue", 1, -1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
+ , { 0x0072, 0x006d, 0x0072, 0x006d,
+ EVR_UN, "SelectorUNValue", 1, 1, "DICOM",
+ DcmDictRange_Unspecified, DcmDictRange_Unspecified,
+ NULL }
, { 0x0072, 0x006e, 0x0072, 0x006e,
EVR_ST, "SelectorSTValue", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
+ , { 0x0072, 0x006f, 0x0072, 0x006f,
+ EVR_UC, "SelectorUCValue", 1, -1, "DICOM",
+ DcmDictRange_Unspecified, DcmDictRange_Unspecified,
+ NULL }
, { 0x0072, 0x0070, 0x0072, 0x0070,
EVR_UT, "SelectorUTValue", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
+ , { 0x0072, 0x0071, 0x0072, 0x0071,
+ EVR_UR, "SelectorURValue", 1, 1, "DICOM",
+ DcmDictRange_Unspecified, DcmDictRange_Unspecified,
+ NULL }
, { 0x0072, 0x0072, 0x0072, 0x0072,
EVR_DS, "SelectorDSValue", 1, -1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
+ , { 0x0072, 0x0073, 0x0072, 0x0073,
+ EVR_OD, "SelectorODValue", 1, 1, "DICOM",
+ DcmDictRange_Unspecified, DcmDictRange_Unspecified,
+ NULL }
, { 0x0072, 0x0074, 0x0072, 0x0074,
EVR_FD, "SelectorFDValue", 1, -1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
+ , { 0x0072, 0x0075, 0x0072, 0x0075,
+ EVR_OL, "SelectorOLValue", 1, 1, "DICOM",
+ DcmDictRange_Unspecified, DcmDictRange_Unspecified,
+ NULL }
, { 0x0072, 0x0076, 0x0072, 0x0076,
EVR_FL, "SelectorFLValue", 1, -1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
@@ -22575,59 +22711,59 @@ static const DBI_SimpleEntry simpleBuiltinDict[] = {
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0074, 0x1401, 0x0074, 0x1401,
- EVR_SQ, "BrachyTaskSequence", 1, 1, "Supplement_184",
+ EVR_SQ, "BrachyTaskSequence", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0074, 0x1402, 0x0074, 0x1402,
- EVR_DS, "ContinuationStartTotalReferenceAirKerma", 1, 1, "Supplement_184",
+ EVR_DS, "ContinuationStartTotalReferenceAirKerma", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0074, 0x1403, 0x0074, 0x1403,
- EVR_DS, "ContinuationEndTotalReferenceAirKerma", 1, 1, "Supplement_184",
+ EVR_DS, "ContinuationEndTotalReferenceAirKerma", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0074, 0x1404, 0x0074, 0x1404,
- EVR_IS, "ContinuationPulseNumber", 1, 1, "Supplement_184",
+ EVR_IS, "ContinuationPulseNumber", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0074, 0x1405, 0x0074, 0x1405,
- EVR_SQ, "ChannelDeliveryOrderSequence", 1, 1, "Supplement_184",
+ EVR_SQ, "ChannelDeliveryOrderSequence", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0074, 0x1406, 0x0074, 0x1406,
- EVR_IS, "ReferencedChannelNumber", 1, 1, "Supplement_184",
+ EVR_IS, "ReferencedChannelNumber", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0074, 0x1407, 0x0074, 0x1407,
- EVR_DS, "StartCumulativeTimeWeight", 1, 1, "Supplement_184",
+ EVR_DS, "StartCumulativeTimeWeight", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0074, 0x1408, 0x0074, 0x1408,
- EVR_DS, "EndCumulativeTimeWeight", 1, 1, "Supplement_184",
+ EVR_DS, "EndCumulativeTimeWeight", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0074, 0x1409, 0x0074, 0x1409,
- EVR_SQ, "OmittedChannelSequence", 1, 1, "Supplement_184",
+ EVR_SQ, "OmittedChannelSequence", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0074, 0x140a, 0x0074, 0x140a,
- EVR_CS, "ReasonForChannelOmission", 1, 1, "Supplement_184",
+ EVR_CS, "ReasonForChannelOmission", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0074, 0x140b, 0x0074, 0x140b,
- EVR_LO, "ReasonForChannelOmissionDescription", 1, 1, "Supplement_184",
+ EVR_LO, "ReasonForChannelOmissionDescription", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0074, 0x140c, 0x0074, 0x140c,
- EVR_IS, "ChannelDeliveryOrderIndex", 1, 1, "Supplement_184",
+ EVR_IS, "ChannelDeliveryOrderIndex", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0074, 0x140d, 0x0074, 0x140d,
- EVR_SQ, "ChannelDeliveryContinuationSequence", 1, 1, "Supplement_184",
+ EVR_SQ, "ChannelDeliveryContinuationSequence", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0074, 0x140e, 0x0074, 0x140e,
- EVR_SQ, "OmittedApplicationSetupSequence", 1, 1, "Supplement_184",
+ EVR_SQ, "OmittedApplicationSetupSequence", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x0076, 0x0001, 0x0076, 0x0001,
@@ -22846,6 +22982,98 @@ static const DBI_SimpleEntry simpleBuiltinDict[] = {
EVR_SQ, "ReferencedSurfaceDataSequence", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
+ , { 0x0082, 0x0001, 0x0082, 0x0001,
+ EVR_CS, "AssessmentSummary", 1, 1, "DICOM",
+ DcmDictRange_Unspecified, DcmDictRange_Unspecified,
+ NULL }
+ , { 0x0082, 0x0003, 0x0082, 0x0003,
+ EVR_UT, "AssessmentSummaryDescription", 1, 1, "DICOM",
+ DcmDictRange_Unspecified, DcmDictRange_Unspecified,
+ NULL }
+ , { 0x0082, 0x0004, 0x0082, 0x0004,
+ EVR_SQ, "AssessedSOPInstanceSequence", 1, 1, "DICOM",
+ DcmDictRange_Unspecified, DcmDictRange_Unspecified,
+ NULL }
+ , { 0x0082, 0x0005, 0x0082, 0x0005,
+ EVR_SQ, "ReferencedComparisonSOPInstanceSequence", 1, 1, "DICOM",
+ DcmDictRange_Unspecified, DcmDictRange_Unspecified,
+ NULL }
+ , { 0x0082, 0x0006, 0x0082, 0x0006,
+ EVR_UL, "NumberOfAssessmentObservations", 1, 1, "DICOM",
+ DcmDictRange_Unspecified, DcmDictRange_Unspecified,
+ NULL }
+ , { 0x0082, 0x0007, 0x0082, 0x0007,
+ EVR_SQ, "AssessmentObservationsSequence", 1, 1, "DICOM",
+ DcmDictRange_Unspecified, DcmDictRange_Unspecified,
+ NULL }
+ , { 0x0082, 0x0008, 0x0082, 0x0008,
+ EVR_CS, "ObservationSignificance", 1, 1, "DICOM",
+ DcmDictRange_Unspecified, DcmDictRange_Unspecified,
+ NULL }
+ , { 0x0082, 0x000a, 0x0082, 0x000a,
+ EVR_UT, "ObservationDescription", 1, 1, "DICOM",
+ DcmDictRange_Unspecified, DcmDictRange_Unspecified,
+ NULL }
+ , { 0x0082, 0x000c, 0x0082, 0x000c,
+ EVR_SQ, "StructuredContraintObservationSequence", 1, 1, "DICOM",
+ DcmDictRange_Unspecified, DcmDictRange_Unspecified,
+ NULL }
+ , { 0x0082, 0x0010, 0x0082, 0x0010,
+ EVR_SQ, "AssessedAttributeValueSequence", 1, 1, "DICOM",
+ DcmDictRange_Unspecified, DcmDictRange_Unspecified,
+ NULL }
+ , { 0x0082, 0x0016, 0x0082, 0x0016,
+ EVR_LO, "AssessmentSetID", 1, 1, "DICOM",
+ DcmDictRange_Unspecified, DcmDictRange_Unspecified,
+ NULL }
+ , { 0x0082, 0x0017, 0x0082, 0x0017,
+ EVR_SQ, "AssessmentRequesterSequence", 1, 1, "DICOM",
+ DcmDictRange_Unspecified, DcmDictRange_Unspecified,
+ NULL }
+ , { 0x0082, 0x0018, 0x0082, 0x0018,
+ EVR_LO, "SelectorAttributeName", 1, 1, "DICOM",
+ DcmDictRange_Unspecified, DcmDictRange_Unspecified,
+ NULL }
+ , { 0x0082, 0x0019, 0x0082, 0x0019,
+ EVR_LO, "SelectorAttributeKeyword", 1, 1, "DICOM",
+ DcmDictRange_Unspecified, DcmDictRange_Unspecified,
+ NULL }
+ , { 0x0082, 0x0021, 0x0082, 0x0021,
+ EVR_SQ, "AssessmentTypeCodeSequence", 1, 1, "DICOM",
+ DcmDictRange_Unspecified, DcmDictRange_Unspecified,
+ NULL }
+ , { 0x0082, 0x0022, 0x0082, 0x0022,
+ EVR_SQ, "ObservationBasisCodeSequence", 1, 1, "DICOM",
+ DcmDictRange_Unspecified, DcmDictRange_Unspecified,
+ NULL }
+ , { 0x0082, 0x0023, 0x0082, 0x0023,
+ EVR_LO, "AssessmentLabel", 1, 1, "DICOM",
+ DcmDictRange_Unspecified, DcmDictRange_Unspecified,
+ NULL }
+ , { 0x0082, 0x0032, 0x0082, 0x0032,
+ EVR_CS, "ConstraintType", 1, 1, "DICOM",
+ DcmDictRange_Unspecified, DcmDictRange_Unspecified,
+ NULL }
+ , { 0x0082, 0x0033, 0x0082, 0x0033,
+ EVR_UT, "SpecificationSelectionGuidance", 1, 1, "DICOM",
+ DcmDictRange_Unspecified, DcmDictRange_Unspecified,
+ NULL }
+ , { 0x0082, 0x0034, 0x0082, 0x0034,
+ EVR_SQ, "ConstraintValueSequence", 1, 1, "DICOM",
+ DcmDictRange_Unspecified, DcmDictRange_Unspecified,
+ NULL }
+ , { 0x0082, 0x0035, 0x0082, 0x0035,
+ EVR_SQ, "RecommendedDefaultValueSequence", 1, 1, "DICOM",
+ DcmDictRange_Unspecified, DcmDictRange_Unspecified,
+ NULL }
+ , { 0x0082, 0x0036, 0x0082, 0x0036,
+ EVR_CS, "ConstraintViolationSignificance", 1, 1, "DICOM",
+ DcmDictRange_Unspecified, DcmDictRange_Unspecified,
+ NULL }
+ , { 0x0082, 0x0037, 0x0082, 0x0037,
+ EVR_UT, "ConstraintViolationCondition", 1, 1, "DICOM",
+ DcmDictRange_Unspecified, DcmDictRange_Unspecified,
+ NULL }
#ifdef ENABLE_PRIVATE_TAGS
, { 0x0087, 0x0010, 0x0087, 0x0010,
EVR_CS, "MediaType", 1, 1, "PrivateTag",
@@ -25189,15 +25417,15 @@ static const DBI_SimpleEntry simpleBuiltinDict[] = {
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x300a, 0x0090, 0x300a, 0x0090,
- EVR_CS, "BeamDoseType", 1, 1, "CP_1431",
+ EVR_CS, "BeamDoseType", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x300a, 0x0091, 0x300a, 0x0091,
- EVR_DS, "AlternateBeamDose", 1, 1, "CP_1431",
+ EVR_DS, "AlternateBeamDose", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x300a, 0x0092, 0x300a, 0x0092,
- EVR_CS, "AlternateBeamDoseType", 1, 1, "CP_1431",
+ EVR_CS, "AlternateBeamDoseType", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x300a, 0x00a0, 0x300a, 0x00a0,
@@ -25609,7 +25837,7 @@ static const DBI_SimpleEntry simpleBuiltinDict[] = {
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x300a, 0x0131, 0x300a, 0x0131,
- EVR_FL, "AverageBeamDosePointSourceToExternalContourSurfaceDistance", 1, 1, "DICOM",
+ EVR_FL, "AverageBeamDosePointSourceToExternalContourDistance", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x300a, 0x0132, 0x300a, 0x0132,
@@ -25656,6 +25884,30 @@ static const DBI_SimpleEntry simpleBuiltinDict[] = {
EVR_FL, "GantryPitchAngleTolerance", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
+ , { 0x300a, 0x0150, 0x300a, 0x0150,
+ EVR_CS, "FixationEye", 1, 1, "DICOM",
+ DcmDictRange_Unspecified, DcmDictRange_Unspecified,
+ NULL }
+ , { 0x300a, 0x0151, 0x300a, 0x0151,
+ EVR_DS, "ChairHeadFramePosition", 1, 1, "DICOM",
+ DcmDictRange_Unspecified, DcmDictRange_Unspecified,
+ NULL }
+ , { 0x300a, 0x0152, 0x300a, 0x0152,
+ EVR_DS, "HeadFixationAngleTolerance", 1, 1, "DICOM",
+ DcmDictRange_Unspecified, DcmDictRange_Unspecified,
+ NULL }
+ , { 0x300a, 0x0153, 0x300a, 0x0153,
+ EVR_DS, "ChairHeadFramePositionTolerance", 1, 1, "DICOM",
+ DcmDictRange_Unspecified, DcmDictRange_Unspecified,
+ NULL }
+ , { 0x300a, 0x0154, 0x300a, 0x0154,
+ EVR_DS, "FixationLightAzimuthalAngleTolerance", 1, 1, "DICOM",
+ DcmDictRange_Unspecified, DcmDictRange_Unspecified,
+ NULL }
+ , { 0x300a, 0x0155, 0x300a, 0x0155,
+ EVR_DS, "FixationLightPolarAngleTolerance", 1, 1, "DICOM",
+ DcmDictRange_Unspecified, DcmDictRange_Unspecified,
+ NULL }
, { 0x300a, 0x0180, 0x300a, 0x0180,
EVR_SQ, "PatientSetupSequence", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
@@ -26085,7 +26337,7 @@ static const DBI_SimpleEntry simpleBuiltinDict[] = {
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x300a, 0x0309, 0x300a, 0x0309,
- EVR_CS, "ModulatedScanModeType", 1, 1, "CP_1432",
+ EVR_CS, "ModulatedScanModeType", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x300a, 0x030a, 0x300a, 0x030a,
@@ -26197,7 +26449,7 @@ static const DBI_SimpleEntry simpleBuiltinDict[] = {
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x300a, 0x0355, 0x300a, 0x0355,
- EVR_LO, "TrayAccessoryCode", 1, 1, "CP_1504",
+ EVR_LO, "TrayAccessoryCode", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x300a, 0x0356, 0x300a, 0x0356,
@@ -26268,14 +26520,26 @@ static const DBI_SimpleEntry simpleBuiltinDict[] = {
EVR_SH, "ScanSpotTuneID", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
+ , { 0x300a, 0x0391, 0x300a, 0x0391,
+ EVR_IS, "ScanSpotPrescribedIndices", 1, -1, "DICOM",
+ DcmDictRange_Unspecified, DcmDictRange_Unspecified,
+ NULL }
, { 0x300a, 0x0392, 0x300a, 0x0392,
EVR_IS, "NumberOfScanSpotPositions", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
+ , { 0x300a, 0x0393, 0x300a, 0x0393,
+ EVR_CS, "ScanSpotReordered", 1, 1, "DICOM",
+ DcmDictRange_Unspecified, DcmDictRange_Unspecified,
+ NULL }
, { 0x300a, 0x0394, 0x300a, 0x0394,
EVR_FL, "ScanSpotPositionMap", 1, -1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
+ , { 0x300a, 0x0395, 0x300a, 0x0395,
+ EVR_CS, "ScanSpotReorderingAllowed", 1, 1, "DICOM",
+ DcmDictRange_Unspecified, DcmDictRange_Unspecified,
+ NULL }
, { 0x300a, 0x0396, 0x300a, 0x0396,
EVR_FL, "ScanSpotMetersetWeights", 1, -1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
@@ -26413,51 +26677,51 @@ static const DBI_SimpleEntry simpleBuiltinDict[] = {
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x300a, 0x0501, 0x300a, 0x0501,
- EVR_FL, "DistalDepthFraction", 1, 1, "CP_1460",
+ EVR_FL, "DistalDepthFraction", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x300a, 0x0502, 0x300a, 0x0502,
- EVR_FL, "DistalDepth", 1, 1, "CP_1460",
+ EVR_FL, "DistalDepth", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x300a, 0x0503, 0x300a, 0x0503,
- EVR_FL, "NominalRangeModulatioFractions", 2, 2, "CP_1460",
+ EVR_FL, "NominalRangeModulationFractions", 2, 2, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x300a, 0x0504, 0x300a, 0x0504,
- EVR_FL, "NominalRangeModulatedRegionDepths", 2, 2, "CP_1460",
+ EVR_FL, "NominalRangeModulatedRegionDepths", 2, 2, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x300a, 0x0505, 0x300a, 0x0505,
- EVR_SQ, "DepthDoseParametersSequence", 1, 1, "CP_1460",
+ EVR_SQ, "DepthDoseParametersSequence", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x300a, 0x0506, 0x300a, 0x0506,
- EVR_SQ, "DeliveredDepthDoseParametersSequence", 1, 1, "CP_1460",
+ EVR_SQ, "DeliveredDepthDoseParametersSequence", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x300a, 0x0507, 0x300a, 0x0507,
- EVR_FL, "DeliveredDistalDepthFraction", 1, 1, "CP_1460",
+ EVR_FL, "DeliveredDistalDepthFraction", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x300a, 0x0508, 0x300a, 0x0508,
- EVR_FL, "DeliveredDistalDepth", 1, 1, "CP_1460",
+ EVR_FL, "DeliveredDistalDepth", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x300a, 0x0509, 0x300a, 0x0509,
- EVR_FL, "DeliveredNominalRangeModulationFractions", 2, 2, "CP_1460",
+ EVR_FL, "DeliveredNominalRangeModulationFractions", 2, 2, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x300a, 0x0510, 0x300a, 0x0510,
- EVR_FL, "DeliveredNominalRangeModulatedRegionDepths", 2, 2, "CP_1460",
+ EVR_FL, "DeliveredNominalRangeModulatedRegionDepths", 2, 2, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x300a, 0x0511, 0x300a, 0x0511,
- EVR_CS, "DeliveredReferenceDoseDefinition", 1, 1, "CP_1460",
+ EVR_CS, "DeliveredReferenceDoseDefinition", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x300a, 0x0512, 0x300a, 0x0512,
- EVR_CS, "ReferenceDoseDefinition", 1, 1, "CP_1460",
+ EVR_CS, "ReferenceDoseDefinition", 1, 1, "DICOM",
DcmDictRange_Unspecified, DcmDictRange_Unspecified,
NULL }
, { 0x300c, 0x0002, 0x300c, 0x0002,
@@ -27454,9 +27718,13 @@ static const DBI_SimpleEntry simpleBuiltinDict[] = {
EVR_ox, "OverlayData", 1, 1, "DICOM",
DcmDictRange_Even, DcmDictRange_Unspecified,
NULL }
- , { 0x0009, 0x0000, 0xffff, 0x0000,
- EVR_UL, "PrivateGroupLength", 1, 1, "PRIVATE",
- DcmDictRange_Odd, DcmDictRange_Unspecified,
+ , { 0x0020, 0x3100, 0x0020, 0x31ff,
+ EVR_CS, "RETIRED_SourceImageIDs", 1, -1, "DICOM/retired",
+ DcmDictRange_Unspecified, DcmDictRange_Even,
+ NULL }
+ , { 0x5000, 0x0005, 0x50ff, 0x0005,
+ EVR_US, "RETIRED_CurveDimensions", 1, 1, "DICOM/retired",
+ DcmDictRange_Even, DcmDictRange_Unspecified,
NULL }
, { 0x5000, 0x0010, 0x50ff, 0x0010,
EVR_US, "RETIRED_NumberOfPoints", 1, 1, "DICOM/retired",
@@ -27478,86 +27746,6 @@ static const DBI_SimpleEntry simpleBuiltinDict[] = {
EVR_SH, "RETIRED_AxisLabels", 1, -1, "DICOM/retired",
DcmDictRange_Even, DcmDictRange_Unspecified,
NULL }
- , { 0x6000, 0x0012, 0x60ff, 0x0012,
- EVR_US, "RETIRED_OverlayPlanes", 1, 1, "DICOM/retired",
- DcmDictRange_Even, DcmDictRange_Unspecified,
- NULL }
- , { 0x6000, 0x0052, 0x60ff, 0x0052,
- EVR_US, "RETIRED_OverlayPlaneOrigin", 1, 1, "DICOM/retired",
- DcmDictRange_Even, DcmDictRange_Unspecified,
- NULL }
- , { 0x6000, 0x0060, 0x60ff, 0x0060,
- EVR_CS, "RETIRED_OverlayCompressionCode", 1, 1, "DICOM/retired",
- DcmDictRange_Even, DcmDictRange_Unspecified,
- NULL }
- , { 0x6000, 0x0061, 0x60ff, 0x0061,
- EVR_SH, "RETIRED_OverlayCompressionOriginator", 1, 1, "DICOM/retired",
- DcmDictRange_Even, DcmDictRange_Unspecified,
- NULL }
- , { 0x6000, 0x0062, 0x60ff, 0x0062,
- EVR_SH, "RETIRED_OverlayCompressionLabel", 1, 1, "DICOM/retired",
- DcmDictRange_Even, DcmDictRange_Unspecified,
- NULL }
- , { 0x6000, 0x0063, 0x60ff, 0x0063,
- EVR_CS, "RETIRED_OverlayCompressionDescription", 1, 1, "DICOM/retired",
- DcmDictRange_Even, DcmDictRange_Unspecified,
- NULL }
- , { 0x6000, 0x0066, 0x60ff, 0x0066,
- EVR_AT, "RETIRED_OverlayCompressionStepPointers", 1, -1, "DICOM/retired",
- DcmDictRange_Even, DcmDictRange_Unspecified,
- NULL }
- , { 0x6000, 0x0068, 0x60ff, 0x0068,
- EVR_US, "RETIRED_OverlayRepeatInterval", 1, 1, "DICOM/retired",
- DcmDictRange_Even, DcmDictRange_Unspecified,
- NULL }
- , { 0x6000, 0x0069, 0x60ff, 0x0069,
- EVR_US, "RETIRED_OverlayBitsGrouped", 1, 1, "DICOM/retired",
- DcmDictRange_Even, DcmDictRange_Unspecified,
- NULL }
- , { 0x7f00, 0x0010, 0x7fff, 0x0010,
- EVR_ox, "RETIRED_VariablePixelData", 1, 1, "DICOM/retired",
- DcmDictRange_Even, DcmDictRange_Unspecified,
- NULL }
- , { 0x7f00, 0x0011, 0x7fff, 0x0011,
- EVR_US, "RETIRED_VariableNextDataGroup", 1, 1, "DICOM/retired",
- DcmDictRange_Even, DcmDictRange_Unspecified,
- NULL }
- , { 0x7f00, 0x0020, 0x7fff, 0x0020,
- EVR_OW, "RETIRED_VariableCoefficientsSDVN", 1, 1, "DICOM/retired",
- DcmDictRange_Even, DcmDictRange_Unspecified,
- NULL }
- , { 0x7f00, 0x0030, 0x7fff, 0x0030,
- EVR_OW, "RETIRED_VariableCoefficientsSDHN", 1, 1, "DICOM/retired",
- DcmDictRange_Even, DcmDictRange_Unspecified,
- NULL }
- , { 0x7f00, 0x0040, 0x7fff, 0x0040,
- EVR_OW, "RETIRED_VariableCoefficientsSDDN", 1, 1, "DICOM/retired",
- DcmDictRange_Even, DcmDictRange_Unspecified,
- NULL }
- , { 0x0009, 0x0010, 0xffff, 0x00ff,
- EVR_LO, "PrivateCreator", 1, 1, "PRIVATE",
- DcmDictRange_Odd, DcmDictRange_Unspecified,
- NULL }
- , { 0x0001, 0x0000, 0x0007, 0x0000,
- EVR_UL, "IllegalGroupLength", 1, 1, "ILLEGAL",
- DcmDictRange_Odd, DcmDictRange_Unspecified,
- NULL }
- , { 0x0001, 0x0010, 0x0007, 0x00ff,
- EVR_LO, "IllegalPrivateCreator", 1, 1, "ILLEGAL",
- DcmDictRange_Odd, DcmDictRange_Unspecified,
- NULL }
- , { 0x0000, 0x0000, 0xffff, 0x0000,
- EVR_UL, "GenericGroupLength", 1, 1, "GENERIC",
- DcmDictRange_Unspecified, DcmDictRange_Unspecified,
- NULL }
- , { 0x0020, 0x3100, 0x0020, 0x31ff,
- EVR_CS, "RETIRED_SourceImageIDs", 1, -1, "DICOM/retired",
- DcmDictRange_Unspecified, DcmDictRange_Even,
- NULL }
- , { 0x5000, 0x0005, 0x50ff, 0x0005,
- EVR_US, "RETIRED_CurveDimensions", 1, 1, "DICOM/retired",
- DcmDictRange_Even, DcmDictRange_Unspecified,
- NULL }
, { 0x5000, 0x0103, 0x50ff, 0x0103,
EVR_US, "RETIRED_DataValueRepresentation", 1, 1, "DICOM/retired",
DcmDictRange_Even, DcmDictRange_Unspecified,
@@ -27638,6 +27826,42 @@ static const DBI_SimpleEntry simpleBuiltinDict[] = {
EVR_ox, "RETIRED_CurveData", 1, 1, "DICOM/retired",
DcmDictRange_Even, DcmDictRange_Unspecified,
NULL }
+ , { 0x6000, 0x0012, 0x60ff, 0x0012,
+ EVR_US, "RETIRED_OverlayPlanes", 1, 1, "DICOM/retired",
+ DcmDictRange_Even, DcmDictRange_Unspecified,
+ NULL }
+ , { 0x6000, 0x0052, 0x60ff, 0x0052,
+ EVR_US, "RETIRED_OverlayPlaneOrigin", 1, 1, "DICOM/retired",
+ DcmDictRange_Even, DcmDictRange_Unspecified,
+ NULL }
+ , { 0x6000, 0x0060, 0x60ff, 0x0060,
+ EVR_CS, "RETIRED_OverlayCompressionCode", 1, 1, "DICOM/retired",
+ DcmDictRange_Even, DcmDictRange_Unspecified,
+ NULL }
+ , { 0x6000, 0x0061, 0x60ff, 0x0061,
+ EVR_SH, "RETIRED_OverlayCompressionOriginator", 1, 1, "DICOM/retired",
+ DcmDictRange_Even, DcmDictRange_Unspecified,
+ NULL }
+ , { 0x6000, 0x0062, 0x60ff, 0x0062,
+ EVR_SH, "RETIRED_OverlayCompressionLabel", 1, 1, "DICOM/retired",
+ DcmDictRange_Even, DcmDictRange_Unspecified,
+ NULL }
+ , { 0x6000, 0x0063, 0x60ff, 0x0063,
+ EVR_CS, "RETIRED_OverlayCompressionDescription", 1, 1, "DICOM/retired",
+ DcmDictRange_Even, DcmDictRange_Unspecified,
+ NULL }
+ , { 0x6000, 0x0066, 0x60ff, 0x0066,
+ EVR_AT, "RETIRED_OverlayCompressionStepPointers", 1, -1, "DICOM/retired",
+ DcmDictRange_Even, DcmDictRange_Unspecified,
+ NULL }
+ , { 0x6000, 0x0068, 0x60ff, 0x0068,
+ EVR_US, "RETIRED_OverlayRepeatInterval", 1, 1, "DICOM/retired",
+ DcmDictRange_Even, DcmDictRange_Unspecified,
+ NULL }
+ , { 0x6000, 0x0069, 0x60ff, 0x0069,
+ EVR_US, "RETIRED_OverlayBitsGrouped", 1, 1, "DICOM/retired",
+ DcmDictRange_Even, DcmDictRange_Unspecified,
+ NULL }
, { 0x6000, 0x0110, 0x60ff, 0x0110,
EVR_CS, "RETIRED_OverlayFormat", 1, 1, "DICOM/retired",
DcmDictRange_Even, DcmDictRange_Unspecified,
@@ -27698,6 +27922,46 @@ static const DBI_SimpleEntry simpleBuiltinDict[] = {
EVR_LT, "RETIRED_OverlayComments", 1, 1, "DICOM/retired",
DcmDictRange_Even, DcmDictRange_Unspecified,
NULL }
+ , { 0x7f00, 0x0010, 0x7fff, 0x0010,
+ EVR_ox, "RETIRED_VariablePixelData", 1, 1, "DICOM/retired",
+ DcmDictRange_Even, DcmDictRange_Unspecified,
+ NULL }
+ , { 0x7f00, 0x0011, 0x7fff, 0x0011,
+ EVR_US, "RETIRED_VariableNextDataGroup", 1, 1, "DICOM/retired",
+ DcmDictRange_Even, DcmDictRange_Unspecified,
+ NULL }
+ , { 0x7f00, 0x0020, 0x7fff, 0x0020,
+ EVR_OW, "RETIRED_VariableCoefficientsSDVN", 1, 1, "DICOM/retired",
+ DcmDictRange_Even, DcmDictRange_Unspecified,
+ NULL }
+ , { 0x7f00, 0x0030, 0x7fff, 0x0030,
+ EVR_OW, "RETIRED_VariableCoefficientsSDHN", 1, 1, "DICOM/retired",
+ DcmDictRange_Even, DcmDictRange_Unspecified,
+ NULL }
+ , { 0x7f00, 0x0040, 0x7fff, 0x0040,
+ EVR_OW, "RETIRED_VariableCoefficientsSDDN", 1, 1, "DICOM/retired",
+ DcmDictRange_Even, DcmDictRange_Unspecified,
+ NULL }
+ , { 0x0009, 0x0000, 0xffff, 0x0000,
+ EVR_UL, "PrivateGroupLength", 1, 1, "PRIVATE",
+ DcmDictRange_Odd, DcmDictRange_Unspecified,
+ NULL }
+ , { 0x0009, 0x0010, 0xffff, 0x00ff,
+ EVR_LO, "PrivateCreator", 1, 1, "PRIVATE",
+ DcmDictRange_Odd, DcmDictRange_Unspecified,
+ NULL }
+ , { 0x0001, 0x0000, 0x0007, 0x0000,
+ EVR_UL, "IllegalGroupLength", 1, 1, "ILLEGAL",
+ DcmDictRange_Odd, DcmDictRange_Unspecified,
+ NULL }
+ , { 0x0001, 0x0010, 0x0007, 0x00ff,
+ EVR_LO, "IllegalPrivateCreator", 1, 1, "ILLEGAL",
+ DcmDictRange_Odd, DcmDictRange_Unspecified,
+ NULL }
+ , { 0x0000, 0x0000, 0xffff, 0x0000,
+ EVR_UL, "GenericGroupLength", 1, 1, "GENERIC",
+ DcmDictRange_Unspecified, DcmDictRange_Unspecified,
+ NULL }
#ifdef ENABLE_PRIVATE_TAGS
, { 0x7001, 0x0004, 0x70ff, 0x0004,
EVR_ST, "TextAnnotation", 1, 1, "PrivateTag",
diff --git a/dcmdata/libsrc/dcdirrec.cc b/dcmdata/libsrc/dcdirrec.cc
index e863e25..982ecea 100644
--- a/dcmdata/libsrc/dcdirrec.cc
+++ b/dcmdata/libsrc/dcdirrec.cc
@@ -102,7 +102,8 @@ static const char *DRTypeNames[] =
"IMPLANT ASSY",
"PLAN",
"SURFACE SCAN",
- "TRACT"
+ "TRACT",
+ "ASSESSMENT"
};
static const short DIM_OF_DRTypeNames = OFstatic_cast(short, (sizeof(DRTypeNames) / sizeof(DRTypeNames[0])));
@@ -432,6 +433,7 @@ OFCondition DcmDirectoryRecord::checkHierarchy(const E_DirRecType upperRecord,
case ERT_Plan:
case ERT_SurfaceScan:
case ERT_Tract:
+ case ERT_Assessment:
case ERT_Private:
l_error = EC_Normal;
break;
@@ -527,6 +529,7 @@ OFCondition DcmDirectoryRecord::checkHierarchy(const E_DirRecType upperRecord,
case ERT_Plan:
case ERT_SurfaceScan:
case ERT_Tract:
+ case ERT_Assessment:
case ERT_Private:
switch (lowerRecord)
{
diff --git a/dcmdata/libsrc/dcerror.cc b/dcmdata/libsrc/dcerror.cc
index e0afd61..5186c12 100644
--- a/dcmdata/libsrc/dcerror.cc
+++ b/dcmdata/libsrc/dcerror.cc
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 1994-2015, OFFIS e.V.
+ * Copyright (C) 1994-2016, OFFIS e.V.
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation were developed by
@@ -71,12 +71,10 @@ makeOFConditionConst(EC_CannotCheck, OFM_dcmdata, 45, OF_err
makeOFConditionConst(EC_MissingValue, OFM_dcmdata, 46, OF_error, "Missing value");
makeOFConditionConst(EC_MissingAttribute, OFM_dcmdata, 47, OF_error, "Missing attribute");
makeOFConditionConst(EC_InternalError, OFM_dcmdata, 48, OF_error, "Internal error");
+makeOFConditionConst(EC_InvalidCharacter, OFM_dcmdata, 49, OF_error, "Invalid character");
+// error code 50 is reserved for determine start fragment error messages (see below)
-const unsigned short EC_CODE_CannotSelectCharacterSet = 35;
-const unsigned short EC_CODE_CannotConvertCharacterSet = 36;
-const unsigned short EC_CODE_CannotConvertToXML = 37;
-
-const char *dcmErrorConditionToString(OFCondition cond)
-{
- return cond.text();
-}
+const unsigned short EC_CODE_CannotSelectCharacterSet = 35;
+const unsigned short EC_CODE_CannotConvertCharacterSet = 36;
+const unsigned short EC_CODE_CannotConvertToXML = 37;
+const unsigned short EC_CODE_CannotDetermineStartFragment = 50;
diff --git a/dcmdata/libsrc/dcitem.cc b/dcmdata/libsrc/dcitem.cc
index 5494c9d..c832ab4 100644
--- a/dcmdata/libsrc/dcitem.cc
+++ b/dcmdata/libsrc/dcitem.cc
@@ -313,7 +313,7 @@ E_TransferSyntax DcmItem::checkTransferSyntax(DcmInputStream &inStream)
/* VR, we need to find out which of the two tags was valid */
if (taglittle.error().bad())
{
- /* if the litte endian tag was invalid, the transfer syntax is big endian explicit */
+ /* if the little endian tag was invalid, the transfer syntax is big endian explicit */
transferSyntax = EXS_BigEndianExplicit;
}
else if (tagbig.error().bad())
@@ -722,7 +722,7 @@ OFCondition DcmItem::computeGroupLengthAndPadding(const E_GrpLenEncoding glenc,
beginning = OFFalse;
/* if the current element is a group length element and its data type */
- /* is not UL replace this element with one that has a UL datatype since */
+ /* is not UL replace this element with one that has a UL data type since */
/* group length elements are supposed to have this data type */
if (dO->getETag() == 0x0000 && dO->ident() != EVR_UL)
{
@@ -1324,8 +1324,9 @@ OFCondition DcmItem::read(DcmInputStream & inStream,
/* for this element; hence lastElementComplete is true again */
if (errorFlag.good())
lastElementComplete = OFTrue;
- /* in data sets, group 0x0000 to 0x0003, 0x0005, 0x0007 and 0xFFFF are not allowed */
- if ((newTag.getGroup() == 0x0000) || (newTag.getGroup() == 0x0002) || !newTag.hasValidGroup())
+ /* in data or command sets, group 0x0001 to 0x0003, 0x0005, 0x0007 and 0xFFFF are not allowed. */
+ /* (we cannot check for group 0x0000 since we do not know whether we read a data or command set.)*/
+ if (!newTag.hasValidGroup() || (newTag.getGroup() == 0x0002))
DCMDATA_WARN("DcmItem: Invalid Element " << newTag << " found in data set");
}
} else {
diff --git a/dcmdata/libsrc/dcrleccd.cc b/dcmdata/libsrc/dcrleccd.cc
index 1b194f7..503a5ef 100644
--- a/dcmdata/libsrc/dcrleccd.cc
+++ b/dcmdata/libsrc/dcrleccd.cc
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2002-2010, OFFIS e.V.
+ * Copyright (C) 2002-2016, OFFIS e.V.
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation were developed by
@@ -197,7 +197,7 @@ OFCondition DcmRLECodecDecoder::decode(
// temporary variables
Uint32 sample = 0;
Uint32 byte = 0;
- register Uint32 pixel = 0;
+ Uint32 pixel = 0;
// for each stripe in stripe set
for (i=0; (i<numberOfStripes) && result.good(); ++i)
@@ -520,7 +520,7 @@ OFCondition DcmRLECodecDecoder::decodeFrame(
// temporary variables
Uint32 sample = 0;
Uint32 byte = 0;
- register Uint32 pixel = 0;
+ Uint32 pixel = 0;
size_t bytesToDecode;
// for each stripe in stripe set
diff --git a/dcmdata/libsrc/dcrlecce.cc b/dcmdata/libsrc/dcrlecce.cc
index 16b6c06..6d54eff 100644
--- a/dcmdata/libsrc/dcrlecce.cc
+++ b/dcmdata/libsrc/dcrlecce.cc
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2002-2014, OFFIS e.V.
+ * Copyright (C) 2002-2016, OFFIS e.V.
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation were developed by
@@ -212,8 +212,8 @@ OFCondition DcmRLECodecEncoder::encode(
Uint32 offsetBetweenSamples = 0;
Uint32 sample = 0;
Uint32 byte = 0;
- register Uint32 pixel = 0;
- register Uint32 columnCounter = 0;
+ Uint32 pixel = 0;
+ Uint32 columnCounter = 0;
DcmRLEEncoder *rleEncoder = NULL;
Uint32 rleSize = 0;
diff --git a/dcmdata/libsrc/dcsequen.cc b/dcmdata/libsrc/dcsequen.cc
index 2b149e9..c69f208 100644
--- a/dcmdata/libsrc/dcsequen.cc
+++ b/dcmdata/libsrc/dcsequen.cc
@@ -203,7 +203,7 @@ int DcmSequenceOfItems::compare(const DcmElement& rhs) const
DcmItem* rhsVal = myRhs->getItem(count);
if (rhsVal)
{
- int result = val->compare(*rhsVal);
+ result = val->compare(*rhsVal);
if (result != 0)
{
return result;
diff --git a/dcmdata/libsrc/dcswap.cc b/dcmdata/libsrc/dcswap.cc
index 0116a92..b6f041e 100644
--- a/dcmdata/libsrc/dcswap.cc
+++ b/dcmdata/libsrc/dcswap.cc
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 1994-2012, OFFIS e.V.
+ * Copyright (C) 1994-2016, OFFIS e.V.
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation were developed by
@@ -79,15 +79,14 @@ void swapBytes(void * value, const Uint32 byteLength,
* valWidth - [in] Specifies how many bytes shall be treated together as one element.
*/
{
- /* use register (if available) to increase speed */
- register Uint8 save;
+ Uint8 save;
/* in case valWidth equals 2, swap correspondingly */
if (valWidth == 2)
{
- register Uint8 *first = &OFstatic_cast(Uint8*, value)[0];
- register Uint8 *second = &OFstatic_cast(Uint8*, value)[1];
- register Uint32 times = byteLength / 2;
+ Uint8 *first = &OFstatic_cast(Uint8*, value)[0];
+ Uint8 *second = &OFstatic_cast(Uint8*, value)[1];
+ Uint32 times = byteLength / 2;
while(times--)
{
save = *first;
@@ -100,11 +99,11 @@ void swapBytes(void * value, const Uint32 byteLength,
/* if valWidth is greater than 2, swap correspondingly */
else if (valWidth > 2)
{
- register size_t i;
+ size_t i;
const size_t halfWidth = valWidth / 2;
const size_t offset = valWidth - 1;
- register Uint8 *start;
- register Uint8 *end;
+ Uint8 *start;
+ Uint8 *end;
Uint32 times = OFstatic_cast(Uint32, byteLength / valWidth);
Uint8 *base = OFstatic_cast(Uint8 *, value);
diff --git a/dcmdata/libsrc/dcuid.cc b/dcmdata/libsrc/dcuid.cc
index 5e48791..18bbad1 100644
--- a/dcmdata/libsrc/dcuid.cc
+++ b/dcmdata/libsrc/dcuid.cc
@@ -156,6 +156,7 @@ static const UIDNameMap uidNameMap[] = {
{ UID_Comprehensive3DSRStorage, "Comprehensive3DSRStorage" },
{ UID_ComprehensiveSRStorage, "ComprehensiveSRStorage" },
{ UID_ComputedRadiographyImageStorage, "ComputedRadiographyImageStorage" },
+ { UID_ContentAssessmentResultsStorage, "ContentAssessmentResultsStorage" },
{ UID_CornealTopographyMapStorage, "CornealTopographyMapStorage" },
{ UID_CTImageStorage, "CTImageStorage" },
{ UID_DeformableSpatialRegistrationStorage, "DeformableSpatialRegistrationStorage" },
@@ -281,6 +282,9 @@ static const UIDNameMap uidNameMap[] = {
{ UID_DICOS_DigitalXRayImageStorageForPresentation, "DICOS_DigitalXRayImageStorageForPresentation" },
{ UID_DICOS_DigitalXRayImageStorageForProcessing, "DICOS_DigitalXRayImageStorageForProcessing" },
{ UID_DICOS_ThreatDetectionReportStorage, "DICOS_ThreatDetectionReportStorage" },
+ { UID_DICOS_2DAITStorage, "DICOS_2DAITStorage" },
+ { UID_DICOS_3DAITStorage, "DICOS_3DAITStorage" },
+ { UID_DICOS_QuadrupoleResonanceStorage, "DICOS_QuadrupoleResonanceStorage" },
// Storage (DICONDE)
{ UID_DICONDE_EddyCurrentImageStorage, "DICONDE_EddyCurrentImageStorage" },
{ UID_DICONDE_EddyCurrentMultiframeImageStorage, "DICONDE_EddyCurrentMultiframeImageStorage" },
@@ -555,6 +559,7 @@ const char* dcmAllStorageSOPClassUIDs[] = {
UID_Comprehensive3DSRStorage,
UID_ComprehensiveSRStorage,
UID_ComputedRadiographyImageStorage,
+ UID_ContentAssessmentResultsStorage,
UID_CornealTopographyMapStorage,
UID_CTImageStorage,
UID_DeformableSpatialRegistrationStorage,
@@ -685,6 +690,9 @@ const char* dcmAllStorageSOPClassUIDs[] = {
UID_DICOS_DigitalXRayImageStorageForPresentation,
UID_DICOS_DigitalXRayImageStorageForProcessing,
UID_DICOS_ThreatDetectionReportStorage,
+ UID_DICOS_2DAITStorage,
+ UID_DICOS_3DAITStorage,
+ UID_DICOS_QuadrupoleResonanceStorage,
// DICONDE
UID_DICONDE_EddyCurrentImageStorage,
UID_DICONDE_EddyCurrentMultiframeImageStorage,
@@ -812,7 +820,8 @@ const char* dcmLongSCUStorageSOPClassUIDs[] = {
// UID_AcquisitionContextSRStorage,
// UID_BreastProjectionXRayImageStorageForPresentation,
// UID_BreastProjectionXRayImageStorageForProcessing,
-// UID_CompositingPlanarMPRVolumetricPresentationStateStorage
+// UID_CompositingPlanarMPRVolumetricPresentationStateStorage,
+// UID_ContentAssessmentResultsStorage,
// UID_CornealTopographyMapStorage,
// UID_ExtensibleSRStorage,
// UID_GrayscalePlanarMPRVolumetricPresentationStateStorage
@@ -852,6 +861,9 @@ const char* dcmLongSCUStorageSOPClassUIDs[] = {
// UID_DICOS_DigitalXRayImageStorageForPresentation,
// UID_DICOS_DigitalXRayImageStorageForProcessing,
// UID_DICOS_ThreatDetectionReportStorage,
+// UID_DICOS_2DAITStorage,
+// UID_DICOS_3DAITStorage,
+// UID_DICOS_QuadrupoleResonanceStorage,
// DICONDE
// UID_DICONDE_EddyCurrentImageStorage,
// UID_DICONDE_EddyCurrentMultiframeImageStorage,
@@ -1071,6 +1083,7 @@ static const DcmModalityTable modalities[] = {
{ UID_Comprehensive3DSRStorage, "SR3", 4096 },
{ UID_ComprehensiveSRStorage, "SRc", 4096 },
{ UID_ComputedRadiographyImageStorage, "CR", 2048 * 2048 * 2 },
+ { UID_ContentAssessmentResultsStorage, "AS", 4096 },
{ UID_CornealTopographyMapStorage, "CM", 512 * 512 },
{ UID_CTImageStorage, "CT", 512 * 512 * 2 },
{ UID_DeformableSpatialRegistrationStorage, "RGd", 4096 },
@@ -1201,6 +1214,9 @@ static const DcmModalityTable modalities[] = {
{ UID_DICOS_DigitalXRayImageStorageForPresentation, "DXs", 2048 * 2048 * 2 },
{ UID_DICOS_DigitalXRayImageStorageForProcessing, "DPs", 2048 * 2048 * 2 },
{ UID_DICOS_ThreatDetectionReportStorage, "TDR", 4096 },
+ { UID_DICOS_2DAITStorage, "AI2", 4096 },
+ { UID_DICOS_3DAITStorage, "AI3", 4096 },
+ { UID_DICOS_QuadrupoleResonanceStorage, "QR", 4096 },
// DICONDE
{ UID_DICONDE_EddyCurrentImageStorage, "EC", 512 * 512 },
{ UID_DICONDE_EddyCurrentMultiframeImageStorage, "ECm", 512 * 512 }
diff --git a/dcmdata/libsrc/dcvr.cc b/dcmdata/libsrc/dcvr.cc
index 09c8b15..5d33fb3 100644
--- a/dcmdata/libsrc/dcvr.cc
+++ b/dcmdata/libsrc/dcvr.cc
@@ -234,8 +234,8 @@ DcmVR::setVR(const char* vrName)
* letters as "real" future VRs (and thus assume extended length).
* All other VR strings are treated as "illegal" VRs.
*/
- register char c1 = *vrName;
- register char c2 = (c1) ? (*(vrName + 1)) : ('\0');
+ char c1 = *vrName;
+ char c2 = (c1) ? (*(vrName + 1)) : ('\0');
if ((c1 == '?') && (c2 == '?')) vr = EVR_UNKNOWN2B;
if (!found && ((c1 < 'A') || (c1 > 'Z') || (c2 < 'A') || (c2 > 'Z'))) vr = EVR_UNKNOWN2B;
}
diff --git a/dcmdata/libsrc/dcvrpn.cc b/dcmdata/libsrc/dcvrpn.cc
index c832667..0fb5852 100644
--- a/dcmdata/libsrc/dcvrpn.cc
+++ b/dcmdata/libsrc/dcvrpn.cc
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 1994-2013, OFFIS e.V.
+ * Copyright (C) 1994-2016, OFFIS e.V.
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation were developed by
@@ -452,10 +452,19 @@ OFCondition DcmPersonName::checkStringValue(const OFString &value,
const size_t length = (posEnd == OFString_npos) ? valLen - posStart : posEnd - posStart;
if (dcmEnableVRCheckerForStringValues.get())
{
+ /* check for non-ASCII characters (if default character set used) */
+ if (charset.empty() || (charset == "ISO_IR 6"))
+ {
+ if (DcmByteString::containsExtendedCharacters(value.c_str() + posStart, length))
+ {
+ result = EC_InvalidCharacter;
+ break;
+ }
+ }
/* currently, the VR checker only supports ASCII and Latin-1 */
if (charset.empty() || (charset == "ISO_IR 6") || (charset == "ISO_IR 100"))
{
- /* check value representation */
+ /* check value representation (VR) */
const int vrID = DcmElement::scanValue(value, "pn", posStart, length);
if (vrID != 11)
{
@@ -468,7 +477,7 @@ OFCondition DcmPersonName::checkStringValue(const OFString &value,
}
if (result.good() && !vm.empty())
{
- /* check value multiplicity */
+ /* check value multiplicity (VM) */
result = DcmElement::checkVM(vmNum, vm);
}
}
diff --git a/dcmdata/tests/tchval.cc b/dcmdata/tests/tchval.cc
index 4c2416a..e57c1f5 100644
--- a/dcmdata/tests/tchval.cc
+++ b/dcmdata/tests/tchval.cc
@@ -150,27 +150,28 @@ OFTEST(dcmdata_checkStringValue)
CHECK_GOOD( "LO-03", DcmLongString::checkStringValue("ABC 123 abc _+-/", "1") )
CHECK_GOOD( "LO-04", DcmLongString::checkStringValue(" ", "1") )
CHECK_GOOD( "LO-05", DcmLongString::checkStringValue("ABC\\123", "2") )
- CHECK_GOOD( "LO-06", DcmLongString::checkStringValue(" J\366rg Riesmeier ", "1") )
+ CHECK_GOOD( "LO-06", DcmLongString::checkStringValue(" J\366rg Riesmeier ", "1", "ISO_IR 100") )
+// maximum length cannot be checked if given in characters (and not bytes)
// CHECK_BAD ( "LO-07", DcmLongString::checkStringValueu("OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany, http://www.offis.de/", "1") )
CHECK_GOOD( "LO-08", DcmLongString::checkStringValue("\\ _2_ \\ _3_ \\ _4_ \\ _5_ \\", "6") )
CHECK_GOOD( "LO-09", DcmLongString::checkStringValue("ESC\033aping", "1") )
CHECK_BAD ( "LO-10", DcmLongString::checkStringValue("not allowed: \r\014", "1") )
/* test "Long Text" */
- CHECK_GOOD( "LT-01", DcmLongText::checkStringValue(" Hello \\ 12345 \\ \344\366\374\337 ") )
+ CHECK_GOOD( "LT-01", DcmLongText::checkStringValue(" Hello \\ 12345 \\ \344\366\374\337 ", "ISO_IR 100") )
CHECK_GOOD( "LT-02", DcmLongText::checkStringValue(" permitted control characters: \011 \012 \014 \015 ") )
CHECK_GOOD( "LT-03", DcmLongText::checkStringValue(" ") )
/* test "Person Name" */
- CHECK_GOOD( "PN-01", DcmPersonName::checkStringValue("A^Riesmeier^^=R^J\366rg", "1") )
- CHECK_GOOD( "PN-02", DcmPersonName::checkStringValue("A^Riesmeier^^=R^J\366rg\\", "1-n") )
+ CHECK_GOOD( "PN-01", DcmPersonName::checkStringValue("A^Riesmeier^^=R^J\366rg", "1", "ISO_IR 100") )
+ CHECK_GOOD( "PN-02", DcmPersonName::checkStringValue("A^Riesmeier^^=R^J\366rg\\", "1-n", "ISO_IR 100") )
CHECK_BAD ( "PN-03", DcmPersonName::checkStringValue("A^Riesmeier^^=R^J\366rg\\", "1") )
- CHECK_GOOD( "PN-04", DcmPersonName::checkStringValue("Eichelberg^Marco^^Dr.=Onken^Michael^=Riesmeier^J\366rg^^Dr.^", "1") )
+ CHECK_GOOD( "PN-04", DcmPersonName::checkStringValue("Eichelberg^Marco^^Dr.=Onken^Michael^=Riesmeier^J\366rg^^Dr.^", "1", "ISO_IR 100") )
CHECK_GOOD( "PN-05", DcmPersonName::checkStringValue("Eichelberg\\Onken\\Riesmeier", "3") )
CHECK_GOOD( "PN-06", DcmPersonName::checkStringValue(" ") )
CHECK_GOOD( "PN-07", DcmPersonName::checkStringValue(" A") )
CHECK_GOOD( "PN-08", DcmPersonName::checkStringValue("^^^^") )
- CHECK_GOOD( "PN-09", DcmPersonName::checkStringValue("^ J\366rg ^") )
+ CHECK_BAD ( "PN-09", DcmPersonName::checkStringValue("^ J\366rg ^") )
CHECK_GOOD( "PN-10", DcmPersonName::checkStringValue("^^^^MD ") )
CHECK_BAD ( "PN-11", DcmPersonName::checkStringValue("^^^^^") )
CHECK_GOOD( "PN-12", DcmPersonName::checkStringValue("A^B^C^D^E=F^G^H^I^J=K^L^M^N^O") )
@@ -196,7 +197,8 @@ OFTEST(dcmdata_checkStringValue)
CHECK_GOOD( "SH-03", DcmShortString::checkStringValue("ABC 123 abc _+-/", "1") )
CHECK_GOOD( "SH-04", DcmShortString::checkStringValue(" ", "1") )
CHECK_GOOD( "SH-05", DcmShortString::checkStringValue("ABC\\123", "2") )
- CHECK_GOOD( "SH-06", DcmShortString::checkStringValue(" J\366rg Riesmeier ", "1") )
+ CHECK_GOOD( "SH-06", DcmShortString::checkStringValue(" J\366rg Riesmeier ", "1", "ISO_IR 100") )
+// maximum length cannot be checked if given in characters (and not bytes)
// CHECK_BAD ( "SH-07", DcmShortString::checkStringValue("OFFIS e.V., Oldenburg", "1") )
CHECK_GOOD( "SH-08", DcmShortString::checkStringValue("\\ _2_ \\ _3_ \\ _4_ \\ _5_ \\", "6") )
CHECK_BAD ( "SH-09", DcmShortString::checkStringValue(" ", "2") )
@@ -205,7 +207,7 @@ OFTEST(dcmdata_checkStringValue)
CHECK_BAD ( "SH-12", DcmShortString::checkStringValue("not allowed: \n\010\r\014", "1") )
/* test "Short Text" */
- CHECK_GOOD( "ST-01", DcmShortText::checkStringValue(" umlaut characters are allowed: \304\326\334\344\366\374\naccented characters also: \341\340\351\350\355\354\342\352\364\rand control characters, of course, including \033=ESC ") )
+ CHECK_GOOD( "ST-01", DcmShortText::checkStringValue(" umlaut characters are allowed: \304\326\334\344\366\374\naccented characters also: \341\340\351\350\355\354\342\352\364\rand control characters, of course, including \033=ESC ", "ISO_IR 100") )
CHECK_BAD ( "ST-02", DcmShortText::checkStringValue(" other control characters are not allowed: \013 \010 \200 ") )
CHECK_GOOD( "ST-03", DcmShortText::checkStringValue(" . ") )
CHECK_GOOD( "ST-04", DcmShortText::checkStringValue(" ") )
@@ -231,7 +233,7 @@ OFTEST(dcmdata_checkStringValue)
/* test "Unlimited Characters" */
CHECK_GOOD( "UC-01", DcmUnlimitedCharacters::checkStringValue("ABC", "1") )
CHECK_GOOD( "UC-02", DcmUnlimitedCharacters::checkStringValue("ABC\\123", "2") )
- CHECK_GOOD( "UC-03", DcmUnlimitedCharacters::checkStringValue(" J\366rg Riesmeier ", "1") )
+ CHECK_GOOD( "UC-03", DcmUnlimitedCharacters::checkStringValue(" J\366rg Riesmeier ", "1", "ISO_IR 100") )
CHECK_GOOD( "UC-04", DcmUnlimitedCharacters::checkStringValue("ESC\033aping", "1") )
CHECK_BAD ( "UC-05", DcmUnlimitedCharacters::checkStringValue("not allowed: \n\010\r\014", "1") )
CHECK_GOOD( "UC-06", DcmUnlimitedCharacters::checkStringValue(" ", "1") )
diff --git a/dcmfg/include/dcmtk/dcmfg/fg.h b/dcmfg/include/dcmtk/dcmfg/fg.h
index 5a78d0a..b240d0d 100644
--- a/dcmfg/include/dcmtk/dcmfg/fg.h
+++ b/dcmfg/include/dcmtk/dcmfg/fg.h
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2015, Open Connections GmbH
+ * Copyright (C) 2015-2016, Open Connections GmbH
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation are maintained by
@@ -51,7 +51,7 @@ public:
*/
FunctionalGroups();
- /** Virtual desctructor, cleans up set of functional groups and
+ /** Virtual destructor, cleans up set of functional groups and
* frees the related memory
*/
virtual ~FunctionalGroups();
diff --git a/dcmfg/include/dcmtk/dcmfg/fgbase.h b/dcmfg/include/dcmtk/dcmfg/fgbase.h
index 19457a9..7207159 100644
--- a/dcmfg/include/dcmtk/dcmfg/fgbase.h
+++ b/dcmfg/include/dcmtk/dcmfg/fgbase.h
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2015, Open Connections GmbH
+ * Copyright (C) 2015-2016, Open Connections GmbH
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation are maintained by
@@ -74,7 +74,7 @@ public:
*/
virtual void clearData() =0;
- /** Virtual desctructor
+ /** Virtual destructor
*/
virtual ~FGBase();
@@ -103,7 +103,7 @@ public:
*/
virtual int compare(const FGBase& rhs) const = 0;
- /** Returs a deep copy of this object
+ /** Returns a deep copy of this object
* @return Deep copy of this object
*/
virtual FGBase *clone() const = 0;
@@ -182,7 +182,7 @@ public:
*/
virtual DcmFGTypes::E_FGSharedType getSharedType() const {return m_sharedType;}
- /** Returs a deep copy of this object
+ /** Returns a deep copy of this object
* @return Deep copy of this object
*/
virtual FGBase *clone() const;
@@ -232,7 +232,7 @@ public:
*/
virtual int compare(const FGBase& rhs) const;
- /** Virtual desctructor, frees memory
+ /** Virtual destructor, frees memory
*/
virtual ~FGUnknown();
diff --git a/dcmfg/include/dcmtk/dcmfg/fgderimg.h b/dcmfg/include/dcmtk/dcmfg/fgderimg.h
index 3ea9136..1b4c9c5 100644
--- a/dcmfg/include/dcmtk/dcmfg/fgderimg.h
+++ b/dcmfg/include/dcmtk/dcmfg/fgderimg.h
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2016, Open Connections GmbH
+ * Copyright (C) 2015-2016, Open Connections GmbH
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation are maintained by
@@ -40,7 +40,7 @@ public:
*/
SourceImageItem();
- /** Virtual desctructor, cleans up memory
+ /** Virtual destructor, cleans up memory
*/
virtual ~SourceImageItem();
@@ -131,7 +131,7 @@ public:
*/
DerivationImageItem();
- /** Virtual desctructor
+ /** Virtual destructor
*/
virtual ~DerivationImageItem();
@@ -217,7 +217,7 @@ public:
*/
virtual OFVector<CodeSequenceMacro*>& getDerivationCodeItems();
- /** Get reference to source image itmes
+ /** Get reference to source image items
* @return Reference to source image items
*/
virtual OFVector<SourceImageItem*>& getSourceImageItems();
@@ -279,7 +279,7 @@ public:
*/
virtual ~FGDerivationImage();
- /** Returs a deep copy of this object
+ /** Returns a deep copy of this object
* @return Deep copy of this object
*/
virtual FGBase *clone() const;
diff --git a/dcmfg/include/dcmtk/dcmfg/fgfracon.h b/dcmfg/include/dcmtk/dcmfg/fgfracon.h
index 9f5f01d..09abd86 100644
--- a/dcmfg/include/dcmtk/dcmfg/fgfracon.h
+++ b/dcmfg/include/dcmtk/dcmfg/fgfracon.h
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2016, Open Connections GmbH
+ * Copyright (C) 2015-2016, Open Connections GmbH
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation are maintained by
@@ -43,7 +43,7 @@ public:
*/
virtual ~FGFrameContent();
- /** Returs a deep copy of this object
+ /** Returns a deep copy of this object
* @return Deep copy of this object
*/
virtual FGBase *clone() const;
@@ -57,7 +57,7 @@ public:
*/
virtual void clearData();
- /** Check whether the current content of this gruop consistent and complete
+ /** Check whether the current content of this group is consistent and complete
* @return EC_Normal, if no errors are found, error otherwise
*/
virtual OFCondition check() const;
@@ -71,7 +71,7 @@ public:
/** Writes the content of this class into Frame Content Sequence
* (newly cerated) into given item
* @param item The item to write to
- * @return EC_Normal if writing was succesful, error otherwise
+ * @return EC_Normal if writing was successful, error otherwise
*/
virtual OFCondition write(DcmItem& item);
@@ -350,7 +350,7 @@ private:
/// Frame Acquisition Duration (FD, 1, 1C)
DcmFloatingPointDouble m_FrameAcquisitionDuration;
- /// Cardiac Cycle Positition (CS, 1, 3)
+ /// Cardiac Cycle Position (CS, 1, 3)
DcmCodeString m_CardiacCyclePosition;
/// Respiratory Cycle Position (CS, 1, 3)
diff --git a/dcmfg/include/dcmtk/dcmfg/fgframevoilut.h b/dcmfg/include/dcmtk/dcmfg/fgframevoilut.h
index c7120d8..81cb660 100644
--- a/dcmfg/include/dcmtk/dcmfg/fgframevoilut.h
+++ b/dcmfg/include/dcmtk/dcmfg/fgframevoilut.h
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2015, Open Connections GmbH
+ * Copyright (C) 2015-2016, Open Connections GmbH
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation are maintained by
@@ -36,11 +36,11 @@ public:
*/
FGFrameVOILUT();
- /** Virutal destructor
+ /** Virtual destructor
*/
virtual ~FGFrameVOILUT();
- /** Returs a deep copy of this object
+ /** Returns a deep copy of this object
* @return Deep copy of this object
*/
virtual FGBase *clone() const;
diff --git a/dcmfg/include/dcmtk/dcmfg/fgimagedatatype.h b/dcmfg/include/dcmtk/dcmfg/fgimagedatatype.h
index 9ebceff..1ba990f 100644
--- a/dcmfg/include/dcmtk/dcmfg/fgimagedatatype.h
+++ b/dcmfg/include/dcmtk/dcmfg/fgimagedatatype.h
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2015, Open Connections GmbH
+ * Copyright (C) 2015-2016, Open Connections GmbH
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation are maintained by
@@ -41,7 +41,7 @@ public:
*/
virtual ~FGImageDataType();
- /** Returs a deep copy of this object
+ /** Returns a deep copy of this object
* @return Deep copy of this object
*/
virtual FGBase *clone() const;
diff --git a/dcmfg/include/dcmtk/dcmfg/fginterface.h b/dcmfg/include/dcmtk/dcmfg/fginterface.h
index 05f7131..5af1df1 100644
--- a/dcmfg/include/dcmtk/dcmfg/fginterface.h
+++ b/dcmfg/include/dcmtk/dcmfg/fginterface.h
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2015, Open Connections GmbH
+ * Copyright (C) 2015-2016, Open Connections GmbH
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation are maintained by
@@ -74,7 +74,7 @@ public:
virtual OFBool check();
/** Returns number of frames. Computed by number of per-frame
- * functional group items (i.e.\ the Number of Frames attribues
+ * functional group items (i.e.\ the Number of Frames attribute
* is not taken into account).
* @return Number of frames
*/
@@ -181,7 +181,7 @@ protected:
/** Get shared functional group based on its type
* @param fgType The type of functional group
- * @return The functional group or NULL if not existant
+ * @return The functional group or NULL if not existent
*/
virtual FGBase* getShared(const DcmFGTypes::E_FGType fgType);
@@ -198,7 +198,7 @@ protected:
/** Get per-frame functional group
* @param frameNo The frame number of the group
* @param fgType The type of the group
- * @return The functional group or NULL if not existant
+ * @return The functional group or NULL if not existent
*/
virtual FGBase* getPerFrame(const Uint32 frameNo,
const DcmFGTypes::E_FGType fgType);
diff --git a/dcmfg/include/dcmtk/dcmfg/fgpixmsr.h b/dcmfg/include/dcmtk/dcmfg/fgpixmsr.h
index 4387acd..72f43f1 100644
--- a/dcmfg/include/dcmtk/dcmfg/fgpixmsr.h
+++ b/dcmfg/include/dcmtk/dcmfg/fgpixmsr.h
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2015, Open Connections GmbH
+ * Copyright (C) 2015-2016, Open Connections GmbH
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation are maintained by
@@ -37,17 +37,17 @@ public:
*/
FGPixelMeasures();
- /** Virtual desctructor, frees memory
+ /** Virtual destructor, frees memory
*/
virtual ~FGPixelMeasures();
- /** Returs a deep copy of this object
+ /** Returns a deep copy of this object
* @return Deep copy of this object
*/
virtual FGBase *clone() const;
- /** Returs shared type of this group (can be shared or per-frame)
+ /** Returns shared type of this group (can be shared or per-frame)
* @return Always returns DcmFGTypes::EFGS_BOTH;
*/
virtual DcmFGTypes::E_FGSharedType getSharedType() const {return DcmFGTypes::EFGS_BOTH;}
diff --git a/dcmfg/include/dcmtk/dcmfg/fgplanor.h b/dcmfg/include/dcmtk/dcmfg/fgplanor.h
index 9c86cf3..2b8de19 100644
--- a/dcmfg/include/dcmtk/dcmfg/fgplanor.h
+++ b/dcmfg/include/dcmtk/dcmfg/fgplanor.h
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2015, Open Connections GmbH
+ * Copyright (C) 2015-2016, Open Connections GmbH
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation are maintained by
@@ -43,12 +43,12 @@ public:
*/
virtual ~FGPlaneOrientationPatient();
- /** Returs a deep copy of this object
+ /** Returns a deep copy of this object
* @return Deep copy of this object
*/
virtual FGBase *clone() const;
- /** Convenience function to create a mininmal functional group.
+ /** Convenience function to create a minimal functional group.
* @param imageOrientationPatientRowX Row X Value
* @param imageOrientationPatientRowY Row Y Value
* @param imageOrientationPatientRowZ Row Z Value
@@ -82,14 +82,14 @@ public:
/** Read functional group from item, must contain the Plane Orientation
* Sequence
* @param item The item to read from
- * @return EC_Normal if reading was succesful, error otherwise
+ * @return EC_Normal if reading was successful, error otherwise
*/
virtual OFCondition read(DcmItem& item);
/** Writes functional group to given item (will write Plane Orientation
* Sequence to it)
* @param item The item to write to
- * @return EC_Normal if writing was succesful, error otherwise
+ * @return EC_Normal if writing was successful, error otherwise
*/
virtual OFCondition write(DcmItem& item);
diff --git a/dcmfg/include/dcmtk/dcmfg/fgplanorvol.h b/dcmfg/include/dcmtk/dcmfg/fgplanorvol.h
index f1782ca..16729c9 100644
--- a/dcmfg/include/dcmtk/dcmfg/fgplanorvol.h
+++ b/dcmfg/include/dcmtk/dcmfg/fgplanorvol.h
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2015, Open Connections GmbH
+ * Copyright (C) 2015-2016, Open Connections GmbH
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation are maintained by
@@ -42,7 +42,7 @@ public:
*/
virtual ~FGPlaneOrientationVolume();
- /** Returs a deep copy of this object
+ /** Returns a deep copy of this object
* @return Deep copy of this object
*/
virtual FGBase *clone() const;
diff --git a/dcmfg/include/dcmtk/dcmfg/fgplanpo.h b/dcmfg/include/dcmtk/dcmfg/fgplanpo.h
index bb9a8b3..1fcf2a2 100644
--- a/dcmfg/include/dcmtk/dcmfg/fgplanpo.h
+++ b/dcmfg/include/dcmtk/dcmfg/fgplanpo.h
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2015, Open Connections GmbH
+ * Copyright (C) 2015-2016, Open Connections GmbH
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation are maintained by
@@ -43,7 +43,7 @@ public:
*/
virtual ~FGPlanePosPatient();
- /** Returs a deep copy of this object
+ /** Returns a deep copy of this object
* @return Deep copy of this object
*/
virtual FGBase *clone() const;
@@ -76,13 +76,13 @@ public:
/** Read functional group from item, must contain the Plane Position Sequence
* @param item The item to read from
- * @return EC_Normal if reading was succesful, error otherwise
+ * @return EC_Normal if reading was successful, error otherwise
*/
virtual OFCondition read(DcmItem& item);
/** Write functional group to item, will write the Plane Position Sequence
* @param item The item to write to
- * @return EC_Normal if writing was succesful, error otherwise
+ * @return EC_Normal if writing was successful, error otherwise
*/
virtual OFCondition write(DcmItem& item);
diff --git a/dcmfg/include/dcmtk/dcmfg/fgplanposvol.h b/dcmfg/include/dcmtk/dcmfg/fgplanposvol.h
index 3e7f78e..40086ca 100644
--- a/dcmfg/include/dcmtk/dcmfg/fgplanposvol.h
+++ b/dcmfg/include/dcmtk/dcmfg/fgplanposvol.h
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2015, Open Connections GmbH
+ * Copyright (C) 2015-2016, Open Connections GmbH
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation are maintained by
@@ -37,11 +37,11 @@ public:
*/
FGPlanePositionVolume();
- /** Virtual desctructor, frees memory
+ /** Virtual destructor, frees memory
*/
virtual ~FGPlanePositionVolume();
- /** Returs a deep copy of this object
+ /** Returns a deep copy of this object
* @return Deep copy of this object
*/
virtual FGBase *clone() const;
@@ -64,14 +64,14 @@ public:
/** Read functional group from item, must contain the Plane Position (Volume)
* Sequence
* @param item The item to read from
- * @return EC_Normal if reading was succesful, error otherwise
+ * @return EC_Normal if reading was successful, error otherwise
*/
virtual OFCondition read(DcmItem& item);
/** Writes functional group to item, i.e.\ writes the Plane Position (Volume)
* Sequence
* @param item The item to write to
- * @return EC_Normal if writing was succesful, error otherwise
+ * @return EC_Normal if writing was successful, error otherwise
*/
virtual OFCondition write(DcmItem& item);
diff --git a/dcmfg/include/dcmtk/dcmfg/fgrealworldvaluemapping.h b/dcmfg/include/dcmtk/dcmfg/fgrealworldvaluemapping.h
index 1390ad5..f585b2f 100644
--- a/dcmfg/include/dcmtk/dcmfg/fgrealworldvaluemapping.h
+++ b/dcmfg/include/dcmtk/dcmfg/fgrealworldvaluemapping.h
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2015, Open Connections GmbH
+ * Copyright (C) 2015-2016, Open Connections GmbH
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation are maintained by
@@ -42,11 +42,11 @@ public:
*/
FGRealWorldValueMapping();
- /** Desctructor, frees memory
+ /** Destructor, frees memory
*/
virtual ~FGRealWorldValueMapping();
- /** Returs a deep copy of this object
+ /** Returns a deep copy of this object
* @return Deep copy of this object
*/
virtual FGBase *clone() const;
@@ -66,18 +66,17 @@ public:
*/
virtual OFCondition check() const;
-
/** Read functional group from item, must contain the Real World Value Mapping
* Sequence
* @param item The item to read from
- * @return EC_Normal if reading was succesful, error otherwise
+ * @return EC_Normal if reading was successful, error otherwise
*/
virtual OFCondition read(DcmItem& item);
/** Writes this functional group to item, i.e.\ will write the Real World Value
* Mapping Sequence
* @param item The item to read from
- * @return EC_Normal if reading was succesful, error otherwise
+ * @return EC_Normal if reading was successful, error otherwise
*/
virtual OFCondition write(DcmItem& item);
diff --git a/dcmfg/include/dcmtk/dcmfg/fgseg.h b/dcmfg/include/dcmtk/dcmfg/fgseg.h
index c14752e..153e881 100644
--- a/dcmfg/include/dcmtk/dcmfg/fgseg.h
+++ b/dcmfg/include/dcmtk/dcmfg/fgseg.h
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2015, Open Connections GmbH
+ * Copyright (C) 2015-2016, Open Connections GmbH
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation are maintained by
@@ -39,11 +39,11 @@ public:
*/
FGSegmentation();
- /** Desctructor, frees memory
+ /** Destructor, frees memory
*/
virtual ~FGSegmentation();
- /** Returs a deep copy of this object
+ /** Returns a deep copy of this object
* @return Deep copy of this object
*/
virtual FGBase *clone() const;
@@ -105,14 +105,14 @@ public:
/** Read functional group from item, must contain the Segment Identification
* Sequence
* @param item The item to read from
- * @return EC_Normal if reading was succesful, error otherwise
+ * @return EC_Normal if reading was successful, error otherwise
*/
virtual OFCondition read(DcmItem& item);
/** Write functional group to item, will write Segment Identification
* Sequence
* @param item The item to write to
- * @return EC_Normal if writing was succesful, error otherwise
+ * @return EC_Normal if writing was successful, error otherwise
*/
virtual OFCondition write(DcmItem& item);
diff --git a/dcmfg/include/dcmtk/dcmfg/fgtypes.h b/dcmfg/include/dcmtk/dcmfg/fgtypes.h
index 791f67a..451cfe7 100644
--- a/dcmfg/include/dcmtk/dcmfg/fgtypes.h
+++ b/dcmfg/include/dcmtk/dcmfg/fgtypes.h
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2015, Open Connections GmbH
+ * Copyright (C) 2015-2016, Open Connections GmbH
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation are maintained by
@@ -79,7 +79,7 @@ extern DCMTK_DCMFG_EXPORT const OFConditionConst FG_EC_CouldNotReadSourceI
extern DCMTK_DCMFG_EXPORT const OFConditionConst FG_EC_CouldNotAddFG;
/// Not enough frames found
extern DCMTK_DCMFG_EXPORT const OFConditionConst FG_EC_NotEnoughFrames;
-/// No stacks speficied (but expected)
+/// No stacks specified (but expected)
extern DCMTK_DCMFG_EXPORT const OFConditionConst FG_EC_NoStacksFound;
/*---------------------*
@@ -110,7 +110,7 @@ public:
EFG_CONTRASTBOLUSUSAGE,
/// Derivation Image
EFG_DERIVATIONIMAGE,
- /// Frame Anantomy
+ /// Frame Anatomy
EFG_FRAMEANATOMY,
/// Frame Content
EFG_FRAMECONTENT,
@@ -166,9 +166,9 @@ public:
EFGS_UNKNOWN,
/// Functional Group can be shared or per-frame
EFGS_BOTH,
- /// Functional Group can only pe shared (not per-frame)
+ /// Functional Group can only be shared (not per-frame)
EFGS_ONLYSHARED,
- /// Functional Group can only pe per-frame (not shared)
+ /// Functional Group can only be per-frame (not shared)
EFGS_ONLYPERFRAME
};
diff --git a/dcmfg/include/dcmtk/dcmfg/fgusimagedescription.h b/dcmfg/include/dcmtk/dcmfg/fgusimagedescription.h
index 731c872..cfc3fcc 100644
--- a/dcmfg/include/dcmtk/dcmfg/fgusimagedescription.h
+++ b/dcmfg/include/dcmtk/dcmfg/fgusimagedescription.h
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2015, Open Connections GmbH
+ * Copyright (C) 2015-2016, Open Connections GmbH
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation are maintained by
@@ -37,11 +37,11 @@ public:
*/
FGUSImageDescription();
- /** Desctructor, frees memory
+ /** Destructor, frees memory
*/
virtual ~FGUSImageDescription();
- /** Returs a deep copy of this object
+ /** Returns a deep copy of this object
* @return Deep copy of this object
*/
virtual FGBase *clone() const;
@@ -58,14 +58,14 @@ public:
/** Read functional group from item, must contain the US Image Description
* Sequence
* @param item The item to read from
- * @return EC_Normal if reading was succesful, error otherwise
+ * @return EC_Normal if reading was successful, error otherwise
*/
virtual OFCondition read(DcmItem &item);
/** Write functional group to item, will write to US Image Description
* Sequence
* @param item The item to write to
- * @return EC_Normal if writing was succesful, error otherwise
+ * @return EC_Normal if writing was successful, error otherwise
*/
virtual OFCondition write(DcmItem& item);
@@ -105,7 +105,7 @@ public:
/** Set Frame Type. Frame Type contains up to four values. Value 3 and 4 are
* optional and can be left empty if desired. The values in their order
- * of occurence are:
+ * of occurrence are:
* 1) Pixel Data Characteristics: Either ORIGINAL or DERIVED
* 2) Patient Examination Characteristics: Fixed to "PRIMARY", thus cannot be
* influenced through this function.
diff --git a/dcmfg/include/dcmtk/dcmfg/stack.h b/dcmfg/include/dcmtk/dcmfg/stack.h
index 2af5744..6e3e107 100644
--- a/dcmfg/include/dcmtk/dcmfg/stack.h
+++ b/dcmfg/include/dcmtk/dcmfg/stack.h
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2015, Open Connections GmbH
+ * Copyright (C) 2015-2016, Open Connections GmbH
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation are maintained by
@@ -43,7 +43,7 @@ public:
/// Iterator type for iterating over the frames of a stack
typedef OFMap<Uint32,Uint32>::iterator iterator;
- /// Const terator for iterating over the frames of a stack
+ /// Const iterator for iterating over the frames of a stack
typedef OFMap<Uint32,Uint32>::const_iterator const_iterator;
/** Constructor, creates stack from Stack ID and assigned frame numbers
diff --git a/dcmfg/libsrc/Makefile.dep b/dcmfg/libsrc/Makefile.dep
index e0a32be..62c13c9 100644
--- a/dcmfg/libsrc/Makefile.dep
+++ b/dcmfg/libsrc/Makefile.dep
@@ -231,6 +231,7 @@ fgbase.o: fgbase.cc ../../config/include/dcmtk/config/osconfig.h \
../../dcmiod/include/dcmtk/dcmiod/iodrules.h \
../../dcmiod/include/dcmtk/dcmiod/iodtypes.h \
../../dcmiod/include/dcmtk/dcmiod/ioddef.h \
+ ../../dcmiod/include/dcmtk/dcmiod/cielabutil.h \
../../dcmiod/include/dcmtk/dcmiod/modpatient.h \
../../ofstd/include/dcmtk/ofstd/ofmem.h \
../../dcmiod/include/dcmtk/dcmiod/modbase.h \
@@ -243,7 +244,8 @@ fgbase.o: fgbase.cc ../../config/include/dcmtk/config/osconfig.h \
../../dcmiod/include/dcmtk/dcmiod/modgeneralseries.h \
../../dcmiod/include/dcmtk/dcmiod/modfor.h \
../../dcmiod/include/dcmtk/dcmiod/modsopcommon.h \
- ../../dcmiod/include/dcmtk/dcmiod/modcommoninstanceref.h
+ ../../dcmiod/include/dcmtk/dcmiod/modcommoninstanceref.h \
+ ../../dcmiod/include/dcmtk/dcmiod/iodreferences.h
fgderimg.o: fgderimg.cc ../../config/include/dcmtk/config/osconfig.h \
../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
../../ofstd/include/dcmtk/ofstd/offile.h \
@@ -363,6 +365,7 @@ fgderimg.o: fgderimg.cc ../../config/include/dcmtk/config/osconfig.h \
../../dcmiod/include/dcmtk/dcmiod/iodrules.h \
../../dcmiod/include/dcmtk/dcmiod/iodtypes.h \
../../dcmiod/include/dcmtk/dcmiod/ioddef.h \
+ ../../dcmiod/include/dcmtk/dcmiod/cielabutil.h \
../../dcmiod/include/dcmtk/dcmiod/modbase.h \
../../ofstd/include/dcmtk/ofstd/ofmem.h ../include/dcmtk/dcmfg/fgbase.h \
../include/dcmtk/dcmfg/fgtypes.h ../include/dcmtk/dcmfg/fgdefine.h \
@@ -432,6 +435,7 @@ fgfact.o: fgfact.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofutil.h \
../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
../../dcmiod/include/dcmtk/dcmiod/iodtypes.h \
+ ../../dcmiod/include/dcmtk/dcmiod/cielabutil.h \
../include/dcmtk/dcmfg/fgfact.h ../include/dcmtk/dcmfg/fgtypes.h \
../../dcmdata/include/dcmtk/dcmdata/dctk.h \
../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
@@ -563,6 +567,7 @@ fgfracon.o: fgfracon.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofutil.h \
../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
../../dcmiod/include/dcmtk/dcmiod/iodtypes.h \
+ ../../dcmiod/include/dcmtk/dcmiod/cielabutil.h \
../include/dcmtk/dcmfg/fgfracon.h \
../../dcmdata/include/dcmtk/dcmdata/dctk.h \
../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
@@ -685,6 +690,7 @@ fgframevoilut.o: fgframevoilut.cc \
../../ofstd/include/dcmtk/ofstd/ofutil.h \
../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
../../dcmiod/include/dcmtk/dcmiod/iodtypes.h \
+ ../../dcmiod/include/dcmtk/dcmiod/cielabutil.h \
../include/dcmtk/dcmfg/fgframevoilut.h ../include/dcmtk/dcmfg/fgbase.h \
../include/dcmtk/dcmfg/fgtypes.h \
../../dcmdata/include/dcmtk/dcmdata/dctk.h \
@@ -807,6 +813,7 @@ fgimagedatatype.o: fgimagedatatype.cc \
../../ofstd/include/dcmtk/ofstd/ofutil.h \
../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
../../dcmiod/include/dcmtk/dcmiod/iodtypes.h \
+ ../../dcmiod/include/dcmtk/dcmiod/cielabutil.h \
../include/dcmtk/dcmfg/fgimagedatatype.h ../include/dcmtk/dcmfg/fgbase.h \
../include/dcmtk/dcmfg/fgtypes.h \
../../dcmdata/include/dcmtk/dcmdata/dctk.h \
@@ -929,6 +936,7 @@ fginterface.o: fginterface.cc \
../../dcmiod/include/dcmtk/dcmiod/ioddef.h \
../../dcmiod/include/dcmtk/dcmiod/iodrules.h \
../../dcmiod/include/dcmtk/dcmiod/iodtypes.h \
+ ../../dcmiod/include/dcmtk/dcmiod/cielabutil.h \
../include/dcmtk/dcmfg/fginterface.h \
../../dcmdata/include/dcmtk/dcmdata/dctk.h \
../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
@@ -1106,7 +1114,8 @@ fgpixmsr.o: fgpixmsr.cc ../../config/include/dcmtk/config/osconfig.h \
../../dcmdata/include/dcmtk/dcmdata/dcdatutl.h \
../../dcmiod/include/dcmtk/dcmiod/ioddef.h \
../../dcmiod/include/dcmtk/dcmiod/iodrules.h \
- ../../dcmiod/include/dcmtk/dcmiod/iodtypes.h
+ ../../dcmiod/include/dcmtk/dcmiod/iodtypes.h \
+ ../../dcmiod/include/dcmtk/dcmiod/cielabutil.h
fgplanor.o: fgplanor.cc ../../config/include/dcmtk/config/osconfig.h \
../include/dcmtk/dcmfg/fgplanor.h ../include/dcmtk/dcmfg/fgbase.h \
../../ofstd/include/dcmtk/ofstd/ofstd.h \
@@ -1227,7 +1236,8 @@ fgplanor.o: fgplanor.cc ../../config/include/dcmtk/config/osconfig.h \
../../dcmdata/include/dcmtk/dcmdata/dcdatutl.h \
../../dcmiod/include/dcmtk/dcmiod/ioddef.h \
../../dcmiod/include/dcmtk/dcmiod/iodrules.h \
- ../../dcmiod/include/dcmtk/dcmiod/iodtypes.h
+ ../../dcmiod/include/dcmtk/dcmiod/iodtypes.h \
+ ../../dcmiod/include/dcmtk/dcmiod/cielabutil.h
fgplanorvol.o: fgplanorvol.cc \
../../config/include/dcmtk/config/osconfig.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
@@ -1296,6 +1306,7 @@ fgplanorvol.o: fgplanorvol.cc \
../../ofstd/include/dcmtk/ofstd/ofutil.h \
../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
../../dcmiod/include/dcmtk/dcmiod/iodtypes.h \
+ ../../dcmiod/include/dcmtk/dcmiod/cielabutil.h \
../include/dcmtk/dcmfg/fgplanorvol.h ../include/dcmtk/dcmfg/fgbase.h \
../include/dcmtk/dcmfg/fgtypes.h \
../../dcmdata/include/dcmtk/dcmdata/dctk.h \
@@ -1470,7 +1481,8 @@ fgplanpo.o: fgplanpo.cc ../../config/include/dcmtk/config/osconfig.h \
../../dcmdata/include/dcmtk/dcmdata/dcdatutl.h \
../../dcmiod/include/dcmtk/dcmiod/ioddef.h \
../../dcmiod/include/dcmtk/dcmiod/iodrules.h \
- ../../dcmiod/include/dcmtk/dcmiod/iodtypes.h
+ ../../dcmiod/include/dcmtk/dcmiod/iodtypes.h \
+ ../../dcmiod/include/dcmtk/dcmiod/cielabutil.h
fgplanposvol.o: fgplanposvol.cc \
../../config/include/dcmtk/config/osconfig.h \
../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
@@ -1538,6 +1550,7 @@ fgplanposvol.o: fgplanposvol.cc \
../../ofstd/include/dcmtk/ofstd/ofutil.h \
../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
../../dcmiod/include/dcmtk/dcmiod/iodtypes.h \
+ ../../dcmiod/include/dcmtk/dcmiod/cielabutil.h \
../include/dcmtk/dcmfg/fgplanposvol.h ../include/dcmtk/dcmfg/fgbase.h \
../include/dcmtk/dcmfg/fgtypes.h \
../../dcmdata/include/dcmtk/dcmdata/dctk.h \
@@ -1715,6 +1728,7 @@ fgrealworldvaluemapping.o: fgrealworldvaluemapping.cc \
../../dcmiod/include/dcmtk/dcmiod/ioddef.h \
../../dcmiod/include/dcmtk/dcmiod/iodrules.h \
../../dcmiod/include/dcmtk/dcmiod/iodtypes.h \
+ ../../dcmiod/include/dcmtk/dcmiod/cielabutil.h \
../../dcmiod/include/dcmtk/dcmiod/iodmacro.h \
../../dcmiod/include/dcmtk/dcmiod/iodutil.h \
../../dcmdata/include/dcmtk/dcmdata/dcdatutl.h
@@ -1838,7 +1852,8 @@ fgseg.o: fgseg.cc ../../config/include/dcmtk/config/osconfig.h \
../../dcmdata/include/dcmtk/dcmdata/dcdatutl.h \
../../dcmiod/include/dcmtk/dcmiod/ioddef.h \
../../dcmiod/include/dcmtk/dcmiod/iodrules.h \
- ../../dcmiod/include/dcmtk/dcmiod/iodtypes.h
+ ../../dcmiod/include/dcmtk/dcmiod/iodtypes.h \
+ ../../dcmiod/include/dcmtk/dcmiod/cielabutil.h
fgtypes.o: fgtypes.cc ../../config/include/dcmtk/config/osconfig.h \
../include/dcmtk/dcmfg/fgtypes.h ../../oflog/include/dcmtk/oflog/oflog.h \
../../oflog/include/dcmtk/oflog/logger.h \
@@ -1957,6 +1972,7 @@ fgtypes.o: fgtypes.cc ../../config/include/dcmtk/config/osconfig.h \
../../dcmiod/include/dcmtk/dcmiod/iodrules.h \
../../dcmiod/include/dcmtk/dcmiod/iodtypes.h \
../../dcmiod/include/dcmtk/dcmiod/ioddef.h \
+ ../../dcmiod/include/dcmtk/dcmiod/cielabutil.h \
../../dcmiod/include/dcmtk/dcmiod/modpatient.h \
../../ofstd/include/dcmtk/ofstd/ofmem.h \
../../dcmiod/include/dcmtk/dcmiod/modbase.h \
@@ -1969,7 +1985,8 @@ fgtypes.o: fgtypes.cc ../../config/include/dcmtk/config/osconfig.h \
../../dcmiod/include/dcmtk/dcmiod/modgeneralseries.h \
../../dcmiod/include/dcmtk/dcmiod/modfor.h \
../../dcmiod/include/dcmtk/dcmiod/modsopcommon.h \
- ../../dcmiod/include/dcmtk/dcmiod/modcommoninstanceref.h
+ ../../dcmiod/include/dcmtk/dcmiod/modcommoninstanceref.h \
+ ../../dcmiod/include/dcmtk/dcmiod/iodreferences.h
fgusimagedescription.o: fgusimagedescription.cc \
../../config/include/dcmtk/config/osconfig.h \
../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
@@ -2037,6 +2054,7 @@ fgusimagedescription.o: fgusimagedescription.cc \
../../ofstd/include/dcmtk/ofstd/ofutil.h \
../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
../../dcmiod/include/dcmtk/dcmiod/iodtypes.h \
+ ../../dcmiod/include/dcmtk/dcmiod/cielabutil.h \
../include/dcmtk/dcmfg/fgusimagedescription.h \
../include/dcmtk/dcmfg/fgtypes.h \
../../dcmdata/include/dcmtk/dcmdata/dctk.h \
@@ -2173,6 +2191,7 @@ stackinterface.o: stackinterface.cc \
../../ofstd/include/dcmtk/ofstd/ofutil.h \
../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
../../dcmiod/include/dcmtk/dcmiod/iodtypes.h \
+ ../../dcmiod/include/dcmtk/dcmiod/cielabutil.h \
../include/dcmtk/dcmfg/stackinterface.h \
../../dcmdata/include/dcmtk/dcmdata/dctk.h \
../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
diff --git a/dcmfg/libsrc/fg.cc b/dcmfg/libsrc/fg.cc
index e5a2493..c7fe5da 100644
--- a/dcmfg/libsrc/fg.cc
+++ b/dcmfg/libsrc/fg.cc
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2015, Open Connections GmbH
+ * Copyright (C) 2015-2016, Open Connections GmbH
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation are maintained by
@@ -37,7 +37,7 @@ FunctionalGroups::~FunctionalGroups()
void FunctionalGroups::clear()
{
- // free memory of underyling map
+ // free memory of underlying map
while ( m_groups.size() > 0)
{
FunctionalGroups::iterator it = m_groups.begin();
diff --git a/dcmfg/libsrc/fgbase.cc b/dcmfg/libsrc/fgbase.cc
index fd067e8..0e58526 100644
--- a/dcmfg/libsrc/fgbase.cc
+++ b/dcmfg/libsrc/fgbase.cc
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2015, Open Connections GmbH
+ * Copyright (C) 2015-2016, Open Connections GmbH
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation are maintained by
@@ -85,7 +85,7 @@ OFCondition FGBase::getItemFromFGSequence(DcmItem& source,
result = seq->getItem(itemNum);
if (result == NULL)
{
- DCMFG_DEBUG("Functional Group Sequence " << seqKey << " ( " << DcmFGTypes::tagKey2FGType(seqKey) << ") does not have " << itemNum-1 << "items");
+ DCMFG_DEBUG("Functional Group Sequence " << seqKey << " (" << DcmFGTypes::tagKey2FGType(seqKey) << ") does not have " << itemNum-1 << " items");
return FG_EC_NotEnoughItems;
}
return EC_Normal;
@@ -101,7 +101,7 @@ OFCondition FGBase::createNewFGSequence(DcmItem& destination,
OFCondition result = destination.insertEmptyElement(seqKey, OFTrue /* replace old */);
if (result.bad())
{
- DCMFG_ERROR("Coudl not create Functional Group with sequence " << seqKey << " ( " << DcmFGTypes::tagKey2FGType(seqKey) << ")");
+ DCMFG_ERROR("Could not create Functional Group with sequence " << seqKey << " (" << DcmFGTypes::tagKey2FGType(seqKey) << ")");
return FG_EC_CouldNotInsertFG;
}
DcmItem* dummy =NULL;
@@ -110,7 +110,7 @@ OFCondition FGBase::createNewFGSequence(DcmItem& destination,
{
// clean up
destination.findAndDeleteElement(seqKey);
- DCMFG_ERROR("Could not create " << numItems << " items in Functional Group with sequence " << seqKey << " ( " << DcmFGTypes::tagKey2FGType(seqKey) << ")");
+ DCMFG_ERROR("Could not create " << numItems << " items in Functional Group with sequence " << seqKey << " (" << DcmFGTypes::tagKey2FGType(seqKey) << ")");
return FG_EC_CouldNotInsertFG;
}
destination.findOrCreateSequenceItem(seqKey, firstItem, 0);
diff --git a/dcmfg/libsrc/fgfact.cc b/dcmfg/libsrc/fgfact.cc
index d7f7e99..6285a31 100644
--- a/dcmfg/libsrc/fgfact.cc
+++ b/dcmfg/libsrc/fgfact.cc
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2015, Open Connections GmbH
+ * Copyright (C) 2015-2016, Open Connections GmbH
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation are maintained by
@@ -106,7 +106,7 @@ FGBase* FGFactory::create(const DcmFGTypes::E_FGType fgtype)
case DcmFGTypes::EFG_PATIENTPHYSIOSTATE:
case DcmFGTypes::EFG_TEMPORALPOSITION:
{
- DCMFG_DEBUG("Encountered functional group that is not explicitly supported yet:" << DcmFGTypes::FGType2OFString(fgtype) );
+ DCMFG_DEBUG("Encountered functional group that is not explicitly supported yet:" << DcmFGTypes::FGType2OFString(fgtype));
return NULL;
break;
}
@@ -126,7 +126,7 @@ FGBase* FGFactory::create(const DcmTagKey& fgSequenceKey)
if (!DcmIODUtil::isSequenceTag(fgSequenceKey))
{
DCMFG_ERROR("Cannot create functional group from non-sequence tag");
- return NULL;;
+ return NULL;
}
FGBase* fg = NULL;
DcmFGTypes::E_FGType fgType = DcmFGTypes::tagKey2FGType(fgSequenceKey);
diff --git a/dcmfg/libsrc/fgfracon.cc b/dcmfg/libsrc/fgfracon.cc
index b2ffd8a..0d30731 100644
--- a/dcmfg/libsrc/fgfracon.cc
+++ b/dcmfg/libsrc/fgfracon.cc
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2016, Open Connections GmbH
+ * Copyright (C) 2015-2016, Open Connections GmbH
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation are maintained by
diff --git a/dcmfg/libsrc/fgimagedatatype.cc b/dcmfg/libsrc/fgimagedatatype.cc
index db55dc0..dc71962 100644
--- a/dcmfg/libsrc/fgimagedatatype.cc
+++ b/dcmfg/libsrc/fgimagedatatype.cc
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2015, Open Connections GmbH
+ * Copyright (C) 2016, Open Connections GmbH
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation are maintained by
@@ -156,7 +156,7 @@ OFCondition FGImageDataType::setZeroVelocityPixelValueUS(const Uint16 value)
}
-/// Read Frame Content Sequence from given item
+// Read Frame Content Sequence from given item
OFCondition FGImageDataType::read(DcmItem& item)
{
clearData();
@@ -169,8 +169,13 @@ OFCondition FGImageDataType::read(DcmItem& item)
DcmElement* elem = NULL;
DcmIODUtil::getAndCheckElementFromDataset(*seqItem, m_DataType, "1", "1", "ImageDataTypeMacro");
DcmIODUtil::getAndCheckElementFromDataset(*seqItem, m_AliasedDataType, "1", "1", "ImageDataTypeMacro");
-
- DcmIODUtil::getAndCheckElementFromDataset(*seqItem, *elem, "1", "1C", "ImageDataTypeMacro");
+ // We do not know the VR of Zero Velocity Pixel Value (US or SS), so we cannot
+ // use the regular getAndCheckElementFromDataset() method that implicitly gets
+ // this information via the provided element. Instead, get element first and
+ // and then check it in an extra step, afterwards access value depending on
+ // the element's VR.
+ seqItem->findAndGetElement(DCM_ZeroVelocityPixelValue, elem);
+ DcmIODUtil::checkElementValue(elem, DCM_ZeroVelocityPixelValue, "1", "1C", EC_Normal, "ImageDataTypeMacro");
if (elem)
{
if (elem->getVR() == EVR_SS)
@@ -205,7 +210,7 @@ OFCondition FGImageDataType::read(DcmItem& item)
}
-/// Writes single Frame Content Sequence into given item
+// Writes single Frame Content Sequence into given item
OFCondition FGImageDataType::write(DcmItem& item)
{
DcmItem *seqItem = NULL;
diff --git a/dcmfg/libsrc/fginterface.cc b/dcmfg/libsrc/fginterface.cc
index 0837810..0844711 100644
--- a/dcmfg/libsrc/fginterface.cc
+++ b/dcmfg/libsrc/fginterface.cc
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2015, Open Connections GmbH
+ * Copyright (C) 2015-2016, Open Connections GmbH
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation are maintained by
@@ -89,7 +89,7 @@ OFCondition FGInterface::addShared(const FGBase& group)
OFCondition result = insertShared(copy, OFTrue /* replace */);
if (result.bad())
{
- DCMFG_ERROR("Could not add shared group of type: " << DcmFGTypes::FGType2OFString(group.getType()));;
+ DCMFG_ERROR("Could not add shared group of type: " << DcmFGTypes::FGType2OFString(group.getType()));
delete copy;
}
@@ -257,7 +257,7 @@ OFCondition FGInterface::readPerFrameFG(DcmItem& dataset)
// FunctionalGroups* perFrameGroups = new FunctionalGroups();
if (!oneFrameItem)
{
- DCMFG_ERROR("Could not get functional group item for frame #" << count << "(internal error)");
+ DCMFG_ERROR("Could not get functional group item for frame #" << count << " (internal error)");
}
else if (!perFrameGroups.get())
{
@@ -275,7 +275,7 @@ OFCondition FGInterface::readPerFrameFG(DcmItem& dataset)
}
else
{
- DCMFG_ERROR("Could not read functional groups for frame #" << count << ": " << result.text() );
+ DCMFG_ERROR("Could not read functional groups for frame #" << count << ": " << result.text());
}
}
}
@@ -293,7 +293,7 @@ OFCondition FGInterface::readSingleFG(DcmItem& fgItem,
for (size_t count = 0; count < card; count++)
{
DcmElement *elem = fgItem.getElement(count);
- // TODO: non-sequence elements are not explicily forbidden here(?), we could store them and re-store them later
+ // TODO: non-sequence elements are not explicitly forbidden here(?), we could store them and re-store them later
if (elem->getVR() != EVR_SQ)
{
DCMFG_WARN("Found non-sequence element in functional group sequence item (ignored): " << elem->getTag());
@@ -620,7 +620,7 @@ OFBool FGInterface::check()
for (size_t frameCount = 0; frameCount < numFrames; frameCount++)
{
DCMFG_TRACE("Checking frame " << frameCount << "...");
- // Every frame requires the FrameContent functional group, check "en passent"
+ // Every frame requires the FrameContent functional group, check "en passant"
OFBool foundFrameContent = OFFalse;
OFMap<Uint32, FunctionalGroups*>::iterator frameFG = m_perFrame.begin();
while (frameFG != m_perFrame.end())
@@ -653,7 +653,7 @@ OFBool FGInterface::check()
}
if (!foundFrameContent)
{
- DCMFG_ERROR("Frame Content Functional group missing for frame # " << frameCount );
+ DCMFG_ERROR("Frame Content Functional group missing for frame #" << frameCount);
numErrors++;
}
}
@@ -664,7 +664,7 @@ OFBool FGInterface::check()
{
if ( (*it).second->getSharedType() == DcmFGTypes::EFGS_ONLYPERFRAME )
{
- DCMFG_ERROR("Functional group of type " << DcmFGTypes::FGType2OFString((*it).second->getType()) << " used as shared functional group but must be per-frame ");
+ DCMFG_ERROR("Functional group of type " << DcmFGTypes::FGType2OFString((*it).second->getType()) << " used as shared functional group but must be per-frame");
numErrors++;
}
it++;
diff --git a/dcmfg/libsrc/fgplanpo.cc b/dcmfg/libsrc/fgplanpo.cc
index be4c46d..6fce31f 100644
--- a/dcmfg/libsrc/fgplanpo.cc
+++ b/dcmfg/libsrc/fgplanpo.cc
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2015, Open Connections GmbH
+ * Copyright (C) 2015-2016, Open Connections GmbH
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation are maintained by
@@ -52,7 +52,7 @@ FGPlanePosPatient* FGPlanePosPatient::createMinimal(const OFString& imagePositio
OFCondition result = fg->setImagePositionPatient(imagePositionPatientX, imagePositionPatientY, imagePositionPatientZ);
if (result.bad())
{
- DCMFG_ERROR("Coudl not create new FGPlanePosPatient: Invalid data for Image Position Patient: " << result.text());
+ DCMFG_ERROR("Could not create new FGPlanePosPatient: Invalid data for Image Position Patient: " << result.text());
delete fg;
return NULL;
}
diff --git a/dcmfg/libsrc/fgrealworldvaluemapping.cc b/dcmfg/libsrc/fgrealworldvaluemapping.cc
index d3051b1..a2e595a 100644
--- a/dcmfg/libsrc/fgrealworldvaluemapping.cc
+++ b/dcmfg/libsrc/fgrealworldvaluemapping.cc
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2015, Open Connections GmbH
+ * Copyright (C) 2015-2016, Open Connections GmbH
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation are maintained by
@@ -176,15 +176,15 @@ int FGRealWorldValueMapping::RWVMItem::compare(const IODComponent& rhs) const
void FGRealWorldValueMapping::RWVMItem::resetRules()
{
// parameters are tag, VM, type. Overwrite old rules if any.
- m_Rules->addRule(new IODRule(DCM_RealWorldValueFirstValueMapped, "1","1",m_ModuleName, DcmIODTypes::IE_INSTANCE), OFTrue);
- m_Rules->addRule(new IODRule(DCM_RealWorldValueLastValueMapped, "1","1", m_ModuleName, DcmIODTypes::IE_INSTANCE), OFTrue);
- m_Rules->addRule(new IODRule(DCM_RealWorldValueIntercept, "1","1C", m_ModuleName, DcmIODTypes::IE_INSTANCE), OFTrue);
- m_Rules->addRule(new IODRule(DCM_RealWorldValueSlope, "1","1C", m_ModuleName, DcmIODTypes::IE_INSTANCE), OFTrue);
- m_Rules->addRule(new IODRule(DCM_RealWorldValueLUTData, "1-n","1C", m_ModuleName, DcmIODTypes::IE_INSTANCE), OFTrue);
- m_Rules->addRule(new IODRule(DCM_LUTExplanation, "1","1", m_ModuleName, DcmIODTypes::IE_INSTANCE), OFTrue);
- m_Rules->addRule(new IODRule(DCM_LUTLabel, "1","1", m_ModuleName, DcmIODTypes::IE_INSTANCE), OFTrue);
- m_Rules->addRule(new IODRule(DCM_MeasurementUnitsCodeSequence, "1","1", m_ModuleName, DcmIODTypes::IE_INSTANCE), OFTrue);
- //m_Rules->addRule(new IODRule(DCM_QuantityDefinitionSequence, "1","3", m_ModuleName, DcmIODTypes::IE_INSTANCE), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_RealWorldValueFirstValueMapped, "1","1",getName(), DcmIODTypes::IE_INSTANCE), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_RealWorldValueLastValueMapped, "1","1", getName(), DcmIODTypes::IE_INSTANCE), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_RealWorldValueIntercept, "1","1C", getName(), DcmIODTypes::IE_INSTANCE), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_RealWorldValueSlope, "1","1C", getName(), DcmIODTypes::IE_INSTANCE), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_RealWorldValueLUTData, "1-n","1C", getName(), DcmIODTypes::IE_INSTANCE), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_LUTExplanation, "1","1", getName(), DcmIODTypes::IE_INSTANCE), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_LUTLabel, "1","1", getName(), DcmIODTypes::IE_INSTANCE), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_MeasurementUnitsCodeSequence, "1","1", getName(), DcmIODTypes::IE_INSTANCE), OFTrue);
+ //m_Rules->addRule(new IODRule(DCM_QuantityDefinitionSequence, "1","3", getName(), DcmIODTypes::IE_INSTANCE), OFTrue);
}
OFCondition FGRealWorldValueMapping::RWVMItem::read(DcmItem& source,
diff --git a/dcmfg/libsrc/fgtypes.cc b/dcmfg/libsrc/fgtypes.cc
index 1a6dce8..eecd622 100644
--- a/dcmfg/libsrc/fgtypes.cc
+++ b/dcmfg/libsrc/fgtypes.cc
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2015, Open Connections GmbH
+ * Copyright (C) 2015-2016, Open Connections GmbH
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation are maintained by
@@ -66,15 +66,15 @@ OFString DcmFGTypes::FGType2OFString(const DcmFGTypes::E_FGType fgType)
/// Plane Orientation (Patient)
case EFG_PLANEORIENTPATIENT: return "Plane Orientation (Patient) Functional Group Macro"; break;
/// Derivation Image
- case EFG_DERIVATIONIMAGE: return "Deriviation Image Functional Group Macro"; break;
+ case EFG_DERIVATIONIMAGE: return "Derivation Image Functional Group Macro"; break;
/// Cardiac Synchronization
case EFG_CARDIACSYNC: return "Cardiac Synchronization Functional Group Macro"; break;
- /// Frame Anantomy
+ /// Frame Anatomy
case EFG_FRAMEANATOMY: return "Frame Anatomy Functional Group Macro"; break;
/// Pixel Value Transformation or Identity Pixel Value Transformation
case EFG_PIXELVALUETRANSMETA: return "Pixel Value Transformation / Identity Pixel Value Transformation Functional Group Macro"; break;
/// Frame VOI LUT or Frame VOI LUT with LUT
- case EFG_FRAMEVOILUTMETA: return "Frame VOI LUT / Frame VOI LUT with LUT Macro"; break;;
+ case EFG_FRAMEVOILUTMETA: return "Frame VOI LUT / Frame VOI LUT with LUT Macro"; break;
/// Real World Value Mapping
case EFG_REALWORLDVALUEMAPPING: return "Real World Value Mapping Functional Group Macro"; break;
/// Contrast/Bolus Usage
diff --git a/dcmfg/libsrc/fgusimagedescription.cc b/dcmfg/libsrc/fgusimagedescription.cc
index de06819..e5ffa4e 100644
--- a/dcmfg/libsrc/fgusimagedescription.cc
+++ b/dcmfg/libsrc/fgusimagedescription.cc
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2015, Open Connections GmbH
+ * Copyright (C) 2015-2016, Open Connections GmbH
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation are maintained by
@@ -169,7 +169,7 @@ OFCondition FGUSImageDescription::read(DcmItem& item)
DcmIODUtil::getAndCheckElementFromDataset(*seqItem, m_FrameType, "4", "1", "USImageDescriptionMacro");
DcmIODUtil::getAndCheckElementFromDataset(*seqItem, m_VolumetricProperties, "1", "1", "USImageDescriptionMacro");
DcmIODUtil::getAndCheckElementFromDataset(*seqItem, m_VolumeBasedCalculationTechnique, "1", "1", "USImageDescriptionMacro");
- return result;;
+ return result;
}
diff --git a/dcmfg/libsrc/stackinterface.cc b/dcmfg/libsrc/stackinterface.cc
index b6d086e..cef3d6f 100644
--- a/dcmfg/libsrc/stackinterface.cc
+++ b/dcmfg/libsrc/stackinterface.cc
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2015, Open Connections GmbH
+ * Copyright (C) 2015-2016, Open Connections GmbH
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation are maintained by
@@ -103,12 +103,12 @@ OFCondition FGStackInterface::read(FGInterface& fgSource)
}
else
{
- DCMFG_WARN("Rading stacks but Frame " << count << " does not provide Stack ID or In-Stack Position");
+ DCMFG_WARN("Reading stacks but Frame " << count << " does not provide Stack ID or In-Stack Position");
}
}
else
{
- DCMFG_WARN("Rading stacks but Frame " << count << " does not provide a Frame Content functional group");
+ DCMFG_WARN("Reading stacks but Frame " << count << " does not provide a Frame Content functional group");
}
}
diff --git a/dcmimage/include/dcmtk/dcmimage/diargpxt.h b/dcmimage/include/dcmtk/dcmimage/diargpxt.h
index 692ef7c..87aefa4 100644
--- a/dcmimage/include/dcmtk/dcmimage/diargpxt.h
+++ b/dcmimage/include/dcmtk/dcmimage/diargpxt.h
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 1996-2011, OFFIS e.V.
+ * Copyright (C) 1996-2016, OFFIS e.V.
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation were developed by
@@ -86,7 +86,7 @@ class DiARGBPixelTemplate
{ // not very much optimized, but no one really uses ARGB !!
if (this->Init(pixel))
{
- register T2 value;
+ T2 value;
const T1 offset = OFstatic_cast(T1, DicomImageClass::maxval(bits - 1));
// use the number of input pixels derived from the length of the 'PixelData'
// attribute), but not more than the size of the intermediate buffer
@@ -94,7 +94,7 @@ class DiARGBPixelTemplate
if (this->PlanarConfiguration)
{
/*
- register const T1 *a = pixel; // points to alpha plane
+ const T1 *a = pixel; // points to alpha plane
const T1 *rgb[3];
rgb[0] = a + this->InputCount; // points to red plane
rgb[1] = rgb[0] + this->InputCount; // points to green plane
@@ -122,9 +122,9 @@ class DiARGBPixelTemplate
}
}
*/
- register unsigned long l;
- register unsigned long i = 0;
- register const T1 *a = pixel; // points to alpha plane
+ unsigned long l;
+ unsigned long i = 0;
+ const T1 *a = pixel; // points to alpha plane
const T1 *rgb[3];
rgb[0] = a + planeSize; // points to red plane
rgb[1] = rgb[0] + planeSize; // points to green plane
@@ -160,8 +160,8 @@ class DiARGBPixelTemplate
rgb[j] += 2 * planeSize;
}
} else {
- register unsigned long i;
- register const T1 *p = pixel;
+ unsigned long i;
+ const T1 *p = pixel;
for (i = 0; i < count; ++i)
{
value = OFstatic_cast(T2, *(p++)); // get alpha value
diff --git a/dcmimage/include/dcmtk/dcmimage/dicmypxt.h b/dcmimage/include/dcmtk/dcmimage/dicmypxt.h
index 0b1bc8c..011ae82 100644
--- a/dcmimage/include/dcmtk/dcmimage/dicmypxt.h
+++ b/dcmimage/include/dcmtk/dcmimage/dicmypxt.h
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 1996-2011, OFFIS e.V.
+ * Copyright (C) 1996-2016, OFFIS e.V.
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation were developed by
@@ -87,12 +87,12 @@ class DiCMYKPixelTemplate
const unsigned long count = (this->InputCount < this->Count) ? this->InputCount : this->Count;
const T2 maxvalue = OFstatic_cast(T2, DicomImageClass::maxval(bits));
const T1 offset = OFstatic_cast(T1, DicomImageClass::maxval(bits - 1));
- register const T1 *p = pixel;
+ const T1 *p = pixel;
if (this->PlanarConfiguration)
{
/*
- register const T1 *k;
- register T2 *q;
+ const T1 *k;
+ T2 *q;
for (int j = 0; j < 3; ++j)
{
q = this->Data[j];
@@ -101,10 +101,10 @@ class DiCMYKPixelTemplate
*(q++) = maxvalue - removeSign(*(p++), offset) - removeSign(*(k++), offset);
}
*/
- register const T1 *k;
- register T2 *q;
- register unsigned long l;
- register unsigned long i = 0;
+ const T1 *k;
+ T2 *q;
+ unsigned long l;
+ unsigned long i = 0;
while (i < count)
{
/* store current pixel index */
@@ -127,9 +127,9 @@ class DiCMYKPixelTemplate
}
else
{
- register T1 k;
- register int j;
- register unsigned long i;
+ T1 k;
+ int j;
+ unsigned long i;
for (i = 0; i < count; ++i)
{
k = *(p + 3);
diff --git a/dcmimage/include/dcmtk/dcmimage/dicoimg.h b/dcmimage/include/dcmtk/dcmimage/dicoimg.h
index 4a8b482..16638c7 100644
--- a/dcmimage/include/dcmtk/dcmimage/dicoimg.h
+++ b/dcmimage/include/dcmtk/dcmimage/dicoimg.h
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 1996-2011, OFFIS e.V.
+ * Copyright (C) 1996-2016, OFFIS e.V.
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation were developed by
@@ -251,7 +251,7 @@ class DCMTK_DCMIMAGE_EXPORT DiColorImage
* @param upsideDown specifies the order of lines in the images (0 = top-down, bottom-up otherwise)
* @param padding align each line to a 32-bit address if true (default)
*
- ** @return number of bytes allocated by the bitmap, or 0 if an error occured
+ ** @return number of bytes allocated by the bitmap, or 0 if an error occurred
*/
unsigned long createDIB(void *&data,
const unsigned long size,
@@ -267,7 +267,7 @@ class DCMTK_DCMIMAGE_EXPORT DiColorImage
* @param frame index of frame to be converted (default: first frame)
* @param bits number of bits per pixel used for the output bitmap (32)
*
- ** @return number of bytes allocated by the bitmap, or 0 if an error occured
+ ** @return number of bytes allocated by the bitmap, or 0 if an error occurred
*/
unsigned long createAWTBitmap(void *&data,
const unsigned long frame,
diff --git a/dcmimage/include/dcmtk/dcmimage/dicomot.h b/dcmimage/include/dcmtk/dcmimage/dicomot.h
index 99ef8d5..0a11f29 100644
--- a/dcmimage/include/dcmtk/dcmimage/dicomot.h
+++ b/dcmimage/include/dcmtk/dcmimage/dicomot.h
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 1996-2010, OFFIS e.V.
+ * Copyright (C) 1996-2016, OFFIS e.V.
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation were developed by
@@ -91,11 +91,11 @@ class DiColorMonoTemplate
this->Data = new T[this->Count];
if (this->Data != NULL)
{
- register const T *r = pixel[0];
- register const T *g = pixel[1];
- register const T *b = pixel[2];
- register T *q = this->Data;
- register unsigned long i;
+ const T *r = pixel[0];
+ const T *g = pixel[1];
+ const T *b = pixel[2];
+ T *q = this->Data;
+ unsigned long i;
for (i = this->Count; i != 0; i--)
{
*(q++) = OFstatic_cast(T, OFstatic_cast(double, *(r++)) * red +
diff --git a/dcmimage/include/dcmtk/dcmimage/dicoopxt.h b/dcmimage/include/dcmtk/dcmimage/dicoopxt.h
index 447e032..253ab1b 100644
--- a/dcmimage/include/dcmtk/dcmimage/dicoopxt.h
+++ b/dcmimage/include/dcmtk/dcmimage/dicoopxt.h
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 1996-2012, OFFIS e.V.
+ * Copyright (C) 1996-2016, OFFIS e.V.
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation were developed by
@@ -179,9 +179,9 @@ class DiColorOutputPixelTemplate
{
if (Data != NULL)
{
- register T2 *p = Data;
- register unsigned long i;
- register int j;
+ T2 *p = Data;
+ unsigned long i;
+ int j;
for (i = FrameSize; i != 0; --i)
for (j = 3; j != 0; --j)
stream << OFstatic_cast(unsigned long, *(p++)) << " "; // typecast to resolve problems with 'char'
@@ -200,9 +200,9 @@ class DiColorOutputPixelTemplate
{
if (Data != NULL)
{
- register T2 *p = Data;
- register unsigned long i;
- register int j;
+ T2 *p = Data;
+ unsigned long i;
+ int j;
for (i = FrameSize; i != 0; --i)
for (j = 3; j != 0; --j)
fprintf(stream, "%lu ", OFstatic_cast(unsigned long, *(p++)));
@@ -243,12 +243,12 @@ class DiColorOutputPixelTemplate
if (Data != NULL)
{
DCMIMAGE_DEBUG("converting color pixel data to output format");
- register T2 *q = Data;
- register unsigned long i;
+ T2 *q = Data;
+ unsigned long i;
const T2 max2 = OFstatic_cast(T2, DicomImageClass::maxval(bits2));
if (planar)
{
- register const T1 *p;
+ const T1 *p;
if (bits1 == bits2)
{
for (int j = 0; j < 3; ++j)
@@ -332,7 +332,7 @@ class DiColorOutputPixelTemplate
}
else /* not planar */
{
- register int j;
+ int j;
if (bits1 == bits2)
{
/* invert output data */
diff --git a/dcmimage/include/dcmtk/dcmimage/dicopx.h b/dcmimage/include/dcmtk/dcmimage/dicopx.h
index 3a937f1..59d6c87 100644
--- a/dcmimage/include/dcmtk/dcmimage/dicopx.h
+++ b/dcmimage/include/dcmtk/dcmimage/dicopx.h
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 1996-2011, OFFIS e.V.
+ * Copyright (C) 1996-2016, OFFIS e.V.
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation were developed by
@@ -117,7 +117,7 @@ class DCMTK_DCMIMAGE_EXPORT DiColorPixel
* @param upsideDown specifies the order of lines in the images (0 = top-down, bottom-up otherwise)
* @param padding align each line to a 32-bit address if true
*
- ** @return number of bytes allocated by the bitmap, or 0 if an error occured
+ ** @return number of bytes allocated by the bitmap, or 0 if an error occurred
*/
virtual unsigned long createDIB(void *&data,
const unsigned long size,
@@ -139,7 +139,7 @@ class DCMTK_DCMIMAGE_EXPORT DiColorPixel
* @param fromBits number of bits per sample used for internal representation of the image
* @param toBits number of bits per sample used for the output bitmap (<= 8)
*
- ** @return number of bytes allocated by the bitmap, or 0 if an error occured
+ ** @return number of bytes allocated by the bitmap, or 0 if an error occurred
*/
virtual unsigned long createAWTBitmap(void *&data,
const Uint16 width,
diff --git a/dcmimage/include/dcmtk/dcmimage/dicopxt.h b/dcmimage/include/dcmtk/dcmimage/dicopxt.h
index 875590c..d812d16 100644
--- a/dcmimage/include/dcmtk/dcmimage/dicopxt.h
+++ b/dcmimage/include/dcmtk/dcmimage/dicopxt.h
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 1996-2014, OFFIS e.V.
+ * Copyright (C) 1996-2016, OFFIS e.V.
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation were developed by
@@ -197,10 +197,10 @@ class DiColorPixelTemplate
if ((data != NULL) && (count >= Count * 3) && (frames > 0) && (frames * fcount <= Count) &&
(Data[0] != NULL) && (Data[1] != NULL) && (Data[2] != NULL))
{
- register T *q = OFstatic_cast(T *, data);
- register int j;
- register unsigned long k;
- register unsigned long offset = 0;
+ T *q = OFstatic_cast(T *, data);
+ int j;
+ unsigned long k;
+ unsigned long offset = 0;
if (planar)
{
/* for all frames ... */
@@ -215,7 +215,7 @@ class DiColorPixelTemplate
offset += fcount;
}
} else {
- register unsigned long i;
+ unsigned long i;
/* for all frames ... */
for (k = 0; k < frames; ++k)
{
@@ -266,11 +266,11 @@ class DiColorPixelTemplate
const unsigned long start = count * frame + ((upsideDown) ?
OFstatic_cast(unsigned long, height - 1) * OFstatic_cast(unsigned long, width) : 0);
const signed long nextRow = (upsideDown) ? -2 * OFstatic_cast(signed long, width) : 0;
- register const T *r = Data[0] + start;
- register const T *g = Data[1] + start;
- register const T *b = Data[2] + start;
- register Uint16 x;
- register Uint16 y;
+ const T *r = Data[0] + start;
+ const T *g = Data[1] + start;
+ const T *b = Data[2] + start;
+ Uint16 x;
+ Uint16 y;
if (mode == 24) // 24 bits per pixel
{
const unsigned long wid3 = OFstatic_cast(unsigned long, width) * 3;
@@ -283,7 +283,7 @@ class DiColorPixelTemplate
data = new Uint8[fsize];
if (data != NULL)
{
- register Uint8 *q = OFstatic_cast(Uint8 *, data);
+ Uint8 *q = OFstatic_cast(Uint8 *, data);
if (fromBits == toBits)
{
/* copy pixel data as is */
@@ -365,7 +365,7 @@ class DiColorPixelTemplate
data = new Uint32[count];
if (data != NULL)
{
- register Uint32 *q = OFstatic_cast(Uint32 *, data);
+ Uint32 *q = OFstatic_cast(Uint32 *, data);
if (fromBits == toBits)
{
/* copy pixel data as is */
@@ -465,11 +465,11 @@ class DiColorPixelTemplate
if (data != NULL)
{
const unsigned long start = count * frame;
- register const T *r = Data[0] + start;
- register const T *g = Data[1] + start;
- register const T *b = Data[2] + start;
- register Uint32 *q = OFstatic_cast(Uint32 *, data);
- register unsigned long i;
+ const T *r = Data[0] + start;
+ const T *g = Data[1] + start;
+ const T *b = Data[2] + start;
+ Uint32 *q = OFstatic_cast(Uint32 *, data);
+ unsigned long i;
if (fromBits == toBits)
{
/* copy pixel data as is */
diff --git a/dcmimage/include/dcmtk/dcmimage/dihsvpxt.h b/dcmimage/include/dcmtk/dcmimage/dihsvpxt.h
index dcabd6a..489fa1e 100644
--- a/dcmimage/include/dcmtk/dcmimage/dihsvpxt.h
+++ b/dcmimage/include/dcmtk/dcmimage/dihsvpxt.h
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 1996-2011, OFFIS e.V.
+ * Copyright (C) 1996-2016, OFFIS e.V.
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation were developed by
@@ -82,9 +82,9 @@ class DiHSVPixelTemplate
{
if (this->Init(pixel))
{
- register T2 *r = this->Data[0];
- register T2 *g = this->Data[1];
- register T2 *b = this->Data[2];
+ T2 *r = this->Data[0];
+ T2 *g = this->Data[1];
+ T2 *b = this->Data[2];
const T2 maxvalue = OFstatic_cast(T2, DicomImageClass::maxval(bits));
const T1 offset = OFstatic_cast(T1, DicomImageClass::maxval(bits - 1));
// use the number of input pixels derived from the length of the 'PixelData'
@@ -93,18 +93,18 @@ class DiHSVPixelTemplate
if (this->PlanarConfiguration)
{
/*
- register const T1 *h = pixel;
- register const T1 *s = h + this->InputCount;
- register const T1 *v = s + this->InputCount;
+ const T1 *h = pixel;
+ const T1 *s = h + this->InputCount;
+ const T1 *v = s + this->InputCount;
for (i = count; i != 0; --i)
convertValue(*(r++), *(g++), *(b++), removeSign(*(h++), offset), removeSign(*(s++), offset),
removeSign(*(v++), offset), maxvalue);
*/
- register unsigned long l;
- register unsigned long i = count;
- register const T1 *h = pixel;
- register const T1 *s = h + planeSize;
- register const T1 *v = s + planeSize;
+ unsigned long l;
+ unsigned long i = count;
+ const T1 *h = pixel;
+ const T1 *s = h + planeSize;
+ const T1 *v = s + planeSize;
while (i != 0)
{
/* convert a single frame */
@@ -121,11 +121,11 @@ class DiHSVPixelTemplate
}
else
{
- register const T1 *p = pixel;
- register T2 h;
- register T2 s;
- register T2 v;
- register unsigned long i;
+ const T1 *p = pixel;
+ T2 h;
+ T2 s;
+ T2 v;
+ unsigned long i;
for (i = count; i != 0; --i)
{
h = removeSign(*(p++), offset);
diff --git a/dcmimage/include/dcmtk/dcmimage/dipalpxt.h b/dcmimage/include/dcmtk/dcmimage/dipalpxt.h
index c29e0b2..e1c498a 100644
--- a/dcmimage/include/dcmtk/dcmimage/dipalpxt.h
+++ b/dcmimage/include/dcmtk/dcmimage/dipalpxt.h
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 1996-2011, OFFIS e.V.
+ * Copyright (C) 1996-2016, OFFIS e.V.
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation were developed by
@@ -87,10 +87,10 @@ class DiPalettePixelTemplate
{ // can be optimized if necessary !
if (this->Init(pixel))
{
- register const T1 *p = pixel;
- register T2 value = 0;
- register unsigned long i;
- register int j;
+ const T1 *p = pixel;
+ T2 value = 0;
+ unsigned long i;
+ int j;
// use the number of input pixels derived from the length of the 'PixelData'
// attribute), but not more than the size of the intermediate buffer
const unsigned long count = (this->InputCount < this->Count) ? this->InputCount : this->Count;
diff --git a/dcmimage/include/dcmtk/dcmimage/diqtcmap.h b/dcmimage/include/dcmtk/dcmimage/diqtcmap.h
index d989ffc..2926711 100644
--- a/dcmimage/include/dcmtk/dcmimage/diqtcmap.h
+++ b/dcmimage/include/dcmtk/dcmimage/diqtcmap.h
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2002-2014, OFFIS e.V.
+ * Copyright (C) 2002-2016, OFFIS e.V.
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation were developed by
@@ -82,9 +82,9 @@ public:
long limitcol;
long col; // must be signed!
long maxval_l = OFstatic_cast(long, maxval);
- register int ind;
+ int ind;
const DcmQuantComponent *currentpixel;
- register DcmQuantComponent cr, cg, cb;
+ DcmQuantComponent cr, cg, cb;
// create scale table
DcmQuantScaleTable scaletable;
diff --git a/dcmimage/include/dcmtk/dcmimage/diqtctab.h b/dcmimage/include/dcmtk/dcmimage/diqtctab.h
index ffd1cf6..ae4a21c 100644
--- a/dcmimage/include/dcmtk/dcmimage/diqtctab.h
+++ b/dcmimage/include/dcmtk/dcmimage/diqtctab.h
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2002-2014, OFFIS e.V.
+ * Copyright (C) 2002-2016, OFFIS e.V.
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation were developed by
@@ -163,12 +163,12 @@ public:
inline int computeIndex(const DcmQuantPixel& px) const
{
int result = -1;
- register int r2, g2, b2;
- register long newdist;
- register int r1 = OFstatic_cast(int, px.getRed());
- register int g1 = OFstatic_cast(int, px.getGreen());
- register int b1 = OFstatic_cast(int, px.getBlue());
- register long dist = 2000000000;
+ int r2, g2, b2;
+ long newdist;
+ int r1 = OFstatic_cast(int, px.getRed());
+ int g1 = OFstatic_cast(int, px.getGreen());
+ int b1 = OFstatic_cast(int, px.getBlue());
+ long dist = 2000000000;
for (unsigned long i = 0; i < numColors; ++i)
{
r2 = r1 - OFstatic_cast(int, array[i]->getRed());
diff --git a/dcmimage/include/dcmtk/dcmimage/diqtfs.h b/dcmimage/include/dcmtk/dcmimage/diqtfs.h
index 41b5cfc..e2213ad 100644
--- a/dcmimage/include/dcmtk/dcmimage/diqtfs.h
+++ b/dcmimage/include/dcmtk/dcmimage/diqtfs.h
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2002-2014, OFFIS e.V.
+ * Copyright (C) 2002-2016, OFFIS e.V.
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation were developed by
@@ -63,9 +63,9 @@ public:
*/
inline void adjust(DcmQuantPixel& px, long col, long maxval)
{
- register long sr = px.getRed() + thisrerr[col + 1] / DcmQuantFloydSteinbergScale;
- register long sg = px.getGreen() + thisgerr[col + 1] / DcmQuantFloydSteinbergScale;
- register long sb = px.getBlue() + thisberr[col + 1] / DcmQuantFloydSteinbergScale;
+ long sr = px.getRed() + thisrerr[col + 1] / DcmQuantFloydSteinbergScale;
+ long sg = px.getGreen() + thisgerr[col + 1] / DcmQuantFloydSteinbergScale;
+ long sb = px.getBlue() + thisberr[col + 1] / DcmQuantFloydSteinbergScale;
if ( sr < 0 ) sr = 0;
else if ( sr > OFstatic_cast(long, maxval) ) sr = maxval;
if ( sg < 0 ) sg = 0;
@@ -82,7 +82,7 @@ public:
*/
inline void propagate(const DcmQuantPixel& px, const DcmQuantPixel& mapped, long col)
{
- register long err;
+ long err;
/* Propagate Floyd-Steinberg error terms. */
if ( fs_direction )
diff --git a/dcmimage/include/dcmtk/dcmimage/dirgbpxt.h b/dcmimage/include/dcmtk/dcmimage/dirgbpxt.h
index ed6c0ee..6d4f572 100644
--- a/dcmimage/include/dcmtk/dcmimage/dirgbpxt.h
+++ b/dcmimage/include/dcmtk/dcmimage/dirgbpxt.h
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 1996-2011, OFFIS e.V.
+ * Copyright (C) 1996-2016, OFFIS e.V.
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation were developed by
@@ -86,11 +86,11 @@ class DiRGBPixelTemplate
// attribute), but not more than the size of the intermediate buffer
const unsigned long count = (this->InputCount < this->Count) ? this->InputCount : this->Count;
const T1 offset = OFstatic_cast(T1, DicomImageClass::maxval(bits - 1));
- register const T1 *p = pixel;
+ const T1 *p = pixel;
if (this->PlanarConfiguration)
{
/*
- register T2 *q;
+ T2 *q;
// number of pixels to be skipped (only applicable if 'PixelData' contains more
// pixels than expected)
const unsigned long skip = (this->InputCount > this->Count) ? (this->InputCount - this->Count) : 0;
@@ -103,8 +103,8 @@ class DiRGBPixelTemplate
p += skip;
}
*/
- register unsigned long l;
- register unsigned long i = 0;
+ unsigned long l;
+ unsigned long i = 0;
while (i < count)
{
/* store current pixel index */
@@ -120,8 +120,8 @@ class DiRGBPixelTemplate
}
else
{
- register int j;
- register unsigned long i;
+ int j;
+ unsigned long i;
for (i = 0; i < count; ++i) /* for all pixel ... */
for (j = 0; j < 3; ++j)
this->Data[j][i] = removeSign(*(p++), offset); /* ... copy planes */
diff --git a/dcmimage/include/dcmtk/dcmimage/diybrpxt.h b/dcmimage/include/dcmtk/dcmimage/diybrpxt.h
index f926aca..79bbb14 100644
--- a/dcmimage/include/dcmtk/dcmimage/diybrpxt.h
+++ b/dcmimage/include/dcmtk/dcmimage/diybrpxt.h
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 1998-2014, OFFIS e.V.
+ * Copyright (C) 1998-2016, OFFIS e.V.
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation were developed by
@@ -92,9 +92,9 @@ class DiYBRPixelTemplate
const unsigned long count = (this->InputCount < this->Count) ? this->InputCount : this->Count;
if (rgb) /* convert to RGB model */
{
- register T2 *r = this->Data[0];
- register T2 *g = this->Data[1];
- register T2 *b = this->Data[2];
+ T2 *r = this->Data[0];
+ T2 *g = this->Data[1];
+ T2 *b = this->Data[2];
const T2 maxvalue = OFstatic_cast(T2, DicomImageClass::maxval(bits));
DiPixelRepresentationTemplate<T1> rep;
if (bits == 8 && !rep.isSigned()) // only for unsigned 8 bit
@@ -106,7 +106,7 @@ class DiYBRPixelTemplate
const double r_const = 0.7010 * OFstatic_cast(double, maxvalue);
const double g_const = 0.5291 * OFstatic_cast(double, maxvalue);
const double b_const = 0.8859 * OFstatic_cast(double, maxvalue);
- register unsigned long l;
+ unsigned long l;
for (l = 0; l < 256; ++l)
{
rcr_tab[l] = OFstatic_cast(Sint16, 1.4020 * OFstatic_cast(double, l) - r_const);
@@ -114,15 +114,15 @@ class DiYBRPixelTemplate
gcr_tab[l] = OFstatic_cast(Sint16, 0.7141 * OFstatic_cast(double, l) - g_const);
bcb_tab[l] = OFstatic_cast(Sint16, 1.7720 * OFstatic_cast(double, l) - b_const);
}
- register Sint32 sr;
- register Sint32 sg;
- register Sint32 sb;
+ Sint32 sr;
+ Sint32 sg;
+ Sint32 sb;
if (this->PlanarConfiguration)
{
/*
- register const T1 *y = pixel;
- register const T1 *cb = y + this->InputCount;
- register const T1 *cr = cb + this->InputCount;
+ const T1 *y = pixel;
+ const T1 *cb = y + this->InputCount;
+ const T1 *cr = cb + this->InputCount;
for (i = count; i != 0; --i, ++y, ++cb, ++cr)
{
sr = OFstatic_cast(Sint32, *y) + OFstatic_cast(Sint32, rcr_tab[*cr]);
@@ -133,10 +133,10 @@ class DiYBRPixelTemplate
*(b++) = (sb < 0) ? 0 : (sb > OFstatic_cast(Sint32, maxvalue)) ? maxvalue : OFstatic_cast(T2, sb);
}
*/
- register const T1 *y = pixel;
- register const T1 *cb = y + planeSize;
- register const T1 *cr = cb + planeSize;
- register unsigned long i = count;
+ const T1 *y = pixel;
+ const T1 *cb = y + planeSize;
+ const T1 *cr = cb + planeSize;
+ unsigned long i = count;
while (i != 0)
{
/* convert a single frame */
@@ -157,11 +157,11 @@ class DiYBRPixelTemplate
}
else
{
- register const T1 *p = pixel;
- register T1 y;
- register T1 cb;
- register T1 cr;
- register unsigned long i;
+ const T1 *p = pixel;
+ T1 y;
+ T1 cb;
+ T1 cr;
+ unsigned long i;
for (i = count; i != 0; --i)
{
y = *(p++);
@@ -181,18 +181,18 @@ class DiYBRPixelTemplate
if (this->PlanarConfiguration)
{
/*
- register const T1 *y = pixel;
- register const T1 *cb = y + this->InputCount;
- register const T1 *cr = cb + this->InputCount;
+ const T1 *y = pixel;
+ const T1 *cb = y + this->InputCount;
+ const T1 *cr = cb + this->InputCount;
for (i = count; i != 0; --i)
convertValue(*(r++), *(g++), *(b++), removeSign(*(y++), offset), removeSign(*(cb++), offset),
removeSign(*(cr++), offset), maxvalue);
*/
- register unsigned long l;
- register unsigned long i = count;
- register const T1 *y = pixel;
- register const T1 *cb = y + planeSize;
- register const T1 *cr = cb + planeSize;
+ unsigned long l;
+ unsigned long i = count;
+ const T1 *y = pixel;
+ const T1 *cb = y + planeSize;
+ const T1 *cr = cb + planeSize;
while (i != 0)
{
/* convert a single frame */
@@ -209,11 +209,11 @@ class DiYBRPixelTemplate
}
else
{
- register const T1 *p = pixel;
- register T2 y;
- register T2 cb;
- register T2 cr;
- register unsigned long i;
+ const T1 *p = pixel;
+ T2 y;
+ T2 cb;
+ T2 cr;
+ unsigned long i;
for (i = count; i != 0; --i)
{
y = removeSign(*(p++), offset);
@@ -224,11 +224,11 @@ class DiYBRPixelTemplate
}
}
} else { /* retain YCbCr model */
- register const T1 *p = pixel;
+ const T1 *p = pixel;
if (this->PlanarConfiguration)
{
/*
- register T2 *q;
+ T2 *q;
// number of pixels to be skipped (only applicable if 'PixelData' contains more
// pixels than expected)
const unsigned long skip = (this->InputCount > this->Count) ? (this->InputCount - this->Count) : 0;
@@ -241,8 +241,8 @@ class DiYBRPixelTemplate
p += skip;
}
*/
- register unsigned long l;
- register unsigned long i = 0;
+ unsigned long l;
+ unsigned long i = 0;
while (i < count)
{
/* store current pixel index */
@@ -257,8 +257,8 @@ class DiYBRPixelTemplate
}
else
{
- register int j;
- register unsigned long i;
+ int j;
+ unsigned long i;
for (i = 0; i < count; ++i) /* for all pixel ... */
for (j = 0; j < 3; ++j)
this->Data[j][i] = removeSign(*(p++), offset); /* ... copy planes */
diff --git a/dcmimage/include/dcmtk/dcmimage/diyf2pxt.h b/dcmimage/include/dcmtk/dcmimage/diyf2pxt.h
index 5e1859d..563d183 100644
--- a/dcmimage/include/dcmtk/dcmimage/diyf2pxt.h
+++ b/dcmimage/include/dcmtk/dcmimage/diyf2pxt.h
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 1998-2011, OFFIS e.V.
+ * Copyright (C) 1998-2016, OFFIS e.V.
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation were developed by
@@ -91,15 +91,15 @@ class DiYBR422PixelTemplate
if (this->Init(pixel))
{
const T1 offset = OFstatic_cast(T1, DicomImageClass::maxval(bits - 1));
- register unsigned long i;
- register const T1 *p = pixel;
- register T2 *r = this->Data[0];
- register T2 *g = this->Data[1];
- register T2 *b = this->Data[2];
- register T2 y1;
- register T2 y2;
- register T2 cb;
- register T2 cr;
+ unsigned long i;
+ const T1 *p = pixel;
+ T2 *r = this->Data[0];
+ T2 *g = this->Data[1];
+ T2 *b = this->Data[2];
+ T2 y1;
+ T2 y2;
+ T2 cb;
+ T2 cr;
// use the number of input pixels derived from the length of the 'PixelData'
// attribute), but not more than the size of the intermediate buffer
const unsigned long count = (this->InputCount < this->Count) ? this->InputCount : this->Count;
diff --git a/dcmimage/include/dcmtk/dcmimage/diyp2pxt.h b/dcmimage/include/dcmtk/dcmimage/diyp2pxt.h
index 238631f..395f2d7 100644
--- a/dcmimage/include/dcmtk/dcmimage/diyp2pxt.h
+++ b/dcmimage/include/dcmtk/dcmimage/diyp2pxt.h
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 1998-2011, OFFIS e.V.
+ * Copyright (C) 1998-2016, OFFIS e.V.
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation were developed by
@@ -86,21 +86,21 @@ class DiYBRPart422PixelTemplate
{
if (this->Init(pixel))
{
- register T2 *r = this->Data[0];
- register T2 *g = this->Data[1];
- register T2 *b = this->Data[2];
- register unsigned long i;
+ T2 *r = this->Data[0];
+ T2 *g = this->Data[1];
+ T2 *b = this->Data[2];
+ unsigned long i;
const T2 maxvalue = OFstatic_cast(T2, DicomImageClass::maxval(bits));
const T1 offset = OFstatic_cast(T1, DicomImageClass::maxval(bits - 1));
// use the number of input pixels derived from the length of the 'PixelData'
// attribute), but not more than the size of the intermediate buffer
const unsigned long count = (this->InputCount < this->Count) ? this->InputCount : this->Count;
- register const T1 *p = pixel;
- register T2 y1;
- register T2 y2;
- register T2 cb;
- register T2 cr;
+ const T1 *p = pixel;
+ T2 y1;
+ T2 y2;
+ T2 cb;
+ T2 cr;
for (i = count / 2; i != 0; --i)
{
y1 = removeSign(*(p++), offset);
diff --git a/dcmimage/libsrc/diqtctab.cc b/dcmimage/libsrc/diqtctab.cc
index 559e2d9..3e5d385 100644
--- a/dcmimage/libsrc/diqtctab.cc
+++ b/dcmimage/libsrc/diqtctab.cc
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2002-2014, OFFIS e.V.
+ * Copyright (C) 2002-2016, OFFIS e.V.
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation were developed by
@@ -140,8 +140,8 @@ OFCondition DcmQuantColorTable::medianCut(
for (unsigned int xx=0; xx < numberOfColors; xx++) array[xx] = new DcmQuantHistogramItem();
numColors = numberOfColors;
- register int i;
- register unsigned int bi;
+ int i;
+ unsigned int bi;
DcmQuantPixelBoxArray bv(numberOfColors);
// Set up the initial box.
@@ -153,9 +153,9 @@ OFCondition DcmQuantColorTable::medianCut(
// Main loop: split boxes until we have enough.
while ( boxes < numberOfColors )
{
- register int indx, clrs;
+ int indx, clrs;
unsigned long sm;
- register int minr, maxr, ming, maxg, minb, maxb, v;
+ int minr, maxr, ming, maxg, minb, maxb, v;
unsigned long halfsum, lowersum;
// Find the first splittable box.
@@ -258,9 +258,9 @@ OFCondition DcmQuantColorTable::medianCut(
{
for ( bi = 0; bi < boxes; ++bi )
{
- register int indx = bv[bi].ind;
- register int clrs = bv[bi].colors;
- register int minr, maxr, ming, maxg, minb, maxb, v;
+ int indx = bv[bi].ind;
+ int clrs = bv[bi].colors;
+ int minr, maxr, ming, maxg, minb, maxb, v;
minr = maxr = histogram.array[indx]->getRed();
ming = maxg = histogram.array[indx]->getGreen();
@@ -284,9 +284,9 @@ OFCondition DcmQuantColorTable::medianCut(
{
for ( bi = 0; bi < boxes; ++bi )
{
- register int indx = bv[bi].ind;
- register int clrs = bv[bi].colors;
- register long r = 0, g = 0, b = 0;
+ int indx = bv[bi].ind;
+ int clrs = bv[bi].colors;
+ long r = 0, g = 0, b = 0;
for ( i = 0; i < clrs; ++i )
{
@@ -304,9 +304,9 @@ OFCondition DcmQuantColorTable::medianCut(
{
for ( bi = 0; bi < boxes; ++bi )
{
- register int indx = bv[bi].ind;
- register int clrs = bv[bi].colors;
- register unsigned long r = 0, g = 0, b = 0, sumVal = 0;
+ int indx = bv[bi].ind;
+ int clrs = bv[bi].colors;
+ unsigned long r = 0, g = 0, b = 0, sumVal = 0;
for ( i = 0; i < clrs; ++i )
{
diff --git a/dcmimage/libsrc/diqthash.cc b/dcmimage/libsrc/diqthash.cc
index d93e934..5d13f7d 100644
--- a/dcmimage/libsrc/diqthash.cc
+++ b/dcmimage/libsrc/diqthash.cc
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2002-2014, OFFIS e.V.
+ * Copyright (C) 2002-2016, OFFIS e.V.
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation were developed by
@@ -85,7 +85,7 @@ unsigned long DcmQuantColorHashTable::addToHashTable(
DcmQuantScaleTable scaletable;
scaletable.createTable(maxval, newmaxval);
- register DcmQuantComponent r, g, b;
+ DcmQuantComponent r, g, b;
for (unsigned long ff=0; ff<frames; ff++)
{
diff --git a/dcmimage/libsrc/diquant.cc b/dcmimage/libsrc/diquant.cc
index 8d04bcf..484546b 100644
--- a/dcmimage/libsrc/diquant.cc
+++ b/dcmimage/libsrc/diquant.cc
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2002-2010, OFFIS e.V.
+ * Copyright (C) 2002-2016, OFFIS e.V.
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation were developed by
@@ -93,7 +93,7 @@ OFCondition DcmQuant::createPaletteColorImage(
}
DcmQuantIdent id(cols);
- register OFBool isByteData = (numberOfColors <= 256);
+ OFBool isByteData = (numberOfColors <= 256);
// compute size requirement for palette color pixel data in bytes
unsigned long totalSize = cols * rows * frames;
diff --git a/dcmimgle/include/dcmtk/dcmimgle/dcmimage.h b/dcmimgle/include/dcmtk/dcmimgle/dcmimage.h
index 5b27a6c..82b6572 100644
--- a/dcmimgle/include/dcmtk/dcmimgle/dcmimage.h
+++ b/dcmimgle/include/dcmtk/dcmimgle/dcmimage.h
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 1996-2014, OFFIS e.V.
+ * Copyright (C) 1996-2016, OFFIS e.V.
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation were developed by
@@ -317,8 +317,11 @@ class DCMTK_DCMIMGLE_EXPORT DicomImage
/** get width height ratio (pixel aspect ratio: x/y).
* If present in the dataset and not overwritten using setWidthHeightRatio(), the following
- * attributes are supported in order to determine this value:
- * - Pixel Spacing, Imager Pixel Spacing, Nominal Scanned Pixel Spacing, Pixel Aspect Ratio
+ * attributes are checked in order to determine this value:
+ * - Pixel Spacing, Imager Pixel Spacing, Nominal Scanned Pixel Spacing, Pixel Aspect Ratio.
+ * The first attribute (Pixel Spacing) is checked both on the main dataset level and within
+ * the Pixel Measures Sequence of the Shared Functional Groups Sequence (if present).
+ *
** @return pixel aspect ratio (floating point value)
*/
inline double getWidthHeightRatio() const
@@ -329,8 +332,10 @@ class DCMTK_DCMIMGLE_EXPORT DicomImage
/** get height width ratio (pixel aspect ratio: y/x).
* If present in the dataset and not overwritten using setWidthHeightRatio(), the following
- * attributes are supported in order to determine this value:
+ * attributes are checked in order to determine this value:
* - Pixel Spacing, Imager Pixel Spacing, Nominal Scanned Pixel Spacing, Pixel Aspect Ratio
+ * The first attribute (Pixel Spacing) is checked both on the main dataset level and within
+ * the Pixel Measures Sequence of the Shared Functional Groups Sequence (if present).
*
** @return pixel aspect ratio (floating point value)
*/
@@ -626,7 +631,7 @@ class DCMTK_DCMIMGLE_EXPORT DicomImage
/** set automatically calculated histogram window.
* possibly active VOI LUT is implicitly disabled.
*
- ** @param thresh threshhold value specifying percentage of histogram border which
+ ** @param thresh threshold value specifying percentage of histogram border which
* shall be ignored (defaut: 5%).
*
** @return true if successful, false otherwise
diff --git a/dcmimgle/include/dcmtk/dcmimgle/dicrvfit.h b/dcmimgle/include/dcmtk/dcmimgle/dicrvfit.h
index b4e5575..f010f35 100644
--- a/dcmimgle/include/dcmtk/dcmimgle/dicrvfit.h
+++ b/dcmimgle/include/dcmtk/dcmimgle/dicrvfit.h
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 1996-2010, OFFIS e.V.
+ * Copyright (C) 1996-2016, OFFIS e.V.
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation were developed by
@@ -81,9 +81,9 @@ class DiCurveFitting
T3_ *beta = new T3_[order];
if ((basis != NULL) && (alpha != NULL) && (beta != NULL))
{
- register unsigned int i;
- register unsigned int j;
- register unsigned int k;
+ unsigned int i;
+ unsigned int j;
+ unsigned int k;
for (i = 0; i < order; ++i)
{
for (j = 0; j < n; ++j)
@@ -156,8 +156,8 @@ class DiCurveFitting
int result = 0;
if ((y != NULL) && (c != NULL) && (n > 0) && (xe > xs))
{
- register unsigned int i;
- register unsigned int j;
+ unsigned int i;
+ unsigned int j;
T3_ x;
T3_ x2;
T3_ w;
@@ -259,9 +259,9 @@ class DiCurveFitting
int result = 0;
if ((a != NULL) && (b != NULL) && (n > 0))
{
- register unsigned int i;
- register unsigned int j;
- register unsigned int k;
+ unsigned int i;
+ unsigned int j;
+ unsigned int k;
signed int pivot;
T3_ mag;
T3_ mag2;
diff --git a/dcmimgle/include/dcmtk/dcmimgle/diflipt.h b/dcmimgle/include/dcmtk/dcmimgle/diflipt.h
index a75b62b..5cf0ead 100644
--- a/dcmimgle/include/dcmtk/dcmimgle/diflipt.h
+++ b/dcmimgle/include/dcmtk/dcmimgle/diflipt.h
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 1996-2011, OFFIS e.V.
+ * Copyright (C) 1996-2016, OFFIS e.V.
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation were developed by
@@ -139,11 +139,11 @@ class DiFlipTemplate
{
if ((src != NULL) && (dest != NULL))
{
- register Uint16 x;
- register Uint16 y;
- register const T *p;
- register T *q;
- register T *r;
+ Uint16 x;
+ Uint16 y;
+ const T *p;
+ T *q;
+ T *r;
for (int j = 0; j < this->Planes; ++j)
{
p = src[j];
@@ -172,11 +172,11 @@ class DiFlipTemplate
{
if ((src != NULL) && (dest != NULL))
{
- register Uint16 x;
- register Uint16 y;
- register const T *p;
- register T *q;
- register T *r;
+ Uint16 x;
+ Uint16 y;
+ const T *p;
+ T *q;
+ T *r;
const unsigned long count = OFstatic_cast(unsigned long, this->Dest_X) * OFstatic_cast(unsigned long, this->Dest_Y);
for (int j = 0; j < this->Planes; ++j)
{
@@ -208,9 +208,9 @@ class DiFlipTemplate
{
if ((src != NULL) && (dest != NULL))
{
- register unsigned long i;
- register const T *p;
- register T *q;
+ unsigned long i;
+ const T *p;
+ T *q;
const unsigned long count = OFstatic_cast(unsigned long, this->Dest_X) * OFstatic_cast(unsigned long, this->Dest_Y);
for (int j = 0; j < this->Planes; ++j)
{
@@ -235,11 +235,11 @@ class DiFlipTemplate
*/
inline void flipHorz(T *data[])
{
- register Uint16 x;
- register Uint16 y;
- register T *p;
- register T *q;
- register T t;
+ Uint16 x;
+ Uint16 y;
+ T *p;
+ T *q;
+ T t;
T *r;
for (int j = 0; j < this->Planes; ++j)
{
@@ -268,12 +268,12 @@ class DiFlipTemplate
*/
inline void flipVert(T *data[])
{
- register Uint16 x;
- register Uint16 y;
- register T *p;
- register T *q;
- register T *r;
- register T t;
+ Uint16 x;
+ Uint16 y;
+ T *p;
+ T *q;
+ T *r;
+ T t;
T *s;
const unsigned long count = OFstatic_cast(unsigned long, this->Dest_X) * OFstatic_cast(unsigned long, this->Dest_Y);
for (int j = 0; j < this->Planes; ++j)
@@ -305,10 +305,10 @@ class DiFlipTemplate
*/
inline void flipHorzVert(T *data[])
{
- register unsigned long i;
- register T *p;
- register T *q;
- register T t;
+ unsigned long i;
+ T *p;
+ T *q;
+ T t;
T *s;
const unsigned long count = OFstatic_cast(unsigned long, this->Dest_X) * OFstatic_cast(unsigned long, this->Dest_Y);
for (int j = 0; j < this->Planes; ++j)
diff --git a/dcmimgle/include/dcmtk/dcmimgle/diinpxt.h b/dcmimgle/include/dcmtk/dcmimgle/diinpxt.h
index 6a05cbe..919c210 100644
--- a/dcmimgle/include/dcmtk/dcmimgle/diinpxt.h
+++ b/dcmimgle/include/dcmtk/dcmimgle/diinpxt.h
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 1996-2014, OFFIS e.V.
+ * Copyright (C) 1996-2016, OFFIS e.V.
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation were developed by
@@ -182,8 +182,8 @@ class DiInputPixelTemplate
if (Data != NULL)
{
DCMIMGLE_DEBUG("determining minimum and maximum pixel values for input data");
- register T2 *p = Data;
- register unsigned long i;
+ T2 *p = Data;
+ unsigned long i;
const unsigned long ocnt = OFstatic_cast(unsigned long, getAbsMaxRange());
Uint8 *lut = NULL;
if ((sizeof(T2) <= 2) && (Count > 3 * ocnt)) // optimization criteria
@@ -193,7 +193,7 @@ class DiInputPixelTemplate
{
DCMIMGLE_DEBUG("using optimized routine with additional LUT");
OFBitmanipTemplate<Uint8>::zeroMem(lut, ocnt);
- register Uint8 *q = lut - OFstatic_cast(T2, getAbsMinimum());
+ Uint8 *q = lut - OFstatic_cast(T2, getAbsMinimum());
for (i = Count; i != 0; --i) // fill lookup table
*(q + *(p++)) = 1;
q = lut;
@@ -247,7 +247,7 @@ class DiInputPixelTemplate
}
if (lut == NULL) // use conventional method
{
- register T2 value = *p;
+ T2 value = *p;
MinValue[0] = value;
MaxValue[0] = value;
for (i = Count; i > 1; --i)
@@ -454,7 +454,7 @@ class DiInputPixelTemplate
const Uint32 length_B2 = lengthBytes % bitsAllocated;
// # old code: Count = ((lengthBytes * 8) + bitsAllocated - 1) / bitsAllocated;
Count = 8 * length_B1 + (8 * length_B2 + bitsAllocated - 1) / bitsAllocated;
- register unsigned long i;
+ unsigned long i;
#ifdef HAVE_STD__NOTHROW
/* use a non-throwing new here (if available) because the allocated buffer can be huge */
Data = new (std::nothrow) T2[Count];
@@ -474,8 +474,8 @@ class DiInputPixelTemplate
DCMIMGLE_TRACE("Input length: " << lengthBytes << " bytes, Pixel count: " << Count
<< " (" << PixelCount << "), In: " << bitsof_T1 << " bits, Out: " << bitsof_T2
<< " bits (" << (this->isSigned() ? "signed" : "unsigned") << ")");
- register const T1 *p = pixel;
- register T2 *q = Data;
+ const T1 *p = pixel;
+ T2 *q = Data;
if (bitsof_T1 == bitsAllocated) // case 1: equal 8/16 bit
{
if (bitsStored == bitsAllocated)
@@ -486,7 +486,7 @@ class DiInputPixelTemplate
}
else /* bitsStored < bitsAllocated */
{
- register T1 mask = 0;
+ T1 mask = 0;
for (i = 0; i < bitsStored; ++i)
mask |= OFstatic_cast(T1, 1 << i);
const T2 sign = 1 << (bitsStored - 1);
@@ -511,11 +511,11 @@ class DiInputPixelTemplate
else if ((bitsof_T1 > bitsAllocated) && (bitsof_T1 % bitsAllocated == 0)) // case 2: divisor of 8/16 bit
{
const Uint16 times = bitsof_T1 / bitsAllocated;
- register T1 mask = 0;
+ T1 mask = 0;
for (i = 0; i < bitsStored; ++i)
mask |= OFstatic_cast(T1, 1 << i);
- register Uint16 j;
- register T1 value;
+ Uint16 j;
+ T1 value;
if ((bitsStored == bitsAllocated) && (bitsStored == bitsof_T2))
{
if (times == 2)
@@ -571,9 +571,9 @@ class DiInputPixelTemplate
{
DCMIMGLE_DEBUG("convert input pixel data: case 3 (multi copy)");
const Uint16 times = bitsAllocated / bitsof_T1;
- register Uint16 j;
- register Uint16 shift;
- register T2 value;
+ Uint16 j;
+ Uint16 shift;
+ T2 value;
for (i = length_T1; i != 0; --i)
{
shift = 0;
@@ -589,10 +589,10 @@ class DiInputPixelTemplate
else // case 4: anything else
{
DCMIMGLE_DEBUG("convert input pixel data: case 4 (general)");
- register T2 value = 0;
- register Uint16 bits = 0;
- register Uint32 skip = highBit + 1 - bitsStored;
- register Uint32 times;
+ T2 value = 0;
+ Uint16 bits = 0;
+ Uint32 skip = highBit + 1 - bitsStored;
+ Uint32 times;
T1 mask[bitsof_T1];
mask[0] = 1;
for (i = 1; i < bitsof_T1; ++i)
diff --git a/dcmimgle/include/dcmtk/dcmimgle/dimoimg.h b/dcmimgle/include/dcmtk/dcmimgle/dimoimg.h
index 13b27f3..ef7fe32 100644
--- a/dcmimgle/include/dcmtk/dcmimgle/dimoimg.h
+++ b/dcmimgle/include/dcmtk/dcmimgle/dimoimg.h
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 1996-2012, OFFIS e.V.
+ * Copyright (C) 1996-2016, OFFIS e.V.
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation were developed by
@@ -219,7 +219,7 @@ class DCMTK_DCMIMGLE_EXPORT DiMonoImage
/** set automatically calculated histogram window.
* possibly active VOI LUT is implicitly disabled.
*
- ** @param thresh threshhold value specifying percentage of histogram border which shall be ignored
+ ** @param thresh threshold value specifying percentage of histogram border which shall be ignored
*
** @return true if successful, false otherwise
*/
@@ -683,7 +683,7 @@ class DCMTK_DCMIMGLE_EXPORT DiMonoImage
* @param upsideDown specifies the order of lines in the images (0 = top-down, bottom-up otherwise)
* @param padding align each line to a 32-bit address if true (default)
*
- ** @return number of bytes allocated by the bitmap, or 0 if an error occured
+ ** @return number of bytes allocated by the bitmap, or 0 if an error occurred
*/
unsigned long createDIB(void *&data,
const unsigned long size,
@@ -699,7 +699,7 @@ class DCMTK_DCMIMGLE_EXPORT DiMonoImage
* @param frame index of frame to be converted (starting from 0)
* @param bits number of bits per pixel used for the output bitmap (8 or 32)
*
- ** @return number of bytes allocated by the bitmap, or 0 if an error occured
+ ** @return number of bytes allocated by the bitmap, or 0 if an error occurred
*/
unsigned long createAWTBitmap(void *&data,
const unsigned long frame,
@@ -1120,7 +1120,7 @@ class DCMTK_DCMIMGLE_EXPORT DiMonoImage
unsigned int MinDensity;
/// maximum density of a print-out (ditto)
unsigned int MaxDensity;
- /// reflected ambient light (in candela per squaremeter)
+ /// reflected ambient light (in candela per square meter)
unsigned int Reflection;
/// illumination (ditto)
unsigned int Illumination;
diff --git a/dcmimgle/include/dcmtk/dcmimgle/dimoipxt.h b/dcmimgle/include/dcmtk/dcmimgle/dimoipxt.h
index 2e7dc91..0895a6d 100644
--- a/dcmimgle/include/dcmtk/dcmimgle/dimoipxt.h
+++ b/dcmimgle/include/dcmtk/dcmimgle/dimoipxt.h
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 1996-2011, OFFIS e.V.
+ * Copyright (C) 1996-2016, OFFIS e.V.
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation were developed by
@@ -132,14 +132,14 @@ class DiMonoInputPixelTemplate
if (this->Data != NULL)
{
DCMIMGLE_DEBUG("applying modality tranformation with LUT (" << mlut->getCount() << " entries)");
- register T2 value = 0;
+ T2 value = 0;
const T2 firstentry = mlut->getFirstEntry(value); // choose signed/unsigned method
const T2 lastentry = mlut->getLastEntry(value);
const T3 firstvalue = OFstatic_cast(T3, mlut->getFirstValue());
const T3 lastvalue = OFstatic_cast(T3, mlut->getLastValue());
- register const T1 *p = pixel + input->getPixelStart();
- register T3 *q = this->Data;
- register unsigned long i;
+ const T1 *p = pixel + input->getPixelStart();
+ T3 *q = this->Data;
+ unsigned long i;
T3 *lut = NULL;
const unsigned long ocnt = OFstatic_cast(unsigned long, input->getAbsMaxRange()); // number of LUT entries
if (initOptimizationLUT(lut, ocnt))
@@ -203,20 +203,20 @@ class DiMonoInputPixelTemplate
this->Data = new T3[this->Count];
if (this->Data != NULL)
{
- register T3 *q = this->Data;
- register unsigned long i;
+ T3 *q = this->Data;
+ unsigned long i;
if ((slope == 1.0) && (intercept == 0.0))
{
if (!useInputBuffer)
{
- register const T1 *p = pixel + input->getPixelStart();
+ const T1 *p = pixel + input->getPixelStart();
for (i = this->InputCount; i != 0; --i) // copy pixel data: can't use copyMem because T1 isn't always equal to T3
*(q++) = OFstatic_cast(T3, *(p++));
}
} else {
DCMIMGLE_DEBUG("applying modality transformation with rescale slope = " << slope << ", intercept = " << intercept);
T3 *lut = NULL;
- register const T1 *p = pixel + input->getPixelStart();
+ const T1 *p = pixel + input->getPixelStart();
const unsigned long ocnt = OFstatic_cast(unsigned long, input->getAbsMaxRange()); // number of LUT entries
if (initOptimizationLUT(lut, ocnt))
{ // use LUT for optimization
diff --git a/dcmimgle/include/dcmtk/dcmimgle/dimoopxt.h b/dcmimgle/include/dcmtk/dcmimgle/dimoopxt.h
index c2a482a..ba3e71e 100644
--- a/dcmimgle/include/dcmtk/dcmimgle/dimoopxt.h
+++ b/dcmimgle/include/dcmtk/dcmimgle/dimoopxt.h
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 1996-2013, OFFIS e.V.
+ * Copyright (C) 1996-2016, OFFIS e.V.
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation were developed by
@@ -196,7 +196,7 @@ class DiMonoOutputPixelTemplate
{
if (Data != NULL)
{
- register unsigned long i;
+ unsigned long i;
for (i = 0; i < FrameSize; ++i)
stream << OFstatic_cast(unsigned long, Data[i]) << " "; // typecast to resolve problems with 'char'
return 1;
@@ -216,7 +216,7 @@ class DiMonoOutputPixelTemplate
{
if (Data != NULL)
{
- register unsigned long i;
+ unsigned long i;
for (i = 0; i < FrameSize; ++i)
fprintf(stream, "%lu ", OFstatic_cast(unsigned long, Data[i]));
return 1;
@@ -239,9 +239,9 @@ class DiMonoOutputPixelTemplate
if (UsedValues != NULL)
{
OFBitmanipTemplate<Uint8>::zeroMem(UsedValues, MaxValue + 1); // initialize array
- register const T3 *p = Data;
- register Uint8 *q = UsedValues;
- register unsigned long i;
+ const T3 *p = Data;
+ Uint8 *q = UsedValues;
+ unsigned long i;
for (i = Count; i != 0; --i)
*(q + *(p++)) = 1; // mark used entries
}
@@ -336,7 +336,7 @@ class DiMonoOutputPixelTemplate
const DiDisplayLUT *dlut = NULL;
const double minvalue = vlut->getMinValue();
const double outrange = OFstatic_cast(double, high) - OFstatic_cast(double, low) + 1;
- register unsigned long i;
+ unsigned long i;
if (minvalue == vlut->getMaxValue()) // LUT has only one entry or all entries are equal
{
T3 value;
@@ -372,19 +372,19 @@ class DiMonoOutputPixelTemplate
}
OFBitmanipTemplate<T3>::setMem(Data, value, Count); // set output pixels to LUT value
} else {
- register T2 value = 0;
+ T2 value = 0;
const T2 absmin = OFstatic_cast(T2, inter->getAbsMinimum());
const T2 firstentry = vlut->getFirstEntry(value); // choose signed/unsigned method
const T2 lastentry = vlut->getLastEntry(value);
const unsigned long ocnt = OFstatic_cast(unsigned long, inter->getAbsMaxRange()); // number of LUT entries
- register const T1 *p = pixel + start;
- register T3 *q = Data;
+ const T1 *p = pixel + start;
+ T3 *q = Data;
T3 *lut = NULL;
if ((plut != NULL) && (plut->isValid())) // has presentation LUT
{
DCMIMGLE_DEBUG("applying presentation LUT transformation");
createDisplayLUT(dlut, disp, plut->getBits());
- register Uint32 value2; // presentation LUT is always unsigned
+ Uint32 value2; // presentation LUT is always unsigned
const Uint32 pcnt = plut->getCount();
const double gradient1 = OFstatic_cast(double, pcnt) / OFstatic_cast(double, vlut->getAbsMaxRange());
const Uint32 firstvalue = OFstatic_cast(Uint32, OFstatic_cast(double, vlut->getFirstValue()) * gradient1);
@@ -624,15 +624,15 @@ class DiMonoOutputPixelTemplate
const double outrange = OFstatic_cast(double, high) - OFstatic_cast(double, low) + 1;
const unsigned long ocnt = OFstatic_cast(unsigned long, inter->getAbsMaxRange()); // number of LUT entries
DCMIMGLE_TRACE("intermediate pixel data - absmin: " << absmin << ", absmax: " << absmax);
- register const T1 *p = pixel + start;
- register T3 *q = Data;
- register unsigned long i;
+ const T1 *p = pixel + start;
+ T3 *q = Data;
+ unsigned long i;
T3 *lut = NULL;
if ((plut != NULL) && (plut->isValid())) // has presentation LUT
{
DCMIMGLE_DEBUG("applying presentation LUT transformation");
createDisplayLUT(dlut, disp, plut->getBits());
- register Uint32 value; // presentation LUT is always unsigned
+ Uint32 value; // presentation LUT is always unsigned
const double gradient1 = OFstatic_cast(double, plut->getCount()) / inter->getAbsMaxRange();
const double gradient2 = outrange / OFstatic_cast(double, plut->getAbsMaxRange());
if (initOptimizationLUT(lut, ocnt))
@@ -700,7 +700,7 @@ class DiMonoOutputPixelTemplate
}
} else { // has no presentation LUT
createDisplayLUT(dlut, disp, inter->getBits());
- register const double gradient = outrange / (inter->getAbsMaxRange());
+ const double gradient = outrange / (inter->getAbsMaxRange());
if (initOptimizationLUT(lut, ocnt))
{ // use LUT for optimization
q = lut;
@@ -785,16 +785,16 @@ class DiMonoOutputPixelTemplate
const double absmin = inter->getAbsMinimum();
const double outrange = OFstatic_cast(double, high) - OFstatic_cast(double, low); // output range
const unsigned long ocnt = OFstatic_cast(unsigned long, inter->getAbsMaxRange()); // number of LUT entries
- register const T1 *p = pixel + start;
- register T3 *q = Data;
- register unsigned long i;
- register double value;
+ const T1 *p = pixel + start;
+ T3 *q = Data;
+ unsigned long i;
+ double value;
T3 *lut = NULL;
if ((plut != NULL) && (plut->isValid())) // has presentation LUT
{
DCMIMGLE_DEBUG("applying presentation LUT transformation");
createDisplayLUT(dlut, disp, plut->getBits());
- register Uint32 value2; // presentation LUT is always unsigned
+ Uint32 value2; // presentation LUT is always unsigned
const double plutcnt_1 = OFstatic_cast(double, plut->getCount() - 1);
const double plutmax_1 = OFstatic_cast(double, plut->getAbsMaxRange() - 1);
if (initOptimizationLUT(lut, ocnt))
@@ -947,16 +947,16 @@ class DiMonoOutputPixelTemplate
const double rightBorder = center - 0.5 + width_1 / 2;
const double outrange = OFstatic_cast(double, high) - OFstatic_cast(double, low); // output range
const unsigned long ocnt = OFstatic_cast(unsigned long, inter->getAbsMaxRange()); // number of LUT entries
- register const T1 *p = pixel + start;
- register T3 *q = Data;
- register unsigned long i;
- register double value;
+ const T1 *p = pixel + start;
+ T3 *q = Data;
+ unsigned long i;
+ double value;
T3 *lut = NULL;
if ((plut != NULL) && (plut->isValid())) // has presentation LUT
{
DCMIMGLE_DEBUG("applying presentation LUT transformation");
createDisplayLUT(dlut, disp, plut->getBits());
- register Uint32 value2; // presentation LUT is always unsigned
+ Uint32 value2; // presentation LUT is always unsigned
const Uint32 pcnt = plut->getCount();
const double plutmax_1 = OFstatic_cast(double, plut->getAbsMaxRange()) - 1;
const double gradient1 = (width_1 == 0) ? 0 : OFstatic_cast(double, pcnt - 1) / width_1;
@@ -1142,15 +1142,15 @@ class DiMonoOutputPixelTemplate
DCMIMGLE_DEBUG("applying " << ((j == 0) ? "built-in" : "additional") << " overlay planes");
const signed long left_pos = overlays[j]->getLeft();
const signed long top_pos = overlays[j]->getTop();
- register DiOverlayPlane *plane;
+ DiOverlayPlane *plane;
for (unsigned int i = 0; i < overlays[j]->getCount(); ++i)
{
plane = overlays[j]->getPlane(i);
if ((plane != NULL) && plane->isVisible() && plane->reset(frame))
{
- register T3 *q;
- register Uint16 x;
- register Uint16 y;
+ T3 *q;
+ Uint16 x;
+ Uint16 y;
const Uint16 xmin = (plane->getLeft(left_pos) > 0) ? plane->getLeft(left_pos) : 0;
const Uint16 ymin = (plane->getTop(top_pos) > 0) ? plane->getTop(top_pos) : 0;
const Uint16 xmax = (plane->getRight(left_pos) < columns) ? plane->getRight(left_pos) : columns;
@@ -1242,7 +1242,7 @@ class DiMonoOutputPixelTemplate
case EMO_BitmapShutter:
{
DCMIMGLE_DEBUG("applying overlay plane " << (i + 1) << " with 'bitmap shutter' mode");
- register T3 fore = OFstatic_cast(T3, OFstatic_cast(double, maxvalue) * OFstatic_cast(double, plane->getPValue()) / OFstatic_cast(double, DicomImageClass::maxval(WIDTH_OF_PVALUES)));
+ T3 fore = OFstatic_cast(T3, OFstatic_cast(double, maxvalue) * OFstatic_cast(double, plane->getPValue()) / OFstatic_cast(double, DicomImageClass::maxval(WIDTH_OF_PVALUES)));
if ((disp != NULL) && (disp->isValid()))
{
const DiDisplayLUT *dlut = disp->getLookupTable(WIDTH_OF_PVALUES);
diff --git a/dcmimgle/include/dcmtk/dcmimgle/dimopxt.h b/dcmimgle/include/dcmtk/dcmimgle/dimopxt.h
index d4da535..532ee3a 100644
--- a/dcmimgle/include/dcmtk/dcmimgle/dimopxt.h
+++ b/dcmimgle/include/dcmtk/dcmimgle/dimopxt.h
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 1996-2014, OFFIS e.V.
+ * Copyright (C) 1996-2016, OFFIS e.V.
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation were developed by
@@ -229,15 +229,15 @@ class DiMonoPixelTemplate
int result = 0;
if ((Data != NULL) && (left_pos < columns) && (top_pos < rows))
{
- register T *p = Data + (columns * rows * frame) + (top_pos * columns) + left_pos;
+ T *p = Data + (columns * rows * frame) + (top_pos * columns) + left_pos;
const unsigned long right_pos = (left_pos + width < columns) ? left_pos + width : columns;
const unsigned long bottom = (top_pos + height < rows) ? top_pos + height : rows;
const unsigned long skip_x = left_pos + (columns - right_pos);
- register unsigned long x;
- register unsigned long y;
- register T value = 0;
- register T min = *p; // get first pixel as initial value for min ...
- register T max = min; // ... and max
+ unsigned long x;
+ unsigned long y;
+ T value = 0;
+ T min = *p; // get first pixel as initial value for min ...
+ T max = min; // ... and max
for (y = top_pos; y < bottom; ++y)
{
for (x = left_pos; x < right_pos; ++x)
@@ -278,7 +278,7 @@ class DiMonoPixelTemplate
Uint32 *quant = new Uint32[count];
if (quant != NULL)
{
- register unsigned long i;
+ unsigned long i;
OFBitmanipTemplate<Uint32>::zeroMem(quant, count); // initialize array
for (i = 0; i < Count; ++i)
{
@@ -290,7 +290,7 @@ class DiMonoPixelTemplate
#endif
}
const Uint32 threshvalue = OFstatic_cast(Uint32, thresh * OFstatic_cast(double, Count));
- register Uint32 t = 0;
+ Uint32 t = 0;
i = 0;
while ((i < count) && (t < threshvalue))
t += quant[i++];
@@ -368,9 +368,9 @@ class DiMonoPixelTemplate
if ((minvalue == 0) && (maxvalue == 0))
{
DCMIMGLE_DEBUG("determining global minimum and maximum pixel values for monochrome image");
- register T *p = Data;
- register T value = *p;
- register unsigned long i;
+ T *p = Data;
+ T value = *p;
+ unsigned long i;
minvalue = value;
maxvalue = value;
for (i = Count; i > 1; --i) // could be optimized if necessary (see diinpxt.h) !
@@ -393,11 +393,11 @@ class DiMonoPixelTemplate
if (mode & 0x2)
{
DCMIMGLE_DEBUG("determining next minimum and maximum pixel values for monochrome image");
- register T *p = Data;
- register T value;
- register int firstmin = 1;
- register int firstmax = 1;
- register unsigned long i;
+ T *p = Data;
+ T value;
+ int firstmin = 1;
+ int firstmax = 1;
+ unsigned long i;
for (i = Count; i != 0; --i) // could be optimized if necessary (see diinpxt.h) !
{
value = *(p++);
diff --git a/dcmimgle/include/dcmtk/dcmimgle/dirotat.h b/dcmimgle/include/dcmtk/dcmimgle/dirotat.h
index 2a92cac..c6ea743 100644
--- a/dcmimgle/include/dcmtk/dcmimgle/dirotat.h
+++ b/dcmimgle/include/dcmtk/dcmimgle/dirotat.h
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 1996-2011, OFFIS e.V.
+ * Copyright (C) 1996-2016, OFFIS e.V.
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation were developed by
@@ -141,11 +141,11 @@ class DiRotateTemplate
{
if ((src != NULL) && (dest != NULL))
{
- register Uint16 x;
- register Uint16 y;
- register const T *p;
- register T *q;
- register T *r;
+ Uint16 x;
+ Uint16 y;
+ const T *p;
+ T *q;
+ T *r;
const unsigned long count = OFstatic_cast(unsigned long, this->Dest_X) * OFstatic_cast(unsigned long, this->Dest_Y);
for (int j = 0; j < this->Planes; ++j)
{
@@ -178,11 +178,11 @@ class DiRotateTemplate
{
if ((src != NULL) && (dest != NULL))
{
- register Uint16 x;
- register Uint16 y;
- register const T *p;
- register T *q;
- register T *r;
+ Uint16 x;
+ Uint16 y;
+ const T *p;
+ T *q;
+ T *r;
const unsigned long count = OFstatic_cast(unsigned long, this->Dest_X) * OFstatic_cast(unsigned long, this->Dest_Y);
for (int j = 0; j < this->Planes; ++j)
{
@@ -215,9 +215,9 @@ class DiRotateTemplate
{
if ((src != NULL) && (dest != NULL))
{
- register unsigned long i;
- register const T *p;
- register T *q;
+ unsigned long i;
+ const T *p;
+ T *q;
const unsigned long count = OFstatic_cast(unsigned long, this->Dest_X) * OFstatic_cast(unsigned long, this->Dest_Y);
for (int j = 0; j < this->Planes; ++j)
{
@@ -246,11 +246,11 @@ class DiRotateTemplate
T *temp = new T[count];
if (temp != NULL)
{
- register Uint16 x;
- register Uint16 y;
- register const T *p;
- register T *q;
- register T *r;
+ Uint16 x;
+ Uint16 y;
+ const T *p;
+ T *q;
+ T *r;
for (int j = 0; j < this->Planes; ++j)
{
r = data[j];
@@ -284,11 +284,11 @@ class DiRotateTemplate
T *temp = new T[count];
if (temp != NULL)
{
- register Uint16 x;
- register Uint16 y;
- register const T *p;
- register T *q;
- register T *r;
+ Uint16 x;
+ Uint16 y;
+ const T *p;
+ T *q;
+ T *r;
for (int j = 0; j < this->Planes; ++j)
{
r = data[j];
@@ -318,10 +318,10 @@ class DiRotateTemplate
*/
inline void rotateTopDown(T *data[])
{
- register unsigned long i;
- register T *p;
- register T *q;
- register T t;
+ unsigned long i;
+ T *p;
+ T *q;
+ T t;
T *s;
const unsigned long count = OFstatic_cast(unsigned long, this->Dest_X) * OFstatic_cast(unsigned long, this->Dest_Y);
for (int j = 0; j < this->Planes; ++j)
diff --git a/dcmimgle/include/dcmtk/dcmimgle/discalet.h b/dcmimgle/include/dcmtk/dcmimgle/discalet.h
index 762c13b..3611ffd 100644
--- a/dcmimgle/include/dcmtk/dcmimgle/discalet.h
+++ b/dcmimgle/include/dcmtk/dcmimgle/discalet.h
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 1996-2015, OFFIS e.V.
+ * Copyright (C) 1996-2016, OFFIS e.V.
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation were developed by
@@ -48,7 +48,7 @@ static inline void setScaleValues(Uint16 data[],
const Uint16 min,
const Uint16 max)
{
- register Uint16 remainder = max % min;
+ Uint16 remainder = max % min;
Uint16 step0 = max / min;
Uint16 step1 = max / min;
if (remainder > OFstatic_cast(Uint16, min / 2))
@@ -58,8 +58,8 @@ static inline void setScaleValues(Uint16 data[],
} else
++step1;
const double count = OFstatic_cast(double, min) / (OFstatic_cast(double, remainder) + 1);
- register Uint16 i;
- register double c = count;
+ Uint16 i;
+ double c = count;
for (i = 0; i < min; ++i)
{
if ((i >= OFstatic_cast(Uint16, c)) && (remainder > 0))
@@ -260,10 +260,10 @@ class DiScaleTemplate
DCMIMGLE_DEBUG("using clip image to specified area algorithm");
const unsigned long x_feed = Columns - this->Src_X;
const unsigned long y_feed = OFstatic_cast(unsigned long, Rows - this->Src_Y) * OFstatic_cast(unsigned long, Columns);
- register Uint16 x;
- register Uint16 y;
- register const T *p;
- register T *q;
+ Uint16 x;
+ Uint16 y;
+ const T *p;
+ T *q;
for (int j = 0; j < this->Planes; ++j)
{
p = src[j] + OFstatic_cast(unsigned long, Top) * OFstatic_cast(unsigned long, Columns) + Left;
@@ -317,11 +317,11 @@ class DiScaleTemplate
* different from most of the other algorithms in this toolkit where the source image is scanned
* linearly.
*/
- register Uint16 x;
- register Uint16 y;
- register unsigned long i;
- register const T *p;
- register T *q;
+ Uint16 x;
+ Uint16 y;
+ unsigned long i;
+ const T *p;
+ T *q;
for (int j = 0; j < this->Planes; ++j)
{
p = src[j] + s_start;
@@ -372,13 +372,13 @@ class DiScaleTemplate
const unsigned long x_feed = Columns;
const unsigned long y_feed = OFstatic_cast(unsigned long, Rows - this->Src_Y) * OFstatic_cast(unsigned long, Columns);
const T *sp;
- register Uint16 x;
- register Uint16 y;
- register Uint16 dx;
- register Uint16 dy;
- register const T *p;
- register T *q;
- register T value;
+ Uint16 x;
+ Uint16 y;
+ Uint16 dx;
+ Uint16 dy;
+ const T *p;
+ T *q;
+ T value;
for (int j = 0; j < this->Planes; ++j)
{
sp = src[j] + OFstatic_cast(unsigned long, Top) * OFstatic_cast(unsigned long, Columns) + Left;
@@ -416,10 +416,10 @@ class DiScaleTemplate
const unsigned int x_divisor = this->Src_X / this->Dest_X;
const unsigned long x_feed = OFstatic_cast(unsigned long, this->Src_Y / this->Dest_Y) * OFstatic_cast(unsigned long, Columns) - this->Src_X;
const unsigned long y_feed = OFstatic_cast(unsigned long, Rows - this->Src_Y) * OFstatic_cast(unsigned long, Columns);
- register Uint16 x;
- register Uint16 y;
- register const T *p;
- register T *q;
+ Uint16 x;
+ Uint16 y;
+ const T *p;
+ T *q;
for (int j = 0; j < this->Planes; ++j)
{
p = src[j] + OFstatic_cast(unsigned long, Top) * OFstatic_cast(unsigned long, Columns) + Left;
@@ -464,8 +464,8 @@ class DiScaleTemplate
if ((x_step != NULL) && (y_step != NULL) && (x_fact != NULL) && (y_fact != NULL))
{
- register Uint16 x;
- register Uint16 y;
+ Uint16 x;
+ Uint16 y;
if (this->Dest_X < this->Src_X)
setScaleValues(x_step, this->Dest_X, this->Src_X);
else if (this->Dest_X > this->Src_X)
@@ -485,11 +485,11 @@ class DiScaleTemplate
OFBitmanipTemplate<Uint16>::setMem(y_step, 1, ymin); // initialize with default values
y_step[ymin - 1] += Rows - this->Src_Y; // skip to next frame
const T *sp;
- register Uint16 dx;
- register Uint16 dy;
- register const T *p;
- register T *q;
- register T value;
+ Uint16 dx;
+ Uint16 dy;
+ const T *p;
+ T *q;
+ T value;
for (int j = 0; j < this->Planes; ++j)
{
sp = src[j] + OFstatic_cast(unsigned long, Top) * OFstatic_cast(unsigned long, Columns) + Left;
@@ -542,10 +542,10 @@ class DiScaleTemplate
* various bit depths, multi-frame and multi-plane/color images)
*/
- register Uint16 x;
- register Uint16 y;
- register const T *p;
- register T *q;
+ Uint16 x;
+ Uint16 y;
+ const T *p;
+ T *q;
const T *sp = NULL; // initialization avoids compiler warning
const T *fp;
T *sq;
@@ -570,9 +570,9 @@ class DiScaleTemplate
{
for (x = 0; x < this->Src_X; ++x)
xvalue[x] = HALFSCALE_FACTOR;
- register unsigned long yfill = SCALE_FACTOR;
- register unsigned long yleft = syscale;
- register int yneed = 1;
+ unsigned long yfill = SCALE_FACTOR;
+ unsigned long yleft = syscale;
+ int yneed = 1;
int ysrc = 0;
for (y = 0; y < this->Dest_Y; ++y)
{
@@ -606,7 +606,7 @@ class DiScaleTemplate
++ysrc;
yneed = 0;
}
- register signed long v;
+ signed long v;
for (x = 0, p = sp, q = xtemp; x < this->Src_X; ++x)
{
v = xvalue[x] + yfill * OFstatic_cast(signed long, *(p++));
@@ -630,10 +630,10 @@ class DiScaleTemplate
}
else
{
- register signed long v = HALFSCALE_FACTOR;
- register unsigned long xfill = SCALE_FACTOR;
- register unsigned long xleft;
- register int xneed = 0;
+ signed long v = HALFSCALE_FACTOR;
+ unsigned long xfill = SCALE_FACTOR;
+ unsigned long xleft;
+ int xneed = 0;
q = sq;
for (x = 0, p = xtemp; x < this->Src_X; ++x, ++p)
{
@@ -704,12 +704,12 @@ class DiScaleTemplate
double x_part, y_part;
double l_factor, r_factor;
double t_factor, b_factor;
- register int xi;
- register int yi;
- register Uint16 x;
- register Uint16 y;
- register const T *p;
- register T *q;
+ int xi;
+ int yi;
+ Uint16 x;
+ Uint16 y;
+ const T *p;
+ T *q;
/*
* based on scaling algorithm from "c't - Magazin fuer Computertechnik" (c't 11/94)
@@ -828,12 +828,12 @@ class DiScaleTemplate
double value, sum;
double l_factor, r_factor;
double t_factor, b_factor;
- register int xi;
- register int yi;
- register Uint16 x;
- register Uint16 y;
- register const T *p;
- register T *q;
+ int xi;
+ int yi;
+ Uint16 x;
+ Uint16 y;
+ const T *p;
+ T *q;
/*
* based on scaling algorithm from "c't - Magazin fuer Computertechnik" (c't 11/94)
@@ -936,11 +936,11 @@ class DiScaleTemplate
const double y_factor = OFstatic_cast(double, this->Src_Y) / OFstatic_cast(double, this->Dest_Y);
const unsigned long f_size = OFstatic_cast(unsigned long, Rows) * OFstatic_cast(unsigned long, Columns);
const unsigned long l_offset = OFstatic_cast(unsigned long, this->Src_Y - 1) * OFstatic_cast(unsigned long, this->Dest_X);
- register Uint16 x;
- register Uint16 y;
- register T *pD;
- register T *pCurrTemp;
- register const T *pCurrSrc;
+ Uint16 x;
+ Uint16 y;
+ T *pD;
+ T *pCurrTemp;
+ const T *pCurrSrc;
Uint16 nSrcIndex;
double dOff;
T *pT;
@@ -1066,11 +1066,11 @@ class DiScaleTemplate
const Uint16 yDelta = OFstatic_cast(Uint16, 1 / y_factor);
const unsigned long f_size = OFstatic_cast(unsigned long, Rows) * OFstatic_cast(unsigned long, Columns);
const unsigned long l_offset = OFstatic_cast(unsigned long, this->Src_Y - 1) * OFstatic_cast(unsigned long, this->Dest_X);
- register Uint16 x;
- register Uint16 y;
- register T *pD;
- register T *pCurrTemp;
- register const T *pCurrSrc;
+ Uint16 x;
+ Uint16 y;
+ T *pD;
+ T *pCurrTemp;
+ const T *pCurrSrc;
Uint16 nSrcIndex;
double dOff;
T *pT;
diff --git a/dcmimgle/include/dcmtk/dcmimgle/displint.h b/dcmimgle/include/dcmtk/dcmimgle/displint.h
index 2b2aba1..1888e3c 100644
--- a/dcmimgle/include/dcmtk/dcmimgle/displint.h
+++ b/dcmimgle/include/dcmtk/dcmimgle/displint.h
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 1996-2010, OFFIS e.V.
+ * Copyright (C) 1996-2016, OFFIS e.V.
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation were developed by
@@ -76,7 +76,7 @@ class DiCubicSpline
T3_ *u = new T3_[n]; // temporary vector
if (u != NULL)
{
- register unsigned int i;
+ unsigned int i;
T3_ p, qn, sig, un;
if (yp1 > 0.99e30) // ignore value for first derivative at point 1
y2[0] = u[0] = 0.0;
@@ -145,9 +145,9 @@ class DiCubicSpline
{
if ((xa != NULL) && (ya != NULL) && (y2a != NULL) && (na > 0) && (x != NULL) && (y != NULL) && (n > 0))
{
- register unsigned int k, i;
- register unsigned int klo = 0;
- register unsigned int khi = na - 1;
+ unsigned int k, i;
+ unsigned int klo = 0;
+ unsigned int khi = na - 1;
T3_ h, b, a;
for (i = 0; i < n; ++i)
{
diff --git a/dcmimgle/include/dcmtk/dcmimgle/diutils.h b/dcmimgle/include/dcmtk/dcmimgle/diutils.h
index 598fdb1..4692eee 100644
--- a/dcmimgle/include/dcmtk/dcmimgle/diutils.h
+++ b/dcmimgle/include/dcmtk/dcmimgle/diutils.h
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 1996-2014, OFFIS e.V.
+ * Copyright (C) 1996-2016, OFFIS e.V.
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation were developed by
@@ -393,7 +393,7 @@ class DCMTK_DCMIMGLE_EXPORT DicomImageClass
{
if (tb_value > 0)
tb_value -= tb_pos;
- register unsigned int tb_bits = 0;
+ unsigned int tb_bits = 0;
while (tb_value > 0)
{
++tb_bits;
diff --git a/dcmimgle/libsrc/dibaslut.cc b/dcmimgle/libsrc/dibaslut.cc
index f77ad28..415ed96 100644
--- a/dcmimgle/libsrc/dibaslut.cc
+++ b/dcmimgle/libsrc/dibaslut.cc
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 1996-2010, OFFIS e.V.
+ * Copyright (C) 1996-2016, OFFIS e.V.
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation were developed by
@@ -87,11 +87,11 @@ int DiBaseLUT::compare(const DiBaseLUT *lut)
result = 2; // descriptor differs (2)
if ((Count == lut->getCount()) && (FirstEntry == lut->getFirstEntry()) && (Bits == lut->getBits()))
{ // special case: if Count == 0 LUT data is equal
- register Uint32 i = Count; // ... but normally not Valid !
+ Uint32 i = Count; // ... but normally not Valid !
if ((MinValue == lut->getMinValue()) && (MaxValue == lut->getMaxValue()))
{ // additional check for better performance
- register const Uint16 *p = Data;
- register const Uint16 *q = lut->getData();
+ const Uint16 *p = Data;
+ const Uint16 *q = lut->getData();
while ((i != 0) && (*(p++) == *(q++)))
--i;
}
diff --git a/dcmimgle/libsrc/dicielut.cc b/dcmimgle/libsrc/dicielut.cc
index b6abc94..243b359 100644
--- a/dcmimgle/libsrc/dicielut.cc
+++ b/dcmimgle/libsrc/dicielut.cc
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 1999-2010, OFFIS e.V.
+ * Copyright (C) 1999-2016, OFFIS e.V.
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation were developed by
@@ -91,9 +91,9 @@ int DiCIELABLUT::createLUT(const Uint16 *ddl_tab,
double *cielab = new double[cin_ctn];
if (cielab != NULL)
{
- register unsigned long i;
- register double llin = 0;
- register double cub = 0;
+ unsigned long i;
+ double llin = 0;
+ double cub = 0;
const double amb = getAmbientLightValue();
/* check whether Lmin or Lmax is set */
const double min = (lum_min < 0) ? val_min + amb : lum_min /*includes 'amb'*/;
@@ -113,12 +113,12 @@ int DiCIELABLUT::createLUT(const Uint16 *ddl_tab,
DataBuffer = new Uint16[Count];
if (DataBuffer != NULL) // create look-up table
{
- register Uint16 *q = DataBuffer;
- register unsigned long j = 0;
+ Uint16 *q = DataBuffer;
+ unsigned long j = 0;
/* check whether to apply the inverse transformation */
if (inverse)
{
- register double v;
+ double v;
const double factor = OFstatic_cast(double, ddl_cnt - 1) / OFstatic_cast(double, Count - 1);
/* convert from DDL */
for (i = 0; i < Count; ++i)
@@ -153,7 +153,7 @@ int DiCIELABLUT::createLUT(const Uint16 *ddl_tab,
ddl_max = j;
}
j = ddl_min;
- register const double *r = cielab;
+ const double *r = cielab;
/* convert to DDL */
for (i = Count; i != 0; --i, ++r)
{
diff --git a/dcmimgle/libsrc/didispfn.cc b/dcmimgle/libsrc/didispfn.cc
index 5d0d311..494fa23 100644
--- a/dcmimgle/libsrc/didispfn.cc
+++ b/dcmimgle/libsrc/didispfn.cc
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 1999-2010, OFFIS e.V.
+ * Copyright (C) 1999-2016, OFFIS e.V.
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation were developed by
@@ -102,7 +102,7 @@ DiDisplayFunction::DiDisplayFunction(const double *val_tab, // UNTES
LODValue = new double[ValueCount];
if ((DDLValue != NULL) && (LODValue != NULL))
{
- register unsigned int i;
+ unsigned int i;
for (i = 0; i <= MaxDDLValue; ++i)
{
DDLValue[i] = OFstatic_cast(Uint16, i); // set DDL values
@@ -170,7 +170,7 @@ DiDisplayFunction::DiDisplayFunction(const double val_min,
LODValue = new double[ValueCount];
if ((DDLValue != NULL) && (LODValue != NULL))
{
- register Uint16 i;
+ Uint16 i;
const double min = ((DeviceType == EDT_Printer) || (DeviceType == EDT_Scanner)) ? val_max : val_min;
const double max = ((DeviceType == EDT_Printer) || (DeviceType == EDT_Scanner)) ? val_min : val_max;
const double val = (max - min) / OFstatic_cast(double, MaxDDLValue);
@@ -197,7 +197,7 @@ DiDisplayFunction::~DiDisplayFunction()
{
delete[] DDLValue;
delete[] LODValue;
- register int i;
+ int i;
for (i = 0; i < MAX_NUMBER_OF_TABLES; ++i)
delete LookupTable[i];
}
@@ -218,7 +218,7 @@ Uint16 DiDisplayFunction::getDDLforValue(const double value) const
{
if ((LODValue != NULL) && (ValueCount > 0))
{
- register unsigned long j = 0;
+ unsigned long j = 0;
/* search for closest index, assuming monotony */
if ((DeviceType == EDT_Printer) || (DeviceType == EDT_Scanner))
{
@@ -269,7 +269,7 @@ int DiDisplayFunction::deleteLookupTable(const int bits)
if (bits == 0)
{
/* delete all LUTs */
- register int i;
+ int i;
for (i = 0; i < MAX_NUMBER_OF_TABLES; ++i)
{
delete LookupTable[i];
@@ -475,7 +475,7 @@ int DiDisplayFunction::createSortedTable(const Uint16 *ddl_tab,
if ((DDLValue != NULL) && (LODValue != NULL) && (sort_tab != NULL))
{
OFBitmanipTemplate<Sint32>::setMem(sort_tab, -1, count); // initialize array
- register unsigned long i;
+ unsigned long i;
for (i = 0; i < ValueCount; ++i)
{
if (ddl_tab[i] <= MaxDDLValue) // calculate sort table
@@ -543,7 +543,7 @@ int DiDisplayFunction::interpolateValues()
if ((DDLValue != NULL) && (LODValue != NULL))
{
/* set x values linearly */
- register unsigned int i;
+ unsigned int i;
for (i = 0; i <= MaxDDLValue; ++i)
DDLValue[i] = OFstatic_cast(Uint16, i);
/* compute new y values */
@@ -569,7 +569,7 @@ int DiDisplayFunction::interpolateValues()
if ((DDLValue != NULL) && (LODValue != NULL))
{
/* set x values linearly */
- register unsigned int i;
+ unsigned int i;
for (i = 0; i <= MaxDDLValue; ++i)
DDLValue[i] = OFstatic_cast(Uint16, i);
/* compute new y values */
@@ -594,7 +594,7 @@ int DiDisplayFunction::calculateMinMax()
{
MinValue = LODValue[0];
MaxValue = LODValue[0];
- register unsigned long i;
+ unsigned long i;
for (i = 1; i < ValueCount; ++i)
{
if (LODValue[i] < MinValue)
@@ -645,7 +645,7 @@ double *DiDisplayFunction::convertODtoLumTable(const double *od_tab,
if (lum_tab != NULL)
{
/* compute luminance values from optical density */
- register unsigned int i;
+ unsigned int i;
if (useAmb)
{
for (i = 0; i < count; ++i)
diff --git a/dcmimgle/libsrc/digsdfn.cc b/dcmimgle/libsrc/digsdfn.cc
index d6de9cc..3e2a7cc 100644
--- a/dcmimgle/libsrc/digsdfn.cc
+++ b/dcmimgle/libsrc/digsdfn.cc
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 1999-2014, OFFIS e.V.
+ * Copyright (C) 1999-2016, OFFIS e.V.
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation were developed by
@@ -337,11 +337,11 @@ int DiGSDFunction::calculateGSDF()
const double h = -3.1978977e-3;
const double k = 1.2992634e-4;
const double m = 1.3635334e-3;
- register unsigned int i;
- register double ln;
- register double ln2;
- register double ln3;
- register double ln4;
+ unsigned int i;
+ double ln;
+ double ln2;
+ double ln3;
+ double ln4;
for (i = 0; i < GSDFCount; ++i)
{
ln = log(OFstatic_cast(double, i + 1));
@@ -365,8 +365,8 @@ int DiGSDFunction::calculateGSDFSpline()
unsigned int *jidx = new unsigned int[GSDFCount];
if ((GSDFSpline != NULL) && (jidx != NULL))
{
- register unsigned int i;
- register unsigned int *p = jidx;
+ unsigned int i;
+ unsigned int *p = jidx;
for (i = 1; i <= GSDFCount; ++i)
*(p++) = i;
status = DiCubicSpline<unsigned int, double>::Function(jidx, GSDFValue, GSDFCount, GSDFSpline);
@@ -421,7 +421,7 @@ double DiGSDFunction::getJNDIndex(const double lum)
const double i = -0.017046845;
double lg10[8];
lg10[0] = log10(lum);
- register unsigned int j;
+ unsigned int j;
for (j = 0; j < 7; ++j) // reduce number of multiplications
lg10[j + 1] = lg10[j] * lg10[0];
return a + b*lg10[0] + c*lg10[1] + d*lg10[2] + e*lg10[3] + f*lg10[4] + g*lg10[5] + h*lg10[6] + i*lg10[7];
diff --git a/dcmimgle/libsrc/digsdlut.cc b/dcmimgle/libsrc/digsdlut.cc
index b823dc4..60afd58 100644
--- a/dcmimgle/libsrc/digsdlut.cc
+++ b/dcmimgle/libsrc/digsdlut.cc
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 1999-2010, OFFIS e.V.
+ * Copyright (C) 1999-2016, OFFIS e.V.
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation were developed by
@@ -102,9 +102,9 @@ int DiGSDFLUT::createLUT(const Uint16 *ddl_tab,
if (jidx != NULL)
{
const double dist = (jnd_max - jnd_min) / (gin_ctn - 1); // distance between two entries
- register unsigned long i;
- register double *s = jidx;
- register double value = jnd_min; // first value is fixed !
+ unsigned long i;
+ double *s = jidx;
+ double value = jnd_min; // first value is fixed !
for (i = gin_ctn; i > 1; --i) // initialize scaled JND index array
{
*(s++) = value;
@@ -127,12 +127,12 @@ int DiGSDFLUT::createLUT(const Uint16 *ddl_tab,
if (DataBuffer != NULL)
{
const double amb = getAmbientLightValue();
- register Uint16 *q = DataBuffer;
- register unsigned long j = 0;
+ Uint16 *q = DataBuffer;
+ unsigned long j = 0;
/* check whether to apply the inverse transformation */
if (inverse)
{
- register double v;
+ double v;
const double factor = OFstatic_cast(double, ddl_cnt - 1) / OFstatic_cast(double, Count - 1);
/* convert DDL to P-Value */
for (i = 0; i < Count; ++i)
@@ -167,7 +167,7 @@ int DiGSDFLUT::createLUT(const Uint16 *ddl_tab,
ddl_max = j;
}
j = ddl_min;
- register const double *r = gsdf;
+ const double *r = gsdf;
/* convert P-Value to DDL */
for (i = Count; i != 0; --i, ++r)
{
diff --git a/dcmimgle/libsrc/diimage.cc b/dcmimgle/libsrc/diimage.cc
index aab805f..aecc9f4 100644
--- a/dcmimgle/libsrc/diimage.cc
+++ b/dcmimgle/libsrc/diimage.cc
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 1996-2015, OFFIS e.V.
+ * Copyright (C) 1996-2016, OFFIS e.V.
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation were developed by
@@ -147,12 +147,37 @@ DiImage::DiImage(const DiDocument *docu,
}
if (!(Document->getFlags() & CIF_UsePresentationState))
{
+ /* check whether pixels are non-square (start with pixel spacing attribute) */
hasPixelSpacing = (Document->getValue(DCM_PixelSpacing, PixelHeight, 0) > 0);
if (hasPixelSpacing)
{
if (Document->getValue(DCM_PixelSpacing, PixelWidth, 1) < 2)
DCMIMGLE_WARN("missing second value for 'PixelSpacing' ... assuming 'Width' = " << PixelWidth);
} else {
+ /* then check for functional groups sequence */
+ DcmSequenceOfItems *seq = NULL;
+ if (docu->getSequence(DCM_SharedFunctionalGroupsSequence, seq))
+ {
+ DcmItem *item = seq->getItem(0);
+ if ((item != NULL) && docu->getSequence(DCM_PixelMeasuresSequence, seq, item))
+ {
+ item = seq->getItem(0);
+ if (item != NULL)
+ {
+ hasPixelSpacing = (docu->getValue(DCM_PixelSpacing, PixelHeight, 0, item) > 0);
+ if (hasPixelSpacing)
+ {
+ DCMIMGLE_DEBUG("found 'PixelSpacing' in 'SharedFunctionalGroupsSequence'");
+ if (docu->getValue(DCM_PixelSpacing, PixelWidth, 1, item) < 2)
+ DCMIMGLE_WARN("missing second value for 'PixelSpacing' ... assuming 'Width' = " << PixelWidth);
+ }
+ }
+ }
+ }
+ }
+ /* if there is no pixel spacing, check for various other attributes */
+ if (!hasPixelSpacing)
+ {
hasImagerPixelSpacing = (Document->getValue(DCM_ImagerPixelSpacing, PixelHeight, 0) > 0);
if (hasImagerPixelSpacing)
{
diff --git a/dcmimgle/libsrc/diluptab.cc b/dcmimgle/libsrc/diluptab.cc
index b957eb7..d6ded5c 100644
--- a/dcmimgle/libsrc/diluptab.cc
+++ b/dcmimgle/libsrc/diluptab.cc
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 1996-2011, OFFIS e.V.
+ * Copyright (C) 1996-2016, OFFIS e.V.
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation were developed by
@@ -183,7 +183,7 @@ void DiLookupTable::checkTable(unsigned long count,
{
if (count > 0) // valid LUT
{
- register unsigned long i;
+ unsigned long i;
if (count > MAX_TABLE_ENTRY_COUNT) // cut LUT length to maximum
count = MAX_TABLE_ENTRY_COUNT;
if (count != Count) // length of LUT differs from number of LUT entries
@@ -195,8 +195,8 @@ void DiLookupTable::checkTable(unsigned long count,
DataBuffer = new Uint16[Count]; // create new LUT
if ((DataBuffer != NULL) && (Data != NULL))
{
- register const Uint8 *p = OFreinterpret_cast(const Uint8 *, Data);
- register Uint16 *q = DataBuffer;
+ const Uint8 *p = OFreinterpret_cast(const Uint8 *, Data);
+ Uint16 *q = DataBuffer;
if (gLocalByteOrder == EBO_BigEndian) // local machine has big endian byte ordering
{
DCMIMGLE_DEBUG("local machine has big endian byte ordering ... swapping 8 bit LUT entries");
@@ -218,8 +218,8 @@ void DiLookupTable::checkTable(unsigned long count,
}
}
MinValue = OFstatic_cast(Uint16, DicomImageClass::maxval(MAX_TABLE_ENTRY_SIZE)); // set minimum to maximum value
- register const Uint16 *p = Data;
- register Uint16 value;
+ const Uint16 *p = Data;
+ Uint16 value;
if (DataBuffer != NULL) // LUT entries have been copied 8 -> 16 bits
{
for (i = Count; i != 0; --i)
@@ -258,7 +258,7 @@ void DiLookupTable::checkTable(unsigned long count,
if (DataBuffer != NULL)
{
p = Data;
- register Uint16 *q = DataBuffer;
+ Uint16 *q = DataBuffer;
for (i = Count; i != 0; --i)
*(q++) = *(p++) & mask;
}
@@ -323,7 +323,7 @@ int DiLookupTable::invertTable(const int flag)
int result = 0;
if ((Data != NULL) && (Count > 0) && (flag & 0x3))
{
- register Uint32 i;
+ Uint32 i;
if (flag & 0x2)
{
if (OriginalData != NULL)
@@ -332,16 +332,16 @@ int DiLookupTable::invertTable(const int flag)
{
if (Bits <= 8)
{
- register const Uint8 *p = OFconst_cast(const Uint8 *, OFstatic_cast(Uint8 *, OriginalData));
- register Uint8 *q = OFstatic_cast(Uint8 *, OriginalData);
+ const Uint8 *p = OFconst_cast(const Uint8 *, OFstatic_cast(Uint8 *, OriginalData));
+ Uint8 *q = OFstatic_cast(Uint8 *, OriginalData);
const Uint8 max = OFstatic_cast(Uint8, DicomImageClass::maxval(Bits));
for (i = Count; i != 0; --i)
*(q++) = max - *(p++);
result |= 0x2;
}
} else {
- register const Uint16 *p = OFconst_cast(const Uint16 *, OFstatic_cast(Uint16 *, OriginalData));
- register Uint16 *q = OFstatic_cast(Uint16 *, OriginalData);
+ const Uint16 *p = OFconst_cast(const Uint16 *, OFstatic_cast(Uint16 *, OriginalData));
+ Uint16 *q = OFstatic_cast(Uint16 *, OriginalData);
const Uint16 max = OFstatic_cast(Uint16, DicomImageClass::maxval(Bits));
for (i = Count; i != 0; --i)
*(q++) = max - *(p++);
@@ -353,8 +353,8 @@ int DiLookupTable::invertTable(const int flag)
{
if (DataBuffer != NULL)
{
- register const Uint16 *p = OFconst_cast(const Uint16 *, DataBuffer);
- register Uint16 *q = DataBuffer;
+ const Uint16 *p = OFconst_cast(const Uint16 *, DataBuffer);
+ Uint16 *q = DataBuffer;
const Uint16 max = OFstatic_cast(Uint16, DicomImageClass::maxval(Bits));
for (i = Count; i != 0; --i)
*(q++) = max - *(p++);
@@ -365,8 +365,8 @@ int DiLookupTable::invertTable(const int flag)
DataBuffer = new Uint16[Count];
if (DataBuffer != NULL)
{
- register const Uint16 *p = Data;
- register Uint16 *q = DataBuffer;
+ const Uint16 *p = Data;
+ Uint16 *q = DataBuffer;
const Uint16 max = OFstatic_cast(Uint16, DicomImageClass::maxval(Bits));
for (i = Count; i != 0; --i)
*(q++) = max - *(p++);
@@ -385,7 +385,7 @@ int DiLookupTable::mirrorTable(const int flag)
int result = 0;
if ((Data != NULL) && (Count > 0) && (flag & 0x3))
{
- register Uint32 i;
+ Uint32 i;
if (flag & 0x2)
{
if (OriginalData != NULL)
@@ -394,9 +394,9 @@ int DiLookupTable::mirrorTable(const int flag)
{
if (Bits <= 8)
{
- register Uint8 *p = OFstatic_cast(Uint8 *, OriginalData) + (Count - 1);
- register Uint8 *q = OFstatic_cast(Uint8 *, OriginalData);
- register Uint8 val;
+ Uint8 *p = OFstatic_cast(Uint8 *, OriginalData) + (Count - 1);
+ Uint8 *q = OFstatic_cast(Uint8 *, OriginalData);
+ Uint8 val;
const unsigned long mid = Count / 2;
for (i = mid; i != 0; --i)
{
@@ -407,9 +407,9 @@ int DiLookupTable::mirrorTable(const int flag)
result |= 0x2;
}
} else {
- register Uint16 *p = OFstatic_cast(Uint16 *, OriginalData) + (Count - 1);
- register Uint16 *q = OFstatic_cast(Uint16 *, OriginalData);
- register Uint16 val;
+ Uint16 *p = OFstatic_cast(Uint16 *, OriginalData) + (Count - 1);
+ Uint16 *q = OFstatic_cast(Uint16 *, OriginalData);
+ Uint16 val;
const unsigned long mid = Count / 2;
for (i = mid; i != 0; --i)
{
@@ -425,9 +425,9 @@ int DiLookupTable::mirrorTable(const int flag)
{
if (DataBuffer != NULL)
{
- register Uint16 *p = DataBuffer + (Count - 1);
- register Uint16 *q = DataBuffer;
- register Uint16 val;
+ Uint16 *p = DataBuffer + (Count - 1);
+ Uint16 *q = DataBuffer;
+ Uint16 val;
const unsigned long mid = Count / 2;
for (i = mid; i != 0; --i)
{
@@ -442,9 +442,9 @@ int DiLookupTable::mirrorTable(const int flag)
DataBuffer = new Uint16[Count];
if (DataBuffer != NULL)
{
- register Uint16 *p = OFconst_cast(Uint16 *, Data) + (Count - 1);
- register Uint16 *q = DataBuffer;
- register Uint16 val;
+ Uint16 *p = OFconst_cast(Uint16 *, Data) + (Count - 1);
+ Uint16 *q = DataBuffer;
+ Uint16 val;
const unsigned long mid = Count / 2;
for (i = mid; i != 0; --i)
{
@@ -474,7 +474,7 @@ DiLookupTable *DiLookupTable::createInverseLUT() const
if ((data != NULL) && (valid != NULL))
{
OFBitmanipTemplate<Uint8>::zeroMem(valid, count); // initialize array
- register Uint32 i;
+ Uint32 i;
for (i = 0; i < Count; ++i) // 'copy' values to new array
{
if (!valid[Data[i]])
@@ -489,7 +489,7 @@ DiLookupTable *DiLookupTable::createInverseLUT() const
last = i;
else
{
- register Uint32 j = i + 1;
+ Uint32 j = i + 1;
while ((j < count) && !valid[j]) // find next valid value
++j;
if (valid[last]) // check for starting conditions
diff --git a/dcmimgle/libsrc/dimoimg.cc b/dcmimgle/libsrc/dimoimg.cc
index 342de79..bfb8e1f 100644
--- a/dcmimgle/libsrc/dimoimg.cc
+++ b/dcmimgle/libsrc/dimoimg.cc
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 1996-2013, OFFIS e.V.
+ * Copyright (C) 1996-2016 OFFIS e.V.
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation were developed by
@@ -1674,7 +1674,7 @@ unsigned long DiMonoImage::createDIB(void *&data,
if ((OutputData != NULL) && (OutputData->getData() != NULL))
{
const signed long nextRow = (upsideDown) ? -2 * OFstatic_cast(signed long, Columns) : 0;
- register const Uint8 *p = OFstatic_cast(const Uint8 *, OutputData->getData()) + ((upsideDown) ?
+ const Uint8 *p = OFstatic_cast(const Uint8 *, OutputData->getData()) + ((upsideDown) ?
OFstatic_cast(unsigned long, Rows - 1) * OFstatic_cast(unsigned long, Columns) : 0);
if (bits == 8) // -- for idx color model (byte)
{
@@ -1689,9 +1689,9 @@ unsigned long DiMonoImage::createDIB(void *&data,
data = new Uint8[count]; // allocated memory buffer
if (data != NULL)
{
- register Uint8 *q = OFstatic_cast(Uint8 *, data);
- register Uint16 x;
- register Uint16 y;
+ Uint8 *q = OFstatic_cast(Uint8 *, data);
+ Uint16 x;
+ Uint16 y;
for (y = Rows; y != 0; --y)
{
for (x = Columns; x != 0; --x)
@@ -1720,11 +1720,11 @@ unsigned long DiMonoImage::createDIB(void *&data,
data = new Uint8[count]; // allocated memory buffer
if (data != NULL)
{
- register Uint8 *q = OFstatic_cast(Uint8 *, data);
- register Uint8 value;
- register Uint16 x;
- register Uint16 y;
- register int j;
+ Uint8 *q = OFstatic_cast(Uint8 *, data);
+ Uint8 value;
+ Uint16 x;
+ Uint16 y;
+ int j;
for (y = Rows; y != 0; --y)
{
for (x = Columns; x != 0; --x)
@@ -1749,10 +1749,10 @@ unsigned long DiMonoImage::createDIB(void *&data,
data = new Uint32[count]; // allocated memory buffer
if (data != NULL)
{
- register Uint32 *q = OFstatic_cast(Uint32 *, data);
- register Uint32 value;
- register Uint16 x;
- register Uint16 y;
+ Uint32 *q = OFstatic_cast(Uint32 *, data);
+ Uint32 value;
+ Uint16 x;
+ Uint16 y;
for (y = Rows; y != 0; --y)
{
for (x = Columns; x != 0; --x)
@@ -1804,10 +1804,10 @@ unsigned long DiMonoImage::createAWTBitmap(void *&data,
data = new Uint32[count];
if (data != NULL)
{
- register const Uint8 *p = OFstatic_cast(const Uint8 *, OutputData->getData());
- register Uint32 *q = OFstatic_cast(Uint32 *, data);
- register Uint32 value;
- register unsigned long i;
+ const Uint8 *p = OFstatic_cast(const Uint8 *, OutputData->getData());
+ Uint32 *q = OFstatic_cast(Uint32 *, data);
+ Uint32 value;
+ unsigned long i;
for (i = count; i != 0; --i)
{
value = *(p++); // store gray value
@@ -1848,11 +1848,11 @@ void *DiMonoImage::createPackedBitmap(const void *buffer,
data = new Uint16[((count + 1) * stored - 1) / 16]; // create new memory buffer
if (data != NULL)
{
- register const Uint16 *p = OFstatic_cast(const Uint16 *, buffer);
- register Uint16 *q = data;
- register unsigned long i;
- register Uint16 value1;
- register Uint16 value2;
+ const Uint16 *p = OFstatic_cast(const Uint16 *, buffer);
+ Uint16 *q = data;
+ unsigned long i;
+ Uint16 value1;
+ Uint16 value2;
for (i = 0; i < count - 3; i += 4) // make 3 items out of 4
{
value1 = *(p++);
diff --git a/dcmimgle/libsrc/diovdat.cc b/dcmimgle/libsrc/diovdat.cc
index 89aacfa..da760c0 100644
--- a/dcmimgle/libsrc/diovdat.cc
+++ b/dcmimgle/libsrc/diovdat.cc
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 1996-2010, OFFIS e.V.
+ * Copyright (C) 1996-2016, OFFIS e.V.
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation were developed by
@@ -57,7 +57,7 @@ DiOverlayData::~DiOverlayData()
{
if (Planes != NULL)
{
- register unsigned int i;
+ unsigned int i;
for (i = 0; i < ArrayEntries; ++i)
delete Planes[i];
}
diff --git a/dcmimgle/libsrc/diovlay.cc b/dcmimgle/libsrc/diovlay.cc
index e48f19f..1bffc04 100644
--- a/dcmimgle/libsrc/diovlay.cc
+++ b/dcmimgle/libsrc/diovlay.cc
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 1996-2010, OFFIS e.V.
+ * Copyright (C) 1996-2016, OFFIS e.V.
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation were developed by
@@ -59,7 +59,7 @@ DiOverlay::DiOverlay(const DiDocument *docu,
Data = new DiOverlayData(MaxOverlayCount); // can't determine number of overlays :-(
if ((docu != NULL) && (Data != NULL) && (Data->Planes != NULL))
{
- register unsigned int i;
+ unsigned int i;
for (i = 0; i < MaxOverlayCount; ++i)
{
Data->Planes[Data->Count] = new DiOverlayPlane(docu, convertToGroupNumber(i), alloc, stored, high);
@@ -95,7 +95,7 @@ DiOverlay::DiOverlay(const DiOverlay *overlay,
Uint16 *temp = Init(overlay);
if (temp != NULL)
{
- register unsigned int i;
+ unsigned int i;
for (i = 0; i < Data->ArrayEntries; ++i)
{
if (Data->Planes[i] != NULL)
@@ -131,7 +131,7 @@ DiOverlay::DiOverlay(const DiOverlay *overlay,
flip.flipData(OFconst_cast(const Uint16 **, &temp), &(Data->DataBuffer), horz, vert);
if (temp != overlay->Data->DataBuffer)
delete[] temp;
- register unsigned int i;
+ unsigned int i;
for (i = 0; i < Data->ArrayEntries; ++i)
{
if (Data->Planes[i] != NULL)
@@ -165,7 +165,7 @@ DiOverlay::DiOverlay(const DiOverlay *overlay,
rotate.rotateData(OFconst_cast(const Uint16 **, &temp), &(Data->DataBuffer), degree);
if (temp != overlay->Data->DataBuffer)
delete[] temp;
- register unsigned int i;
+ unsigned int i;
for (i = 0; i < Data->ArrayEntries; ++i)
{
if (Data->Planes[i] != NULL)
@@ -201,7 +201,7 @@ Uint16 *DiOverlay::Init(const DiOverlay *overlay)
OFstatic_cast(unsigned long, overlay->Height) * overlay->Frames;
if ((Data != NULL) && (Data->Planes != NULL) && (count > 0))
{
- register unsigned int i;
+ unsigned int i;
Data->DataBuffer = new Uint16[OFstatic_cast(unsigned long, Width) * OFstatic_cast(unsigned long, Height) * Frames];
if (Data->DataBuffer != NULL)
{
@@ -249,7 +249,7 @@ int DiOverlay::convertToPlaneNumber(unsigned int &plane,
return 2; // plane alreay exists
return 1; // ... is new
} else {
- register unsigned int i;
+ unsigned int i;
for (i = 0; i < Data->Count; ++i)
{
if ((Data->Planes[i] != NULL) && (Data->Planes[i]->getGroupNumber() == plane))
@@ -340,7 +340,7 @@ int DiOverlay::showAllPlanes()
{
if ((Data != NULL) && (Data->Planes != NULL))
{
- register unsigned int i;
+ unsigned int i;
for (i = 0; i < Data->ArrayEntries; ++i)
{
if (Data->Planes[i] != NULL)
@@ -360,7 +360,7 @@ int DiOverlay::showAllPlanes(const double fore,
{
if ((Data != NULL) && (Data->Planes != NULL))
{
- register unsigned int i;
+ unsigned int i;
for (i = 0; i < Data->ArrayEntries; ++i)
{
if ((Data->Planes[i] != NULL))
@@ -391,7 +391,7 @@ int DiOverlay::hideAllPlanes()
{
if ((Data != NULL) && (Data->Planes != NULL))
{
- register unsigned int i;
+ unsigned int i;
for (i = 0; i < Data->ArrayEntries; ++i)
{
if (Data->Planes[i] != NULL)
@@ -456,7 +456,7 @@ int DiOverlay::hasEmbeddedData() const
{
if ((Data != NULL) && (Data->Planes != NULL))
{
- register unsigned int i;
+ unsigned int i;
for (i = 0; i < Data->ArrayEntries; ++i)
{
if ((Data->Planes[i] != NULL) && (Data->Planes[i]->isEmbedded()))
diff --git a/dcmimgle/libsrc/diovlimg.cc b/dcmimgle/libsrc/diovlimg.cc
index 8c5d7a6..9f95de7 100644
--- a/dcmimgle/libsrc/diovlimg.cc
+++ b/dcmimgle/libsrc/diovlimg.cc
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 1996-2010, OFFIS e.V.
+ * Copyright (C) 1996-2016, OFFIS e.V.
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation were developed by
@@ -42,8 +42,8 @@ DiOverlayImage::DiOverlayImage(const DiDocument *docu,
if (Overlays[0] != NULL)
{
BitsPerSample = 1;
- register unsigned int i;
- register DiOverlayPlane *plane;
+ unsigned int i;
+ DiOverlayPlane *plane;
for (i = 0; i < Overlays[0]->getCount(); ++i)
{
plane = Overlays[0]->getPlane(i);
diff --git a/dcmimgle/libsrc/diovpln.cc b/dcmimgle/libsrc/diovpln.cc
index 418aaca..c8d8f0a 100644
--- a/dcmimgle/libsrc/diovpln.cc
+++ b/dcmimgle/libsrc/diovpln.cc
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 1996-2011, OFFIS e.V.
+ * Copyright (C) 1996-2016, OFFIS e.V.
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation were developed by
@@ -300,10 +300,10 @@ DiOverlayPlane::DiOverlayPlane(DiOverlayPlane *plane,
{
if (temp != NULL)
{
- register Uint16 x;
- register Uint16 y;
- register Uint16 *q = temp;
- register const Uint16 mask = 1 << bit;
+ Uint16 x;
+ Uint16 y;
+ Uint16 *q = temp;
+ const Uint16 mask = 1 << bit;
const Uint16 skip_x = width - plane->Columns;
const unsigned long skip_f = OFstatic_cast(unsigned long, height - plane->Rows) * OFstatic_cast(unsigned long, width);
for (unsigned long f = 0; f < NumberOfFrames; ++f)
@@ -363,11 +363,11 @@ void *DiOverlayPlane::getData(const unsigned long frame,
if ((fore & mask) != (back & mask))
{
OFBitmanipTemplate<Uint8>::setMem(data, 0x0, count8);
- register Uint16 x;
- register Uint16 y;
- register Uint8 value = 0;
- register Uint8 *q = data;
- register int bit = 0;
+ Uint16 x;
+ Uint16 y;
+ Uint8 value = 0;
+ Uint8 *q = data;
+ int bit = 0;
if (reset(frame + ImageFrameOrigin))
{
for (y = ymin; y < ymax; ++y)
@@ -410,9 +410,9 @@ void *DiOverlayPlane::getData(const unsigned long frame,
OFBitmanipTemplate<Uint8>::setMem(data, back8, count);
if (fore8 != back8) // optimization
{
- register Uint16 x;
- register Uint16 y;
- register Uint8 *q = data;
+ Uint16 x;
+ Uint16 y;
+ Uint8 *q = data;
if (reset(frame + ImageFrameOrigin))
{
for (y = ymin; y < ymax; ++y)
@@ -439,9 +439,9 @@ void *DiOverlayPlane::getData(const unsigned long frame,
OFBitmanipTemplate<Uint16>::setMem(data, back16, count);
if (fore16 != back16) // optimization
{
- register Uint16 x;
- register Uint16 y;
- register Uint16 *q = data;
+ Uint16 x;
+ Uint16 y;
+ Uint16 *q = data;
if (reset(frame + ImageFrameOrigin))
{
for (y = ymin; y < ymax; ++y)
@@ -480,11 +480,11 @@ unsigned long DiOverlayPlane::create6xxx3000Data(Uint8 *&buffer,
if (buffer != NULL)
{
OFBitmanipTemplate<Uint8>::setMem(buffer, 0x0, count8);
- register Uint16 x;
- register Uint16 y;
- register Uint8 value = 0;
- register Uint8 *q = buffer;
- register int bit = 0;
+ Uint16 x;
+ Uint16 y;
+ Uint8 value = 0;
+ Uint8 *q = buffer;
+ int bit = 0;
for (unsigned long f = 0; f < NumberOfFrames; ++f)
{
if (reset(f + ImageFrameOrigin))
diff --git a/dcmiod/include/dcmtk/dcmiod/cielabutil.h b/dcmiod/include/dcmtk/dcmiod/cielabutil.h
index 435723d..781477b 100755
--- a/dcmiod/include/dcmtk/dcmiod/cielabutil.h
+++ b/dcmiod/include/dcmtk/dcmiod/cielabutil.h
@@ -172,7 +172,7 @@ protected:
*/
static double gammaCorrection(double n);
- /** Peform inverse sRGB gamma correction, transforms R' to R
+ /** Perform inverse sRGB gamma correction, transforms R' to R
* @param n The value to invert
* @return The gamma-inverted value
*/
@@ -190,14 +190,14 @@ protected:
*/
static double labfInv(double n);
- /** Get the minimun of two numbers
+ /** Get the minimum of two numbers
* @param a First number
* @param b Second number
* @return The minimum of a, b. a if a and b are equal.
*/
static double min(double a, double b);
- /** Get the minimun of three numbers
+ /** Get the minimum of three numbers
* @param a First number
* @param b Second number
* @param c Third number
diff --git a/dcmiod/include/dcmtk/dcmiod/iodmacro.h b/dcmiod/include/dcmtk/dcmiod/iodmacro.h
index 36be4f3..709c23d 100644
--- a/dcmiod/include/dcmtk/dcmiod/iodmacro.h
+++ b/dcmiod/include/dcmtk/dcmiod/iodmacro.h
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2015, Open Connections GmbH
+ * Copyright (C) 2015-2016, Open Connections GmbH
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation are maintained by
@@ -52,6 +52,12 @@ public:
*/
CodeSequenceMacro(IODComponent* parent = NULL);
+ /** Copy Constructor, performs deep copy
+ * @param rhs The parent of the IOD component (NULL if none or unknown)
+ */
+ CodeSequenceMacro(const CodeSequenceMacro& rhs);
+
+
/** Convenience constructor to set initial values
* @param item The item to be used for data storage. If NULL, the
* class creates an empty data container.
@@ -180,6 +186,136 @@ public:
};
+/** Code with Modifier(s). Represents the combination of a Code Sequence Macro
+ * that is amended by a Modifier Code Sequence with one or more items. The
+ * VM and requirement type of the Modifier Code Sequence can be configured, as
+ * well as the tag of the sequence holding the modifiers (default: Modifier
+ * Code Sequence). Overall, the class reads and write the following structure
+ * from an item:
+ *
+ * Coding Scheme Designator, 1, 1C
+ * Coding Scheme Version, 1, 1C
+ * Code Value, 1, 1C
+ * Code Meaning, 1, 1C
+ * Modifier Code Sequence, VM, requirement type
+ * > Code Sequence Macro
+ *
+ * Note that the Code Sequence Macro does not support Long Code Value and
+ * URN Code Value, so that Coding Scheme Designator and Code Value are
+ * handled as type 1 (and not 1C as denoted now in the standard and above).
+ */
+class DCMTK_DCMIOD_EXPORT CodeWithModifiers : public CodeSequenceMacro
+{
+
+public:
+
+ /** Constructor
+ * @param modifierType Denotes type of Modifier Code Sequence (i.e. 1, 1C,
+ * 2, 2C or 3), default is 3
+ * @param modifierVM Denotes how many items are allowed in the Modifier Code
+ * Sequence
+ * @param modifierSeq Tag of the sequence that holds the modifier codes.
+ * The default is the Modifier Code Sequence.
+ */
+ CodeWithModifiers(const OFString& modifierType = "3",
+ const OFString& modifierVM = "1-n",
+ const DcmTagKey& modifierSeq = DCM_ModifierCodeSequence);
+
+ /** Copy constructor, performs deep copy.
+ * @param rhs The component to be copied from
+ */
+ CodeWithModifiers(const CodeWithModifiers& rhs);
+
+ /** Assignment operator, performs deep copy.
+ * @param rhs The component to be assigned from
+ */
+ CodeWithModifiers& operator=(const CodeWithModifiers& rhs);
+
+ /** Virtual Destructor, frees memory
+ */
+ virtual ~CodeWithModifiers();
+
+ /** Clear all attributes from the data that are handled by this component.
+ * An attribute is considered belonging to the module if there are rules
+ * marked as belonging to this module via the rule's module name.
+ */
+ void clearData();
+
+ /** Resets rules to their original values
+ */
+ virtual void resetRules();
+
+ /** Get rules handled by this module
+ * @return The rules
+ */
+ OFshared_ptr<IODRules> getRules()
+ {
+ return m_Rules;
+ }
+
+ /** Get name of component
+ * @return Name of the component
+ */
+ virtual OFString getName() const;
+
+ /** Get modifier code denoted by index
+ * @param index Index of modifier code to get (first modifier = 0)
+ * @return Code if modifier with index exists, NULL otherwise
+ */
+ virtual CodeSequenceMacro* getModifier(const size_t index = 0);
+
+ /** Adds modifier code
+ * @param modifier The code to be added
+ * @return EC_Normal if adding was successful, error otherwise
+ */
+ virtual OFCondition addModifier(const CodeSequenceMacro& modifier);
+
+ /** Read attributes from given item into this class
+ * @param source The source to read from
+ * @param clearOldData If OFTrue, old data is cleared before reading. Otherwise
+ * old data is overwritten (or amended)
+ * @result EC_Normal if reading was successful, error otherwise
+ */
+ virtual OFCondition read(DcmItem& source,
+ const OFBool clearOldData = OFTrue);
+
+ /** Write attributes from this class into given item
+ * @param destination The item to write to
+ * @result EC_Normal if writing was successful, error otherwise
+ */
+ virtual OFCondition write(DcmItem& destination);
+
+ /** Check whether this component's data satisfies the underlying
+ * rules
+ * @param quiet If OFTrue, not error / warning messages will be produced. Only
+ * the returned error code will indicate error or OK. Per default,
+ * logging output is produced (OFFalse).
+ * @result EC_Normal if rules are satisfied, error otherwise
+ */
+ virtual OFCondition check(const OFBool quiet = OFFalse);
+
+ /** Comparison operator for IOD Components
+ * @param rhs The right hand side of the comparison
+ * @return 0, if the given object is equal to this object, other value otherwise
+ */
+ virtual int compare(const IODComponent& rhs) const;
+
+private:
+
+ /// Items of Modifier Code Sequence
+ OFVector<CodeSequenceMacro*> m_Modifiers;
+
+ /// Type 1,2,3,1C or 2C
+ OFString m_ModifierType;
+
+ /// 1, 1-n, 2-2n, ...
+ OFString m_ModifierVM;
+
+ /// The sequence tag key that contains the modifier codes
+ DcmTagKey m_CodeModifierSeq;
+};
+
+
/** Class implementing the SOP Instance Reference Macro
*/
class DCMTK_DCMIOD_EXPORT SOPInstanceReferenceMacro : public IODComponent
@@ -400,6 +536,9 @@ public:
virtual OFCondition setSeriesInstanceUID(const OFString& value,
const OFBool checkValue = OFTrue);
+ virtual OFCondition addReference(const OFString& sopClassUID,
+ const OFString& sopInstanceUID);
+
/** Get content of the Referenced Instance Sequence
* @return Reference to the Referenced Instance Sequence content
*/
@@ -432,6 +571,36 @@ public:
*/
virtual ~ImageSOPInstanceReferenceMacro();
+ /** Creates an ImageSOPInstanceReferenceMacro object without frame/segment
+ * reference from required information.
+ * @param sopClassUID The SOP Class UID of the reference
+ * @param sopInstanceUID The SOP Instance UID of the reference
+ * @param result Returns the resulting object if successful, NULL otherwise
+ * @return EC_Normal if creation was successful, error code otherwise
+ */
+ static OFCondition create(const OFString& sopClassUID,
+ const OFString& sopInstanceUID,
+ ImageSOPInstanceReferenceMacro*& result);
+
+ /** Creates an ImageSOPInstanceReferenceMacro object with frame or segment
+ * references from required information.
+ * @param sopClassUID The SOP Class UID of the reference
+ * @param sopInstanceUID The SOP Instance UID of the reference
+ * @param refFramesOrSegments Reference to specific frames of an image or
+ * segments of a Segmentation object. The decision (image or
+ * segmentation) is based on the SOP Class; in case it is the
+ * Segmentation Storage SOP Class, the parameter is interpreted
+ * as segment references, otherwise as frame references. If this
+ * parameter is provided empty, then no frame/segment reference is
+ * set at all.
+ * @param result Returns the resulting object if successful, NULL otherwise
+ * @return EC_Normal if creation was successful, error code otherwise
+ */
+ static OFCondition create(const OFString& sopClassUID,
+ const OFString& sopInstanceUID,
+ const OFVector<Uint16>& refFramesOrSegments,
+ ImageSOPInstanceReferenceMacro*& result);
+
/** Comparison operator that compares the normalized value of this object
* with a given object of the same type
* @param rhs The right hand side of the comparison
@@ -486,14 +655,14 @@ public:
/** Add a Referenced Frame Number
* @param value The frame number to add
* @param checkValue If OFTrue, consistency checks are performed (as possible)
- * @return EC_Normal if succesful, error otherwise
+ * @return EC_Normal if successful, error otherwise
*/
virtual OFCondition addReferencedFrameNumber(const Uint16& value,
const OFBool checkValue = OFTrue);
/** Set the Referenced Segment Numbers
* @param values The segment numbers to add
* @param checkValue If OFTrue, consistency checks are performed (as possible)
- * @return EC_Normal if succesful, error otherwise
+ * @return EC_Normal if successful, error otherwise
*/
virtual OFCondition setReferencedSegmentNumber(const OFVector<Uint16>& values,
const OFBool checkValue = OFTrue);
@@ -501,7 +670,7 @@ public:
/** Add a Referenced Segment Number
* @param value The segment number to add
* @param checkValue If OFTrue, consistency checks are performed (as possible)
- * @return EC_Normal if succesful, error otherwise
+ * @return EC_Normal if successful, error otherwise
*/
virtual OFCondition addReferencedSegmentNumber(const Uint16& value,
const OFBool checkValue = OFTrue);
@@ -683,7 +852,7 @@ public:
*/
GeneralAnatomyMacro(const GeneralAnatomyMacro& rhs);
- /** Virtual desctructor
+ /** Virtual destructor
*/
virtual ~GeneralAnatomyMacro();
@@ -868,7 +1037,7 @@ public:
/** Write this macro to given item
* @param item The item to write to
- * @return EC_Normal if writing was succesful, error otherwise
+ * @return EC_Normal if writing was successful, error otherwise
*/
virtual OFCondition write(DcmItem& item);
@@ -903,7 +1072,7 @@ class DCMTK_DCMIOD_EXPORT ContentIdentificationMacro
public:
- /** Class repsenting an Alternate Content Description item
+ /** Class representing an Alternate Content Description item
*/
class DCMTK_DCMIOD_EXPORT AlternateContentDescriptionItem
{
@@ -958,7 +1127,7 @@ public:
private:
- /// Content Desctription: (LO, VM 1, Type 1)
+ /// Content Description: (LO, VM 1, Type 1)
DcmLongString m_ContentDescription;
/// Item of Language Code Sequence: (SQ, VM 1, Type 1)
@@ -969,11 +1138,36 @@ public:
*/
ContentIdentificationMacro();
+ /** Constructor initializing basic data
+ * @param instanceNumber Instance Number
+ * @param contentLabel Content Label
+ * @param contentDescription Content Description, may be empty
+ * @param contentCreatorName Content Creator's Name, may be empty
+ */
+ ContentIdentificationMacro(const OFString& instanceNumber,
+ const OFString& contentLabel,
+ const OFString& contentDescription,
+ const OFString& contentCreatorName);
+
/** Copy constructor
* @param rhs The macro to copy from (deep copy)
*/
ContentIdentificationMacro(const ContentIdentificationMacro& rhs);
+ /** Create Content Identification Macro with minimally required data.
+ * @param instanceNumber Instance Number
+ * @param contentLabel Content Label
+ * @param contentDescription Content Description, may be empty
+ * @param contentCreatorName Content Creator's Name, may be empty
+ * @param result Returns created macro if successful, NULL otherwise
+ * @return EC_Normal if creation was successful, error otherwise
+ */
+ static OFCondition create(const OFString& instanceNumber,
+ const OFString& contentLabel,
+ const OFString& contentDescription,
+ const OFString& contentCreatorName,
+ ContentIdentificationMacro*& result);
+
/** Assignment operator (deep copy)
* @param rhs The macro to copy from
* @return Reference to "this" object
@@ -997,6 +1191,12 @@ public:
*/
virtual void resetRules();
+ /** Get name of macro
+ * @return Name of the module ("ContentIdentificationMacro")
+ */
+ virtual OFString getName() const;
+
+
/** Check whether this component's data satisfies the underlying
* rules
* @param quiet If OFTrue, not error / warning messages will be produced.
@@ -1090,7 +1290,7 @@ public:
/** Write Content Identification Macro to given item
* @param item The item to write to
- * @return EC_Normal if successul, error otherwise
+ * @return EC_Normal if successful, error otherwise
*/
virtual OFCondition write(DcmItem& item);
@@ -1102,7 +1302,7 @@ private:
/// Content Label: (CS, VM 1, Type 1)
DcmCodeString m_ContentLabel;
- /// Content Description: (LO, VM1, Type 1)
+ /// Content Description: (LO, VM 1, Type 1)
DcmLongString m_ContentDescription;
// Alternate Content Description Sequence (VM 1-n, Type 3)
diff --git a/dcmiod/include/dcmtk/dcmiod/iodreferences.h b/dcmiod/include/dcmtk/dcmiod/iodreferences.h
new file mode 100644
index 0000000..8d0cb98
--- /dev/null
+++ b/dcmiod/include/dcmtk/dcmiod/iodreferences.h
@@ -0,0 +1,356 @@
+/*
+ *
+ * Copyright (C) 2016, Open Connections GmbH
+ * All rights reserved. See COPYRIGHT file for details.
+ *
+ * This software and supporting documentation are maintained by
+ *
+ * OFFIS e.V.
+ * R&D Division Health
+ * Escherweg 2
+ * D-26121 Oldenburg, Germany
+ *
+ *
+ * Module: dcmiod
+ *
+ * Author: Michael Onken
+ *
+ * Purpose: Class for managing SOP references as used in different modules
+ *
+ */
+
+#ifndef IODREFERENCES_H
+#define IODREFERENCES_H
+
+#include "dcmtk/config/osconfig.h"
+#include "dcmtk/oflog/oflog.h"
+#include "dcmtk/dcmiod/ioddef.h"
+
+// Forward declaration
+class DcmItem;
+
+/** Class that represents a reference to another DICOM objects. DICOM uses
+ * different types of references for different purposes: Sometimes only SOP
+ * Class UID and SOP Instance UID are required, sometimes also Series and
+ * Study Instance UIDs. Also, in different IOD modules and macros DICOM uses
+ * different attributes to store those references in objects. Sometimes the
+ * same references are even required in different structures within the same
+ * object.
+ * This class can carry identifiers for Patient, Study, Series and Instance
+ * level and can be passed around in order to write them as required into
+ * the attribute structures needed by a specific DIOCM IOD, module or macro.
+ */
+class DCMTK_DCMIOD_EXPORT IODReference
+{
+ public:
+ /// The maximum DICOM entity level that this reference refers to. This is
+ /// mostly used in order to check whether a reference is complete or not.
+ enum MAX_LEVEL
+ {
+ /// Instance Level
+ LEVEL_INSTANCE,
+ /// Series Level
+ LEVEL_SERIES,
+ /// Study level
+ LEVEL_STUDY,
+ /// Patient level
+ LEVEL_PATIENT
+ };
+
+ /// Type of reference
+ enum TYPE
+ {
+ /// Generic (or unknown)
+ GENERIC,
+ /// Reference to an image object, see also class IODImageReference
+ IMAGE,
+ /// Reference to a segmentation object, see also class IDOSegmentationReference
+ SEGMENT
+ };
+
+ /** Constructor, creates empty reference, default level is "STUDY"
+ */
+ IODReference();
+
+ /** Constructor, creates empty reference with specified level
+ * @param level The reference level
+ */
+ IODReference(const MAX_LEVEL level);
+
+ /** Destructor
+ */
+ virtual ~IODReference();
+
+ /** Create (deep) clone copy of this reference
+ * @return Returns eep copy of this reference or NULL in case of error
+ */
+ virtual IODReference* clone() const;
+
+ /** Get type of reference. Base class always returns "GENERIC"
+ * @return Returns "GENERIC" type
+ */
+ virtual TYPE getType() const {return GENERIC; }
+
+ /** Check whether this reference is valid, i.e. complete related to its
+ * level. Also in case of UIDs it is checked whether they conform to the
+ * UI Value Representation definition.
+ * @return EC_Normal if reference is valid, error otherwise
+ */
+ virtual OFCondition check() const;
+
+ /** Returns reference as a one line string. Mostly useful for debugging.
+ * @return Reference as a string.
+ */
+ virtual OFString toString() const;
+
+ /** Initializes this reference from given file, i.e. extracts all identifiers
+ * up to the level defined for this reference.
+ * @param filename The file to read from
+ * @return Returns OFTrue if reference could be read, otherwise OFFalse
+ */
+ virtual OFBool readFromFile(const OFString& filename);
+
+ /** Initializes this reference from given item, i.e. extracts all identifiers
+ * up to the level defined for this reference.
+ * @param item The item to read from
+ * @return Returns OFTrue if reference could be read, otherwise OFFalse
+ */
+ virtual OFBool readFromItem(DcmItem& item);
+
+ /** Clear all reference data
+ */
+ virtual void clear();
+
+ /// Patient ID
+ OFString m_PatientID;
+
+ /// Study Instance UID
+ OFString m_StudyInstanceUID;
+
+ /// Series Instance UID
+ OFString m_SeriesInstanceUID;
+
+ /// SOP Class UID
+ OFString m_SOPClassUID;
+
+ /// SOP Instance UID
+ OFString m_SOPInstanceUID;
+
+ /// Maximum level this reference refers to. E.g. for level SERIES, only
+ /// Series, SOP Instance and SOP Class UID must be provided. However,
+ // setting the Patient ID too does not harm.
+ MAX_LEVEL m_Level;
+};
+
+
+/** Class representing a reference to an image. Compared to IODReference, this
+ * class also allows to provide references to specific frames
+ */
+class DCMTK_DCMIOD_EXPORT IODImageReference : public IODReference
+{
+ public:
+
+ /** Default constructor, uses level STUDY
+ */
+ IODImageReference();
+
+ /** Constructor allowing to set reference level.
+ * @param level The maximum level this reference should deal with
+ */
+ IODImageReference(const MAX_LEVEL level);
+
+ /** Convenience constructor setting reference data including frame numbers
+ * @param patientID Patient ID
+ * @param studyUID Study Instance UID
+ * @param seriesUID Series Instance UID
+ * @param sopInstanceUID SOP Instance UID
+ * @param sopClassUID SOP Class UID
+ * @param refFrameNumbers Referenced Frame Numbers
+ */
+ IODImageReference(const OFString& patientID,
+ const OFString& studyUID,
+ const OFString& seriesUID,
+ const OFString& sopInstanceUID,
+ const OFString& sopClassUID,
+ const OFVector<Uint32>& refFrameNumbers);
+
+ /** Convenience constructor setting reference data without frame numbers
+ * @param patientID Patient ID
+ * @param studyUID Study Instance UID
+ * @param seriesUID Series Instance UID
+ * @param sopInstanceUID SOP Instance UID
+ * @param sopClassUID SOP Class UID
+ */
+ IODImageReference(const OFString& patientID,
+ const OFString& studyUID,
+ const OFString& seriesUID,
+ const OFString& sopInstanceUID,
+ const OFString& sopClassUID);
+
+ /** Get (deep) clone copy of this reference
+ * @return Returns deep copy of this reference, or NULL in case of error
+ */
+ virtual IODReference* clone() const;
+
+ /** Get type (always returns IMAGE type)
+ * @return Returns IMAGE type
+ */
+ virtual TYPE getType() const {return IMAGE; }
+
+ /** Initialize reference from given file
+ * @param filename The file to read from
+ * @param frameNumbers The frame numbers to reference. It is not checked
+ * (so far) whether the referenced image file actually contains
+ * such frames. First frame is denoted by 1.
+ * @return OFTrue if initialization was successful, OFFalse otherwise
+ */
+ virtual OFBool readFromFile(const OFString& filename,
+ const OFVector<Uint32> frameNumbers);
+ /** Destructor
+ */
+ virtual ~IODImageReference() {}
+
+ /** Clear reference data
+ */
+ virtual void clear();
+
+ /// Referenced frame numbers
+ OFVector<Uint32> m_ReferencedFrameNumber;
+};
+
+
+/** Class representing a reference to a Segmentation. Compared to IODReference,
+ * this class also allows to provide references to specific segments by
+ * referencing the value of their Segment Number attribute.
+ */
+class DCMTK_DCMIOD_EXPORT IODSegmentationReference : public IODReference
+{
+ public:
+
+ /** Constructor allowing to set reference level.
+ * @param level The maximum level this reference should deal with
+ */
+ IODSegmentationReference(const MAX_LEVEL level);
+
+ /** Default constructor, uses level STUDY
+ */
+ IODSegmentationReference();
+
+ /** Get (deep) clone copy of this reference
+ * @return Returns deep copy of this reference, or NULL in case of error
+ */
+ virtual IODReference* clone() const;
+
+ /** Get type (always returns SEGMENT type)
+ * @return Returns SEGMENT type
+ */
+ virtual TYPE getType() const {return SEGMENT; }
+
+ /** Initialize reference from given file
+ * @param filename The file to read from
+ * @param segmentNumbers The segment numbers to reference. It is not
+ * checked (so far) whether the referenced image file actually
+ * contains such Segment Numbers. First segment is 1.
+ * @return OFTrue if initialization was successful, OFFalse otherwise
+ */
+ virtual OFBool readFromFile(const OFString& filename,
+ const OFVector<Uint16> segmentNumbers);
+
+ /** Destructor
+ */
+ virtual ~IODSegmentationReference() {}
+
+ /** Clear reference data
+ */
+ virtual void clear();
+
+ /// Referenced Segment Numbers
+ OFVector<Uint16> m_ReferencedSegmentNumber;
+};
+
+
+/** Class that holds a set of IODReference instances (or its sub classes) and
+ * offers helper functionality to read and write such references
+ */
+class DCMTK_DCMIOD_EXPORT IODReferences
+{
+
+ public:
+
+ /** Default constructor
+ */
+ IODReferences();
+
+ /** Copy constructor, performs deep copy of provided references
+ * @param rhs The references to assign
+ */
+ IODReferences(const IODReferences& rhs);
+
+ /** Assignment operator, copies all provided references
+ */
+ IODReferences& operator=(const IODReferences& rhs);
+
+ /** Destructor, frees memory
+ */
+ virtual ~IODReferences();
+
+ /** Initialize references by reading the Referenced Instance Sequence as
+ * used in the Tractography Results Module
+ * @param source The item to read from, must contain the Referenced
+ * Instance Sequence
+ * @return EC_Normal if all references could be read, IOD_EC_InvalidReference
+ * if no reference could be read, and IOD_EC_ReferencesOmitted if
+ * at least one reference could be read but at least one had also
+ * to be skipped.
+ */
+ virtual OFCondition readTractographyReferencedInstanceSequence(DcmItem& source);
+
+ /** Write references to Referenced Instance Sequence as used in the
+ * Tractography Results Module
+ * @param item The item to write to
+ * @return EC_Normal if all references could be written, error code
+ * otherwise
+ */
+ virtual OFCondition writeTractographyReferencedInstanceSequence(DcmItem& item);
+
+ /** Add reference to this set of references
+ * @param ref The reference to add (ownership is taken if adding is
+ * successful
+ * @return OFTrue if adding is successful, OFFalse otherwise
+ */
+ virtual OFBool add(IODReference* ref);
+
+ /** Initialize references from set of DICOM files. If a file could not be
+ * used, it is skipped. All references found by this method are added on
+ * top of existing ones, i.e. any existing data is not cleared by thi
+ * method.
+ * @param dcmFiles The DICOM file names to read
+ * @param maxLevel The maximum level to extract
+ * @return Returns number of references (successful files) that could be
+ * added
+ */
+ virtual size_t addFromFiles(const OFVector<OFString>& dcmFiles,
+ const IODReference::MAX_LEVEL maxLevel = IODReference::LEVEL_STUDY);
+
+ /** Access references of this set (readonly)
+ * @return Returns references managed by this class
+ */
+ const OFVector<IODReference*>& get() const;
+
+ /** Returns number of references managed by this class
+ * @return Returns number of references
+ */
+ virtual size_t size() const;
+
+ /** Clears all references
+ */
+ virtual void clearData();
+
+ private:
+
+ /// Set of references managed by this class
+ OFVector<IODReference*> m_References;
+};
+
+
+#endif // IODREFERENCES_H
diff --git a/dcmiod/include/dcmtk/dcmiod/iodrules.h b/dcmiod/include/dcmtk/dcmiod/iodrules.h
index 455ac8f..3678d9b 100644
--- a/dcmiod/include/dcmtk/dcmiod/iodrules.h
+++ b/dcmiod/include/dcmtk/dcmiod/iodrules.h
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2015, Open Connections GmbH
+ * Copyright (C) 2015-2016, Open Connections GmbH
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation are maintained by
@@ -116,7 +116,7 @@ public:
private:
- /// Map that holds all rules, accessable by their tag key
+ /// Map that holds all rules, accessible by their tag key
OFMap<DcmTagKey, IODRule*> m_Rules;
};
@@ -181,7 +181,7 @@ public:
virtual OFString getVM() const;
/** Get module (or component name) the related attribute belongs to
- * @return The module or component name (e.g.\ "PatientName" or
+ * @return The module or component name (e.g.\ "PatientModule" or
* "CodeSequenceMacro")
*/
virtual OFString getModule() const;
@@ -196,6 +196,16 @@ public:
*/
virtual DcmIODTypes::IOD_IE getIE() const;
+ virtual OFBool setPrivateCreator(const OFString& val);
+
+ virtual OFBool setType(const OFString& val);
+
+ virtual OFBool setVM(const OFString& val);
+
+ virtual OFBool setModule(const OFString& val);
+
+ virtual OFBool setDefaultValue(const OFString& val);
+
/** Check whether the given item fulfills the requirements of
* this rule, i.e.\ the related attribute is checked within the
* given item
@@ -231,7 +241,7 @@ private:
/// Module (e.g.\ "PatientModule" or "component name", e.g.\ "CodeSequenceMacro"
OFString m_Module;
- /// The Inforamtion Entitity the related attribute belongs to according to the
+ /// The Information Entity the related attribute belongs to according to the
/// DICOM Model of the Real World, e.g.\ "Patient" for the attribute
/// "Patient Name"
DcmIODTypes::IOD_IE m_IE;
diff --git a/dcmiod/include/dcmtk/dcmiod/iodtypes.h b/dcmiod/include/dcmtk/dcmiod/iodtypes.h
index 48e991e..ffe78dd 100644
--- a/dcmiod/include/dcmtk/dcmiod/iodtypes.h
+++ b/dcmiod/include/dcmtk/dcmiod/iodtypes.h
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2015, Open Connections GmbH
+ * Copyright (C) 2015-2016, Open Connections GmbH
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation are maintained by
@@ -25,6 +25,7 @@
#include "dcmtk/config/osconfig.h"
#include "dcmtk/oflog/oflog.h"
#include "dcmtk/dcmiod/ioddef.h"
+#include "dcmtk/dcmiod/cielabutil.h"
// ----------------------------------------------------------------------------
// Define the loggers for this module
@@ -55,6 +56,8 @@ extern DCMTK_DCMIOD_EXPORT const OFConditionConst IOD_EC_CannotDecompress;
extern DCMTK_DCMIOD_EXPORT const OFConditionConst IOD_EC_NoSuchRule;
extern DCMTK_DCMIOD_EXPORT const OFConditionConst IOD_EC_InvalidLaterality;
extern DCMTK_DCMIOD_EXPORT const OFConditionConst IOD_EC_InvalidElementValue;
+extern DCMTK_DCMIOD_EXPORT const OFConditionConst IOD_EC_InvalidReference;
+extern DCMTK_DCMIOD_EXPORT const OFConditionConst IOD_EC_ReferencesOmitted;
/** Class that wraps some constant definitions in the context of IODs
@@ -122,6 +125,7 @@ public:
IMAGETYPE_DERIVED
};
+
private:
/** Private undefined default constructor
diff --git a/dcmiod/include/dcmtk/dcmiod/iodutil.h b/dcmiod/include/dcmtk/dcmiod/iodutil.h
index 6e2f7c6..d4f3c39 100644
--- a/dcmiod/include/dcmtk/dcmiod/iodutil.h
+++ b/dcmiod/include/dcmtk/dcmiod/iodutil.h
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2015, Open Connections GmbH
+ * Copyright (C) 2015-2016, Open Connections GmbH
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation are maintained by
@@ -189,7 +189,7 @@ public:
* @param dataset Reference to DICOM dataset to which the element should
* be added
* @param delem Pointer to DICOM element which should be added. The element
- * is always consumed by this function, i.e.\ insertion was succesful
+ * is always consumed by this function, i.e.\ insertion was successful
* and therefore ownership is transferred to the dataset, or the
* element is deleted from memory if it could not be inserted.
* @param rule Rule describing parameters to be checked on element.
@@ -365,12 +365,12 @@ public:
return result;
}
- /** Check whether SOP Sclass UID matches the expected value
+ /** Check whether SOP class UID matches the expected value
* @param item Item to read from. NULL value causes error return value.
* @param desiredSOPClass The value that is expected
* @param valueFound The value actually found (empty if no value could
* be retrieved)
- * @return EC_Normal if value could be found and equals exptected value,
+ * @return EC_Normal if value could be found and equals expected value,
* EC_TagNotFound if SOP Class UID is not found in dataset,
* EC_InvalidValue if SOP class differs from expected value.
*/
@@ -418,10 +418,10 @@ public:
checkElementValue(source, seqKey, cardinality, type, exists, module.c_str());
if (source)
{
- const unsigned long card = source->card();
- for (unsigned long count = 0; count < card; count++)
+ DcmItem *item = OFstatic_cast(DcmItem*, source->nextInContainer(NULL));
+ size_t count = 0;
+ while (item != NULL)
{
- DcmItem *item = source->getItem(count);
if (item != NULL)
{
// define the element type
@@ -438,7 +438,7 @@ public:
else
{
delete newElem;
- DCMIOD_WARN("Could not read item #" << count << " from " << DcmTag(source->getTag()).getTagName() << " (skipping item): " << result.text() );
+ DCMIOD_WARN("Could not read item #" << count << " from " << DcmTag(source->getTag()).getTagName() << " (skipping item): " << result.text());
}
}
else
@@ -450,6 +450,8 @@ public:
{
DCMIOD_WARN("Could not get item #" << count << " from " << DcmTag(source->getTag()).getTagName() << " (malformed data or internal error), skipping item");
}
+ item = OFstatic_cast(DcmItem*, source->nextInContainer(item));
+ count++;
}
}
else
@@ -466,7 +468,7 @@ public:
* @param source The source DICOM item read the sequence from
* @param seqKey The tag key of the sequence to be read
* @param destination The destination container to read into
- * @param cardinality Eexpected number of items.
+ * @param cardinality Expected number of items.
* See DcmElement::checkVM() for a list of valid values.
* @param type The sequence type as noted in part 3 of the DICOM standard,
* i.e.\ "1,1C,2,2C or 3".
@@ -542,12 +544,12 @@ public:
/* Check sequence, reports cardinality and type errors as warnings */
checkSubSequence(result, source, seqKey, "1", type, module);
- /* Try to read sequence into internal data (ignore errors as nuch as possible) */
+ /* Try to read sequence into internal data (ignore errors as much as possible) */
DcmItem* item = NULL;
result = source.findAndGetSequenceItem(seqKey, item, 0);
if (item != NULL)
{
- // read into Code Sequence Macro (clears old data first)
+ // read into Container (clears old data first)
result = destination.read(*item, OFTrue /* clear old data */);
}
return result;
@@ -757,12 +759,11 @@ public:
}
else if (type == "1C")
{
- DCMIOD_TRACE("Skipping type 1C sequence " << seqKey << ": No data or imcomplete data available");
+ DCMIOD_TRACE("Skipping type 1C sequence " << seqKey << ": No data or incomplete data available");
}
+ /* Check outcome */
+ checkSubSequence(result, destination, seqKey, "1", type, module);
}
-
- /* Check outcome */
- checkSubSequence(result, destination, seqKey, "1", type, module);
}
/** Writes given container into a DICOM item of a specific sequence.
@@ -785,12 +786,15 @@ public:
DcmItem& destination,
IODRule *rule)
{
- if (rule == NULL)
+ if (result.good())
{
- DCMIOD_ERROR("Cannot write sequence " << seqKey << " (no rule supplied)");
- result = EC_CannotCheck;
+ if (rule == NULL)
+ {
+ DCMIOD_ERROR("Cannot write sequence " << seqKey << " (no rule supplied)");
+ result = EC_CannotCheck;
+ }
+ writeSingleItem(result, seqKey, source, destination, rule->getType(), rule->getModule());
}
- writeSingleItem(result, seqKey, source, destination, rule->getType(), rule->getModule());
}
@@ -837,7 +841,7 @@ public:
* copy constructing all elements.
* @param src The container that should be copied. Must contain pointers
* to objects that are allocated on the heap, and that are
- * copy-constructable
+ * copy-constructible
* @param dst The container to copy the cloned elements to.
*/
template<class Container>
@@ -892,7 +896,7 @@ private:
*/
DcmIODUtil();
- /** Undefined desctructor
+ /** Undefined destructor
*/
~DcmIODUtil();
};
diff --git a/dcmiod/include/dcmtk/dcmiod/modbase.h b/dcmiod/include/dcmtk/dcmiod/modbase.h
index 2527133..d372a66 100644
--- a/dcmiod/include/dcmtk/dcmiod/modbase.h
+++ b/dcmiod/include/dcmtk/dcmiod/modbase.h
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2015, Open Connections GmbH
+ * Copyright (C) 2015-2016, Open Connections GmbH
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation are maintained by
@@ -73,7 +73,6 @@ public:
*/
IODComponent& operator=(const IODComponent& rhs);
-
/** Copy constructor, copies reference to contained item and
* rule set to "this" attribute set.
* @param rhs The component to be assigned
@@ -109,6 +108,12 @@ public:
return m_Rules;
}
+ /** Make component optional by turning all attributes requirement types of it
+ * to type 3. In order to reset to the attribute's original types,
+ * resetRules() can be used.
+ */
+ virtual void makeOptional();
+
/** Get name of component
* @return Name of the module
*/
@@ -223,6 +228,8 @@ public:
* on top level.
*/
IODModule();
+
+ ~IODModule() {};
};
#endif //MODBASE_H
diff --git a/dcmiod/include/dcmtk/dcmiod/modcommoninstanceref.h b/dcmiod/include/dcmtk/dcmiod/modcommoninstanceref.h
index f922fae..0991f45 100644
--- a/dcmiod/include/dcmtk/dcmiod/modcommoninstanceref.h
+++ b/dcmiod/include/dcmtk/dcmiod/modcommoninstanceref.h
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2015, Open Connections GmbH
+ * Copyright (C) 2015-2016, Open Connections GmbH
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation are maintained by
@@ -29,6 +29,7 @@
#include "dcmtk/dcmiod/iodrules.h"
#include "dcmtk/dcmiod/modbase.h"
#include "dcmtk/dcmiod/iodmacro.h"
+#include "dcmtk/dcmiod/iodreferences.h"
/** Class representing the Common Instance Reference Module:
@@ -71,6 +72,14 @@ public:
*/
virtual ~IODCommonInstanceReferenceModule();
+ /** Add references
+ * @result EC_Normal if successful, error otherwise
+ */
+ virtual size_t addReferences(const IODReferences& references,
+ const OFString& studyInstanceUID,
+ const OFBool clearOldData = OFTrue);
+
+
/** Read data of this module from given source item
* @param source The item to read from
* @param clearOldData If OFTrue, old data is cleared before reading, otherwise
@@ -80,7 +89,7 @@ public:
virtual OFCondition read(DcmItem& source,
const OFBool clearOldData = OFTrue);
- /** Write data of this moduel into given destination item
+ /** Write data of this module into given destination item
* @param destination The item to write to
* @result EC_Normal if successful, error otherwise
*/
@@ -100,6 +109,17 @@ public:
*/
OFVector<IODSeriesAndInstanceReferenceMacro::ReferencedSeriesItem*>& getReferencedSeriesItems();
+ /** Return reference to content of Studies Containing Other Referenced Instances Sequence
+ * @return Reference to content of Studies Containing Other Referenced Instances Sequence
+ */
+ OFVector<StudiesOtherInstancesItem*>& getStudiesContainingOtherReferences();
+
+protected:
+
+ virtual OFCondition addSeriesReference(
+ OFVector<IODSeriesAndInstanceReferenceMacro::ReferencedSeriesItem*>& container,
+ const IODReference& ref);
+
private:
/// Vector with all items of the Referenced Series Sequence
diff --git a/dcmiod/include/dcmtk/dcmiod/modenhequipment.h b/dcmiod/include/dcmtk/dcmiod/modenhequipment.h
index 7e92fad..78b9f5e 100644
--- a/dcmiod/include/dcmtk/dcmiod/modenhequipment.h
+++ b/dcmiod/include/dcmtk/dcmiod/modenhequipment.h
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2015, Open Connections GmbH
+ * Copyright (C) 2015-2016, Open Connections GmbH
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation are maintained by
@@ -44,6 +44,30 @@ public:
*/
struct EquipmentInfo
{
+
+ /** Default Constructor
+ */
+ EquipmentInfo() :
+ m_Manufacturer(),
+ m_ManufacturerModelName(),
+ m_DeviceSerialNumber(),
+ m_SoftwareVersions() {};
+
+ /** Convenience Constructor setting all values
+ * @param manufacturer Manufacturer
+ * @param modelName Model name
+ * @param deviceSerialNumber Serial number
+ * *@param softwareVersions Software versions
+ */
+ EquipmentInfo(const OFString& manufacturer,
+ const OFString& modelName,
+ const OFString& deviceSerialNumber,
+ const OFString& softwareVersions) :
+ m_Manufacturer(manufacturer),
+ m_ManufacturerModelName(modelName),
+ m_DeviceSerialNumber(deviceSerialNumber),
+ m_SoftwareVersions(softwareVersions) {};
+
// Manufacturer (VM 1)
OFString m_Manufacturer;
@@ -74,6 +98,9 @@ public:
*/
virtual ~IODEnhGeneralEquipmentModule();
+ static OFCondition create(const EquipmentInfo& info,
+ IODEnhGeneralEquipmentModule* equipment);
+
/** Resets rules to their original values.
*/
virtual void resetRules();
@@ -147,6 +174,8 @@ public:
virtual OFCondition setSoftwareVersions(const OFString &value,
const OFBool checkValue = OFTrue);
+ virtual OFCondition set(const EquipmentInfo& info);
+
private:
/// Name of the module ("EnhancedEquipmentModule")
diff --git a/dcmiod/include/dcmtk/dcmiod/modenhusimage.h b/dcmiod/include/dcmtk/dcmiod/modenhusimage.h
index b5682df..3740191 100644
--- a/dcmiod/include/dcmtk/dcmiod/modenhusimage.h
+++ b/dcmiod/include/dcmtk/dcmiod/modenhusimage.h
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2015, Open Connections GmbH
+ * Copyright (C) 2015-2016, Open Connections GmbH
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation are maintained by
@@ -312,7 +312,7 @@ public:
*/
virtual CodeSequenceMacro& getTransducerApplication();
- /** Get Processing Funcion
+ /** Get Processing Function
* @param value Reference to variable in which the value should be stored
* @param pos Index of the value to get (0..vm-1), -1 for all values
* @return EC_Normal if successful, an error code otherwise
@@ -369,7 +369,7 @@ public:
/** Set Image Type. Image Type contains up to four values. Value 3 and 4 are
* optional and can be left empty if desired. The values in their order
- * of occurence are:
+ * of occurrence are:
* 1) Pixel Data Characteristics: Either ORIGINAL or DERIVED
* 2) Patient Examination Characteristics: Fixed to "PRIMARY", thus cannot be
* influenced through this function.
@@ -483,7 +483,6 @@ public:
/** Set Lossy Image Compression Method
* @param value Value to be set
- * @param pos Index of the value to set (0..vm-1)
* @param checkValue Check 'value' for conformance if enabled, including VR (CS)
* @return EC_Normal if successful, an error code otherwise
*/
diff --git a/dcmiod/include/dcmtk/dcmiod/modenhusseries.h b/dcmiod/include/dcmtk/dcmiod/modenhusseries.h
index b34b143..cfeaccb 100644
--- a/dcmiod/include/dcmtk/dcmiod/modenhusseries.h
+++ b/dcmiod/include/dcmtk/dcmiod/modenhusseries.h
@@ -73,8 +73,8 @@ public:
*/
virtual void resetRules();
- /** Get name of module ("EnhancedUSSeriesModul")
- * @return Name of the module ("EnhancedUSSeriesModul")
+ /** Get name of module ("EnhancedUSSeriesModule")
+ * @return Name of the module ("EnhancedUSSeriesModule")
*/
virtual OFString getName() const;
@@ -121,7 +121,7 @@ public:
private:
- /// The name of this module ("EnhancedUSSeriesModul")
+ /// The name of this module ("EnhancedUSSeriesModule")
static const OFString m_ModuleName;
/// Referenced Performed Procedure Step Sequence
diff --git a/dcmiod/include/dcmtk/dcmiod/modequipment.h b/dcmiod/include/dcmtk/dcmiod/modequipment.h
index 36010f9..8f6c694 100644
--- a/dcmiod/include/dcmtk/dcmiod/modequipment.h
+++ b/dcmiod/include/dcmtk/dcmiod/modequipment.h
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2016, Open Connections GmbH
+ * Copyright (C) 2015-2016, Open Connections GmbH
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation are maintained by
diff --git a/dcmiod/include/dcmtk/dcmiod/modgeneralimage.h b/dcmiod/include/dcmtk/dcmiod/modgeneralimage.h
index a8b4d9d..7cb3402 100644
--- a/dcmiod/include/dcmtk/dcmiod/modgeneralimage.h
+++ b/dcmiod/include/dcmtk/dcmiod/modgeneralimage.h
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2015, Open Connections GmbH
+ * Copyright (C) 2015-2016, Open Connections GmbH
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation are maintained by
@@ -280,7 +280,7 @@ public:
virtual OFCondition setAcquisitionTime(const OFString &value,
const OFBool checkValue = OFTrue);
- /** Set Acquisition Date Time
+ /** Set Acquisition Date Time
* @param value Value to be set (single value only).
* @param checkValue Check 'value' for conformance with VR (DT) and VM (1) if enabled
* @return EC_Normal if successful, an error code otherwise
diff --git a/dcmiod/include/dcmtk/dcmiod/modmultiframedimension.h b/dcmiod/include/dcmtk/dcmiod/modmultiframedimension.h
index ded7064..1d92731 100644
--- a/dcmiod/include/dcmtk/dcmiod/modmultiframedimension.h
+++ b/dcmiod/include/dcmtk/dcmiod/modmultiframedimension.h
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2015, Open Connections GmbH
+ * Copyright (C) 2015-2016, Open Connections GmbH
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation are maintained by
@@ -40,7 +40,7 @@
* > Dimension Description Label (LO, 1, 3)
*
* The Dimension Organization UIDs within the Dimension Organization Sequence
- * cannot be set explicitly. Instead the sequence is poplulated from the data
+ * cannot be set explicitly. Instead the sequence is populated from the data
* found within the Dimension Index Sequence.
*/
class DCMTK_DCMIOD_EXPORT IODMultiframeDimensionModule : public IODModule
@@ -214,7 +214,7 @@ public:
virtual OFCondition setFunctionalGroupPointer(const DcmTagKey& value,
const OFBool checkValue = OFTrue);
- /** Set Dimension Index Functional Group PrivateCreator
+ /** Set Dimension Index Functional Group Private Creator
* @param value Value to be set (single value only) or "" for no value
* @param checkValue Check 'value. Not evaluated (here for consistency
* with other setter functions).
@@ -265,8 +265,8 @@ public:
* @param functionalGroupPointer The functional group where the pointer attribute can be found
* @param dimensionDescriptionLabel The description label of this dimension (optional)
* @param dimensionIndexPrivateCreator The private creator of the Dimension Index Pointer
- * attribute. Reuquired if dimensionIndexPointer points to a private attribute tag.
- * @param functionalGroupPrivateCreator The private creator of the functional group. Reuired
+ * attribute. Required if dimensionIndexPointer points to a private attribute tag.
+ * @param functionalGroupPrivateCreator The private creator of the functional group. Required
* if functionalGroupPointer points to a private attribute tag.
* @return EC_Normal if index could be added, error otherwise (basic parameter checking)
*
diff --git a/dcmiod/include/dcmtk/dcmiod/modmultiframefg.h b/dcmiod/include/dcmtk/dcmiod/modmultiframefg.h
index 33afb03..df6b376 100644
--- a/dcmiod/include/dcmtk/dcmiod/modmultiframefg.h
+++ b/dcmiod/include/dcmtk/dcmiod/modmultiframefg.h
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2015, Open Connections GmbH
+ * Copyright (C) 2015-2016, Open Connections GmbH
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation are maintained by
@@ -111,7 +111,7 @@ public:
const unsigned int pos = 0);
/** Get Concatenation Information
- * @return Reference to the concatentation information
+ * @return Reference to the concatenation information
*/
virtual ConcatenationInfo& getConcatenationInfo();
diff --git a/dcmiod/include/dcmtk/dcmiod/modpatientstudy.h b/dcmiod/include/dcmtk/dcmiod/modpatientstudy.h
index 6ac3a44..11181e2 100644
--- a/dcmiod/include/dcmtk/dcmiod/modpatientstudy.h
+++ b/dcmiod/include/dcmtk/dcmiod/modpatientstudy.h
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2015, Open Connections GmbH
+ * Copyright (C) 2015-2016, Open Connections GmbH
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation are maintained by
@@ -90,7 +90,7 @@ public:
* @return EC_Normal if successful, an error code otherwise
*/
virtual OFCondition getPatientWeight(Float64 &value,
- const unsigned long pos = 00) const;
+ const unsigned long pos = 0) const;
/** Get Patient's Size (in meters)
* @param value Reference to variable in which the value should be stored
diff --git a/dcmiod/include/dcmtk/dcmiod/modsopcommon.h b/dcmiod/include/dcmtk/dcmiod/modsopcommon.h
index 0a584e1..ef99908 100644
--- a/dcmiod/include/dcmtk/dcmiod/modsopcommon.h
+++ b/dcmiod/include/dcmtk/dcmiod/modsopcommon.h
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2015, Open Connections GmbH
+ * Copyright (C) 2015-2016, Open Connections GmbH
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation are maintained by
@@ -148,7 +148,7 @@ public:
/** Set SOP Class UID
* @param value Value to be set (single value only) or "" for no value
- * @param checkValue ValueCheck 'value' for conformance with VR (UI) and
+ * @param checkValue Check 'value' for conformance with VR (UI) and
* VM (1) if enabled
* @return EC_Normal if successful, an error code otherwise
*/
diff --git a/dcmiod/include/dcmtk/dcmiod/modsynchronisation.h b/dcmiod/include/dcmtk/dcmiod/modsynchronisation.h
index b72cf00..cc78233 100644
--- a/dcmiod/include/dcmtk/dcmiod/modsynchronisation.h
+++ b/dcmiod/include/dcmtk/dcmiod/modsynchronisation.h
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2015, Open Connections GmbH
+ * Copyright (C) 2015-2016, Open Connections GmbH
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation are maintained by
@@ -98,7 +98,7 @@ public:
*/
virtual OFCondition getSynchronizationChannel(OFVector<Uint16>& value) const;
- /** Get Acquisition Time Sychronized
+ /** Get Acquisition Time Synchronized
* @param value Reference to variable in which the value should be stored
* @param pos Index of the value to get (0..vm-1), -1 for all components
*/
diff --git a/dcmiod/libsrc/CMakeLists.txt b/dcmiod/libsrc/CMakeLists.txt
index 6fd8efb..51d62ff 100644
--- a/dcmiod/libsrc/CMakeLists.txt
+++ b/dcmiod/libsrc/CMakeLists.txt
@@ -5,6 +5,7 @@ DCMTK_ADD_LIBRARY(dcmiod
iodmacro
iodimage
iodrules
+ iodreferences
iodutil
iodtypes
modacquisitioncontext
diff --git a/dcmiod/libsrc/Makefile.dep b/dcmiod/libsrc/Makefile.dep
index 7301f3c..21270be 100644
--- a/dcmiod/libsrc/Makefile.dep
+++ b/dcmiod/libsrc/Makefile.dep
@@ -53,7 +53,8 @@ iodcommn.o: iodcommn.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofstd.h \
../../ofstd/include/dcmtk/ofstd/oflimits.h \
../../config/include/dcmtk/config/arith.h \
- ../include/dcmtk/dcmiod/ioddef.h ../include/dcmtk/dcmiod/modpatient.h \
+ ../include/dcmtk/dcmiod/ioddef.h ../include/dcmtk/dcmiod/cielabutil.h \
+ ../include/dcmtk/dcmiod/modpatient.h \
../../ofstd/include/dcmtk/ofstd/ofmem.h \
../../dcmdata/include/dcmtk/dcmdata/dctk.h \
../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
@@ -132,6 +133,7 @@ iodcommn.o: iodcommn.cc ../../config/include/dcmtk/config/osconfig.h \
../include/dcmtk/dcmiod/modgeneralseries.h \
../include/dcmtk/dcmiod/modfor.h ../include/dcmtk/dcmiod/modsopcommon.h \
../include/dcmtk/dcmiod/modcommoninstanceref.h \
+ ../include/dcmtk/dcmiod/iodreferences.h \
../include/dcmtk/dcmiod/iodutil.h \
../../dcmdata/include/dcmtk/dcmdata/dcdatutl.h
iodimage.o: iodimage.cc ../../config/include/dcmtk/config/osconfig.h \
@@ -183,7 +185,8 @@ iodimage.o: iodimage.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofstd.h \
../../ofstd/include/dcmtk/ofstd/oflimits.h \
../../config/include/dcmtk/config/arith.h \
- ../include/dcmtk/dcmiod/ioddef.h ../include/dcmtk/dcmiod/modpatient.h \
+ ../include/dcmtk/dcmiod/ioddef.h ../include/dcmtk/dcmiod/cielabutil.h \
+ ../include/dcmtk/dcmiod/modpatient.h \
../../ofstd/include/dcmtk/ofstd/ofmem.h \
../../dcmdata/include/dcmtk/dcmdata/dctk.h \
../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
@@ -262,6 +265,7 @@ iodimage.o: iodimage.cc ../../config/include/dcmtk/config/osconfig.h \
../include/dcmtk/dcmiod/modgeneralseries.h \
../include/dcmtk/dcmiod/modfor.h ../include/dcmtk/dcmiod/modsopcommon.h \
../include/dcmtk/dcmiod/modcommoninstanceref.h \
+ ../include/dcmtk/dcmiod/iodreferences.h \
../include/dcmtk/dcmiod/modgeneralimage.h \
../include/dcmtk/dcmiod/modimagepixel.h \
../include/dcmtk/dcmiod/iodutil.h \
@@ -381,10 +385,84 @@ iodmacro.o: iodmacro.cc ../../config/include/dcmtk/config/osconfig.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
../include/dcmtk/dcmiod/iodrules.h ../include/dcmtk/dcmiod/iodtypes.h \
- ../include/dcmtk/dcmiod/ioddef.h ../include/dcmtk/dcmiod/modbase.h \
+ ../include/dcmtk/dcmiod/ioddef.h ../include/dcmtk/dcmiod/cielabutil.h \
+ ../include/dcmtk/dcmiod/modbase.h \
../../ofstd/include/dcmtk/ofstd/ofmem.h \
../include/dcmtk/dcmiod/iodutil.h \
../../dcmdata/include/dcmtk/dcmdata/dcdatutl.h
+iodreferences.o: iodreferences.cc \
+ ../../config/include/dcmtk/config/osconfig.h \
+ ../include/dcmtk/dcmiod/iodtypes.h \
+ ../../oflog/include/dcmtk/oflog/oflog.h \
+ ../../oflog/include/dcmtk/oflog/logger.h \
+ ../../oflog/include/dcmtk/oflog/config.h \
+ ../../ofstd/include/dcmtk/ofstd/ofdefine.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcast.h \
+ ../../ofstd/include/dcmtk/ofstd/ofexport.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
+ ../../oflog/include/dcmtk/oflog/config/defines.h \
+ ../../oflog/include/dcmtk/oflog/helpers/threadcf.h \
+ ../../oflog/include/dcmtk/oflog/loglevel.h \
+ ../../ofstd/include/dcmtk/ofstd/ofvector.h \
+ ../../ofstd/include/dcmtk/ofstd/oftypes.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstream.h \
+ ../../oflog/include/dcmtk/oflog/tstring.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstring.h \
+ ../../oflog/include/dcmtk/oflog/tchar.h \
+ ../../oflog/include/dcmtk/oflog/spi/apndatch.h \
+ ../../oflog/include/dcmtk/oflog/appender.h \
+ ../../ofstd/include/dcmtk/ofstd/ofaptr.h \
+ ../../oflog/include/dcmtk/oflog/layout.h \
+ ../../oflog/include/dcmtk/oflog/streams.h \
+ ../../oflog/include/dcmtk/oflog/helpers/pointer.h \
+ ../../oflog/include/dcmtk/oflog/thread/syncprim.h \
+ ../../oflog/include/dcmtk/oflog/spi/filter.h \
+ ../../oflog/include/dcmtk/oflog/helpers/lockfile.h \
+ ../../oflog/include/dcmtk/oflog/spi/logfact.h \
+ ../../oflog/include/dcmtk/oflog/logmacro.h \
+ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \
+ ../../oflog/include/dcmtk/oflog/tracelog.h \
+ ../../ofstd/include/dcmtk/ofstd/ofconapp.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \
+ ../../ofstd/include/dcmtk/ofstd/oflist.h \
+ ../../ofstd/include/dcmtk/ofstd/ofconsol.h \
+ ../../ofstd/include/dcmtk/ofstd/ofthread.h \
+ ../../ofstd/include/dcmtk/ofstd/offile.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstd.h \
+ ../../ofstd/include/dcmtk/ofstd/oftraits.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcond.h \
+ ../../ofstd/include/dcmtk/ofstd/oflimits.h \
+ ../../config/include/dcmtk/config/arith.h \
+ ../include/dcmtk/dcmiod/ioddef.h ../include/dcmtk/dcmiod/cielabutil.h \
+ ../include/dcmtk/dcmiod/iodreferences.h \
+ ../include/dcmtk/dcmiod/iodutil.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdatutl.h \
+ ../include/dcmtk/dcmiod/iodrules.h \
+ ../../ofstd/include/dcmtk/ofstd/ofmap.h \
+ ../../ofstd/include/dcmtk/ofstd/ofutil.h \
+ ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h
iodrules.o: iodrules.cc ../../config/include/dcmtk/config/osconfig.h \
../include/dcmtk/dcmiod/iodrules.h \
../../ofstd/include/dcmtk/ofstd/ofstring.h \
@@ -433,7 +511,7 @@ iodrules.o: iodrules.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofstd.h \
../../ofstd/include/dcmtk/ofstd/oflimits.h \
../../config/include/dcmtk/config/arith.h \
- ../include/dcmtk/dcmiod/ioddef.h \
+ ../include/dcmtk/dcmiod/ioddef.h ../include/dcmtk/dcmiod/cielabutil.h \
../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
@@ -488,7 +566,7 @@ iodtypes.o: iodtypes.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofcond.h \
../../ofstd/include/dcmtk/ofstd/oflimits.h \
../../config/include/dcmtk/config/arith.h \
- ../include/dcmtk/dcmiod/ioddef.h \
+ ../include/dcmtk/dcmiod/ioddef.h ../include/dcmtk/dcmiod/cielabutil.h \
../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
../../dcmdata/include/dcmtk/dcmdata/dcdefine.h
iodutil.o: iodutil.cc ../../config/include/dcmtk/config/osconfig.h \
@@ -554,7 +632,7 @@ iodutil.o: iodutil.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofmap.h \
../../ofstd/include/dcmtk/ofstd/ofutil.h \
../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
- ../include/dcmtk/dcmiod/iodtypes.h \
+ ../include/dcmtk/dcmiod/iodtypes.h ../include/dcmtk/dcmiod/cielabutil.h \
../../dcmdata/include/dcmtk/dcmdata/dcmetinf.h \
../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
../../dcmdata/include/dcmtk/dcmdata/dcdict.h \
@@ -683,7 +761,8 @@ modacquisitioncontext.o: modacquisitioncontext.cc \
../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
../include/dcmtk/dcmiod/iodrules.h ../include/dcmtk/dcmiod/iodtypes.h \
- ../include/dcmtk/dcmiod/ioddef.h ../include/dcmtk/dcmiod/modbase.h \
+ ../include/dcmtk/dcmiod/ioddef.h ../include/dcmtk/dcmiod/cielabutil.h \
+ ../include/dcmtk/dcmiod/modbase.h \
../../ofstd/include/dcmtk/ofstd/ofmem.h \
../include/dcmtk/dcmiod/iodutil.h \
../../dcmdata/include/dcmtk/dcmdata/dcdatutl.h
@@ -747,11 +826,13 @@ modbase.o: modbase.cc ../../config/include/dcmtk/config/osconfig.h \
../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
../include/dcmtk/dcmiod/ioddef.h ../include/dcmtk/dcmiod/iodrules.h \
../../ofstd/include/dcmtk/ofstd/ofmap.h \
- ../include/dcmtk/dcmiod/iodtypes.h ../include/dcmtk/dcmiod/iodutil.h \
+ ../include/dcmtk/dcmiod/iodtypes.h ../include/dcmtk/dcmiod/cielabutil.h \
+ ../include/dcmtk/dcmiod/iodutil.h \
../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdatutl.h
+ ../../dcmdata/include/dcmtk/dcmdata/dcdatutl.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h
modcommoninstanceref.o: modcommoninstanceref.cc \
../../config/include/dcmtk/config/osconfig.h \
../include/dcmtk/dcmiod/modcommoninstanceref.h \
@@ -869,8 +950,10 @@ modcommoninstanceref.o: modcommoninstanceref.cc \
../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
../include/dcmtk/dcmiod/iodrules.h ../include/dcmtk/dcmiod/iodtypes.h \
- ../include/dcmtk/dcmiod/ioddef.h ../include/dcmtk/dcmiod/modbase.h \
- ../include/dcmtk/dcmiod/iodmacro.h ../include/dcmtk/dcmiod/iodutil.h \
+ ../include/dcmtk/dcmiod/ioddef.h ../include/dcmtk/dcmiod/cielabutil.h \
+ ../include/dcmtk/dcmiod/modbase.h ../include/dcmtk/dcmiod/iodmacro.h \
+ ../include/dcmtk/dcmiod/iodreferences.h \
+ ../include/dcmtk/dcmiod/iodutil.h \
../../dcmdata/include/dcmtk/dcmdata/dcdatutl.h
modenhequipment.o: modenhequipment.cc \
../../config/include/dcmtk/config/osconfig.h \
@@ -923,7 +1006,7 @@ modenhequipment.o: modenhequipment.cc \
../../ofstd/include/dcmtk/ofstd/ofstd.h \
../../ofstd/include/dcmtk/ofstd/oflimits.h \
../../config/include/dcmtk/config/arith.h \
- ../include/dcmtk/dcmiod/modbase.h \
+ ../include/dcmtk/dcmiod/cielabutil.h ../include/dcmtk/dcmiod/modbase.h \
../../ofstd/include/dcmtk/ofstd/ofmem.h \
../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
@@ -1009,7 +1092,8 @@ modenhusimage.o: modenhusimage.cc \
../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
../include/dcmtk/dcmiod/ioddef.h ../include/dcmtk/dcmiod/iodrules.h \
../../ofstd/include/dcmtk/ofstd/ofmap.h \
- ../include/dcmtk/dcmiod/iodtypes.h ../include/dcmtk/dcmiod/iodmacro.h \
+ ../include/dcmtk/dcmiod/iodtypes.h ../include/dcmtk/dcmiod/cielabutil.h \
+ ../include/dcmtk/dcmiod/iodmacro.h \
../../dcmdata/include/dcmtk/dcmdata/dctk.h \
../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
@@ -1121,7 +1205,8 @@ modenhusseries.o: modenhusseries.cc \
../../ofstd/include/dcmtk/ofstd/ofstd.h \
../../ofstd/include/dcmtk/ofstd/oflimits.h \
../../config/include/dcmtk/config/arith.h \
- ../include/dcmtk/dcmiod/ioddef.h ../include/dcmtk/dcmiod/iodmacro.h \
+ ../include/dcmtk/dcmiod/ioddef.h ../include/dcmtk/dcmiod/cielabutil.h \
+ ../include/dcmtk/dcmiod/iodmacro.h \
../../dcmdata/include/dcmtk/dcmdata/dctk.h \
../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
@@ -1241,7 +1326,7 @@ modequipment.o: modequipment.cc \
../../ofstd/include/dcmtk/ofstd/ofstd.h \
../../ofstd/include/dcmtk/ofstd/oflimits.h \
../../config/include/dcmtk/config/arith.h \
- ../include/dcmtk/dcmiod/modbase.h \
+ ../include/dcmtk/dcmiod/cielabutil.h ../include/dcmtk/dcmiod/modbase.h \
../../ofstd/include/dcmtk/ofstd/ofmem.h \
../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
@@ -1325,7 +1410,7 @@ modfor.o: modfor.cc ../../config/include/dcmtk/config/osconfig.h \
../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
../include/dcmtk/dcmiod/ioddef.h ../include/dcmtk/dcmiod/iodrules.h \
../../ofstd/include/dcmtk/ofstd/ofmap.h \
- ../include/dcmtk/dcmiod/iodtypes.h \
+ ../include/dcmtk/dcmiod/iodtypes.h ../include/dcmtk/dcmiod/cielabutil.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
@@ -1386,7 +1471,8 @@ modgeneralimage.o: modgeneralimage.cc \
../../ofstd/include/dcmtk/ofstd/ofstd.h \
../../ofstd/include/dcmtk/ofstd/oflimits.h \
../../config/include/dcmtk/config/arith.h \
- ../include/dcmtk/dcmiod/ioddef.h ../include/dcmtk/dcmiod/modbase.h \
+ ../include/dcmtk/dcmiod/ioddef.h ../include/dcmtk/dcmiod/cielabutil.h \
+ ../include/dcmtk/dcmiod/modbase.h \
../../ofstd/include/dcmtk/ofstd/ofmem.h \
../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
@@ -1480,7 +1566,8 @@ modgeneralseries.o: modgeneralseries.cc \
../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
../include/dcmtk/dcmiod/ioddef.h ../include/dcmtk/dcmiod/iodrules.h \
../../ofstd/include/dcmtk/ofstd/ofmap.h \
- ../include/dcmtk/dcmiod/iodtypes.h ../include/dcmtk/dcmiod/iodmacro.h \
+ ../include/dcmtk/dcmiod/iodtypes.h ../include/dcmtk/dcmiod/cielabutil.h \
+ ../include/dcmtk/dcmiod/iodmacro.h \
../../dcmdata/include/dcmtk/dcmdata/dctk.h \
../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
@@ -1601,7 +1688,8 @@ modgeneralstudy.o: modgeneralstudy.cc \
../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
../include/dcmtk/dcmiod/ioddef.h ../include/dcmtk/dcmiod/iodrules.h \
../../ofstd/include/dcmtk/ofstd/ofmap.h \
- ../include/dcmtk/dcmiod/iodtypes.h ../include/dcmtk/dcmiod/iodmacro.h \
+ ../include/dcmtk/dcmiod/iodtypes.h ../include/dcmtk/dcmiod/cielabutil.h \
+ ../include/dcmtk/dcmiod/iodmacro.h \
../../dcmdata/include/dcmtk/dcmdata/dctk.h \
../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
@@ -1779,7 +1867,7 @@ modimagepixel.o: modimagepixel.cc \
../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
../include/dcmtk/dcmiod/ioddef.h ../include/dcmtk/dcmiod/iodrules.h \
../../ofstd/include/dcmtk/ofstd/ofmap.h \
- ../include/dcmtk/dcmiod/iodtypes.h \
+ ../include/dcmtk/dcmiod/iodtypes.h ../include/dcmtk/dcmiod/cielabutil.h \
../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrobow.h \
../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
@@ -1840,7 +1928,8 @@ modmultiframedimension.o: modmultiframedimension.cc \
../../ofstd/include/dcmtk/ofstd/ofstd.h \
../../ofstd/include/dcmtk/ofstd/oflimits.h \
../../config/include/dcmtk/config/arith.h \
- ../include/dcmtk/dcmiod/ioddef.h ../include/dcmtk/dcmiod/modbase.h \
+ ../include/dcmtk/dcmiod/ioddef.h ../include/dcmtk/dcmiod/cielabutil.h \
+ ../include/dcmtk/dcmiod/modbase.h \
../../ofstd/include/dcmtk/ofstd/ofmem.h \
../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
@@ -1931,7 +2020,7 @@ modmultiframefg.o: modmultiframefg.cc \
../../ofstd/include/dcmtk/ofstd/ofutil.h \
../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
../include/dcmtk/dcmiod/iodtypes.h ../include/dcmtk/dcmiod/ioddef.h \
- ../include/dcmtk/dcmiod/modbase.h \
+ ../include/dcmtk/dcmiod/cielabutil.h ../include/dcmtk/dcmiod/modbase.h \
../../ofstd/include/dcmtk/ofstd/ofmem.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
@@ -2058,8 +2147,8 @@ modpatient.o: modpatient.cc ../../config/include/dcmtk/config/osconfig.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
../include/dcmtk/dcmiod/iodrules.h ../include/dcmtk/dcmiod/iodtypes.h \
- ../include/dcmtk/dcmiod/ioddef.h ../include/dcmtk/dcmiod/modbase.h \
- ../include/dcmtk/dcmiod/iodutil.h \
+ ../include/dcmtk/dcmiod/ioddef.h ../include/dcmtk/dcmiod/cielabutil.h \
+ ../include/dcmtk/dcmiod/modbase.h ../include/dcmtk/dcmiod/iodutil.h \
../../dcmdata/include/dcmtk/dcmdata/dcdatutl.h
modpatientstudy.o: modpatientstudy.cc \
../../config/include/dcmtk/config/osconfig.h \
@@ -2180,8 +2269,8 @@ modpatientstudy.o: modpatientstudy.cc \
../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
../include/dcmtk/dcmiod/iodrules.h ../include/dcmtk/dcmiod/iodtypes.h \
- ../include/dcmtk/dcmiod/ioddef.h ../include/dcmtk/dcmiod/modbase.h \
- ../include/dcmtk/dcmiod/iodutil.h \
+ ../include/dcmtk/dcmiod/ioddef.h ../include/dcmtk/dcmiod/cielabutil.h \
+ ../include/dcmtk/dcmiod/modbase.h ../include/dcmtk/dcmiod/iodutil.h \
../../dcmdata/include/dcmtk/dcmdata/dcdatutl.h
modsegmentationseries.o: modsegmentationseries.cc \
../../config/include/dcmtk/config/osconfig.h \
@@ -2301,7 +2390,7 @@ modsegmentationseries.o: modsegmentationseries.cc \
../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
../include/dcmtk/dcmiod/modbase.h ../include/dcmtk/dcmiod/ioddef.h \
../include/dcmtk/dcmiod/iodrules.h ../include/dcmtk/dcmiod/iodtypes.h \
- ../include/dcmtk/dcmiod/iodutil.h \
+ ../include/dcmtk/dcmiod/cielabutil.h ../include/dcmtk/dcmiod/iodutil.h \
../../dcmdata/include/dcmtk/dcmdata/dcdatutl.h
modsopcommon.o: modsopcommon.cc \
../../config/include/dcmtk/config/osconfig.h \
@@ -2365,7 +2454,7 @@ modsopcommon.o: modsopcommon.cc \
../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
../include/dcmtk/dcmiod/ioddef.h ../include/dcmtk/dcmiod/iodrules.h \
../../ofstd/include/dcmtk/ofstd/ofmap.h \
- ../include/dcmtk/dcmiod/iodtypes.h \
+ ../include/dcmtk/dcmiod/iodtypes.h ../include/dcmtk/dcmiod/cielabutil.h \
../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
@@ -2446,7 +2535,7 @@ modsynchronization.o: modsynchronization.cc \
../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
../include/dcmtk/dcmiod/ioddef.h ../include/dcmtk/dcmiod/iodrules.h \
../../ofstd/include/dcmtk/ofstd/ofmap.h \
- ../include/dcmtk/dcmiod/iodtypes.h \
+ ../include/dcmtk/dcmiod/iodtypes.h ../include/dcmtk/dcmiod/cielabutil.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
@@ -2522,7 +2611,7 @@ modusfor.o: modusfor.cc ../../config/include/dcmtk/config/osconfig.h \
../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
../include/dcmtk/dcmiod/ioddef.h ../include/dcmtk/dcmiod/iodrules.h \
../../ofstd/include/dcmtk/ofstd/ofmap.h \
- ../include/dcmtk/dcmiod/iodtypes.h \
+ ../include/dcmtk/dcmiod/iodtypes.h ../include/dcmtk/dcmiod/cielabutil.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
diff --git a/dcmiod/libsrc/iodmacro.cc b/dcmiod/libsrc/iodmacro.cc
index 2e87256..c95174c 100644
--- a/dcmiod/libsrc/iodmacro.cc
+++ b/dcmiod/libsrc/iodmacro.cc
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2016, Open Connections GmbH
+ * Copyright (C) 2015-2016, Open Connections GmbH
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation are maintained by
@@ -46,6 +46,13 @@ CodeSequenceMacro::CodeSequenceMacro(IODComponent* parent) : IODComponent(parent
}
+CodeSequenceMacro::CodeSequenceMacro(const CodeSequenceMacro& rhs)
+: IODComponent(rhs)
+{
+}
+
+
+
CodeSequenceMacro::~CodeSequenceMacro()
{
// nothing to do
@@ -99,10 +106,10 @@ OFString CodeSequenceMacro::getName() const
void CodeSequenceMacro::resetRules()
{
- m_Rules->addRule(new IODRule(DCM_CodeValue, "1", "1", "CodeSequenceMacro", DcmIODTypes::IE_UNDEFINED), OFTrue /*overwrite old rule*/);
- m_Rules->addRule(new IODRule(DCM_CodingSchemeDesignator, "1", "1", "CodeSequenceMacro", DcmIODTypes::IE_UNDEFINED), OFTrue /*overwrite old rule*/);
- m_Rules->addRule(new IODRule(DCM_CodingSchemeVersion, "1", "1C", "CodeSequenceMacro", DcmIODTypes::IE_UNDEFINED), OFTrue /*overwrite old rule*/);
- m_Rules->addRule(new IODRule(DCM_CodeMeaning, "1", "1", "CodeSequenceMacro", DcmIODTypes::IE_UNDEFINED), OFTrue /*overwrite old rule*/);
+ m_Rules->addRule(new IODRule(DCM_CodeValue, "1", "1", getName(), DcmIODTypes::IE_UNDEFINED), OFTrue /*overwrite old rule*/);
+ m_Rules->addRule(new IODRule(DCM_CodingSchemeDesignator, "1", "1", getName(), DcmIODTypes::IE_UNDEFINED), OFTrue /*overwrite old rule*/);
+ m_Rules->addRule(new IODRule(DCM_CodingSchemeVersion, "1", "1C", getName(), DcmIODTypes::IE_UNDEFINED), OFTrue /*overwrite old rule*/);
+ m_Rules->addRule(new IODRule(DCM_CodeMeaning, "1", "1", getName(), DcmIODTypes::IE_UNDEFINED), OFTrue /*overwrite old rule*/);
}
@@ -197,6 +204,169 @@ OFCondition CodeSequenceMacro::set(const OFString& value,
return result;
}
+// ---------------------- CodeWithModifiers----------------------
+
+CodeWithModifiers::CodeWithModifiers(const OFString& modifierType,
+ const OFString& modifierVM,
+ const DcmTagKey& modifierSeq)
+: CodeSequenceMacro(),
+ m_ModifierType(modifierType),
+ m_ModifierVM(modifierVM),
+ m_CodeModifierSeq(modifierSeq)
+{
+ resetRules();
+}
+
+
+CodeWithModifiers::CodeWithModifiers(const CodeWithModifiers& rhs)
+: CodeSequenceMacro(rhs),
+ m_Modifiers()
+{
+ if (&rhs == this)
+ return;
+
+ *this = rhs;
+}
+
+
+CodeWithModifiers& CodeWithModifiers::operator=(const CodeWithModifiers& rhs)
+{
+ if (&rhs == this)
+ return *this;
+
+ CodeSequenceMacro::operator=(rhs);
+
+ const CodeWithModifiers* r = OFstatic_cast(const CodeWithModifiers*, &rhs);
+ if (r)
+ {
+ OFVector<CodeSequenceMacro*>::const_iterator it = r->m_Modifiers.begin();
+ while ((it != r->m_Modifiers.end()))
+ {
+ m_Modifiers.push_back(new CodeSequenceMacro(*it));
+ it++;
+ }
+ }
+
+ return *this;
+}
+
+
+OFCondition CodeWithModifiers::check(const OFBool quiet)
+{
+ OFCondition result = CodeSequenceMacro::check(quiet);
+ if (result.good())
+ {
+ OFVector<CodeSequenceMacro*>::iterator it = m_Modifiers.begin();
+ while (result.good() && (it != m_Modifiers.end()))
+ {
+ result = (*it)->check(quiet);
+ it++;
+ }
+ }
+ if (result.bad())
+ {
+ DCMIOD_ERROR("Invalid code in Code Sequence Macro or its modifiers");
+ }
+ return result;
+}
+
+
+void CodeWithModifiers::clearData()
+{
+ CodeSequenceMacro::clearData();
+ DcmIODUtil::freeContainer(m_Modifiers);
+}
+
+
+int CodeWithModifiers::compare(const IODComponent& rhs) const
+{
+ const CodeWithModifiers* r = OFstatic_cast(const CodeWithModifiers*, &rhs);
+ if (!r)
+ return -1;
+
+ if (m_Modifiers.size() < r->m_Modifiers.size())
+ return -1;
+ else if (m_Modifiers.size() > r->m_Modifiers.size())
+ return 1;
+
+ int result = IODComponent::compare(*r);
+ if (result == 0)
+ {
+ for (size_t n = 0; (n < m_Modifiers.size()) && (result == 0); n++)
+ {
+ result = m_Modifiers[n]->compare(*r->m_Modifiers[n]);
+ }
+ }
+ return result;
+}
+
+
+OFString CodeWithModifiers::getName() const
+{
+ return "CodeWithModifiers";
+}
+
+
+OFCondition CodeWithModifiers::addModifier(const CodeSequenceMacro& modifier)
+{
+ OFCondition result = OFconst_cast(CodeSequenceMacro*, &modifier)->check();
+ if (result.good())
+ {
+ m_Modifiers.push_back(new CodeSequenceMacro(modifier));
+ }
+ return result;
+}
+
+
+CodeSequenceMacro* CodeWithModifiers::getModifier(const size_t index)
+{
+ if (index > m_Modifiers.size())
+ return NULL;
+ else
+ return m_Modifiers[index];
+}
+
+
+OFCondition CodeWithModifiers::read(DcmItem& source,
+ const OFBool clearOldData)
+{
+ OFCondition result = CodeSequenceMacro::read(source, clearOldData);
+ if (result.good() && clearOldData)
+ {
+ DcmIODUtil::freeContainer(m_Modifiers);
+ }
+ if (result.good())
+ {
+ result = DcmIODUtil::readSubSequence(source, m_CodeModifierSeq, m_Modifiers, getRules()->getByTag(m_CodeModifierSeq));
+ }
+ return result;
+}
+
+
+void CodeWithModifiers::resetRules()
+{
+ CodeSequenceMacro::resetRules();
+ m_Rules->addRule(new IODRule(m_CodeModifierSeq, m_ModifierVM, m_ModifierType, getName(), DcmIODTypes::IE_UNDEFINED));
+}
+
+
+OFCondition CodeWithModifiers::write(DcmItem& destination)
+{
+ OFCondition result;
+ DcmIODUtil::writeSubSequence(result, m_CodeModifierSeq, m_Modifiers, getData(), getRules()->getByTag(m_CodeModifierSeq));
+ if (result.good())
+ {
+ result = CodeSequenceMacro::write(destination);
+ }
+ return result;
+}
+
+
+CodeWithModifiers::~CodeWithModifiers()
+{
+ DcmIODUtil::freeContainer(m_Modifiers);
+}
+
// ---------------------- SeriesAndInstanceReferenceMacro----------------------
@@ -256,7 +426,7 @@ void IODSeriesAndInstanceReferenceMacro::clearData()
void IODSeriesAndInstanceReferenceMacro::resetRules()
{
- m_Rules->addRule(new IODRule(DCM_ReferencedSeriesSequence, "1-n", "1", m_ComponentName, DcmIODTypes::IE_INSTANCE), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_ReferencedSeriesSequence, "1-n", "1", getName(), DcmIODTypes::IE_INSTANCE), OFTrue);
}
@@ -338,8 +508,8 @@ OFCondition IODSeriesAndInstanceReferenceMacro::ReferencedSeriesItem::write(DcmI
void IODSeriesAndInstanceReferenceMacro::ReferencedSeriesItem::resetRules()
{
// Parameters for Rule are tag, VM, type (1,1C,2,2C,3), module name and logical IOD level
- m_Rules->addRule(new IODRule(DCM_SeriesInstanceUID, "1", "1", m_ComponentName, DcmIODTypes::IE_INSTANCE), OFTrue);
- m_Rules->addRule(new IODRule(DCM_ReferencedInstanceSequence, "1-n", "1", m_ComponentName, DcmIODTypes::IE_INSTANCE), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_SeriesInstanceUID, "1", "1", getName(), DcmIODTypes::IE_INSTANCE), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_ReferencedInstanceSequence, "1-n", "1", getName(), DcmIODTypes::IE_INSTANCE), OFTrue);
}
@@ -365,6 +535,45 @@ OFCondition IODSeriesAndInstanceReferenceMacro::ReferencedSeriesItem::setSeriesI
return result;
}
+OFCondition IODSeriesAndInstanceReferenceMacro::ReferencedSeriesItem::addReference(
+ const OFString& sopClassUID,
+ const OFString& sopInstanceUID)
+{
+ OFVector<SOPInstanceReferenceMacro*>::iterator instance = m_ReferencedInstanceSequence.begin();
+ while (instance != m_ReferencedInstanceSequence.end())
+ {
+ OFString c,i;
+ (*instance)->getReferencedSOPClassUID(c);
+ (*instance)->getReferencedSOPInstanceUID(i);
+ if ( i == sopInstanceUID)
+ {
+ DCMIOD_DEBUG("Skipping doubled instance reference when adding to Series and Instance Reference Macro");
+ return EC_Normal;
+ }
+ else
+ {
+ instance++;
+ }
+ }
+ // We get here in case that we do not have this reference, add new one
+ SOPInstanceReferenceMacro* macro = new SOPInstanceReferenceMacro();
+ if (!macro)
+ {
+ return EC_MemoryExhausted;
+ }
+ OFCondition result = macro->setReferencedSOPClassUID(sopClassUID);
+ if (result.good()) result = macro->setReferencedSOPInstanceUID(sopInstanceUID);
+ if (result.good())
+ {
+ m_ReferencedInstanceSequence.push_back(macro);
+ }
+ else
+ {
+ delete macro;
+ result = IOD_EC_InvalidElementValue;
+ }
+ return result;
+}
// ---------------------- SOPInstanceReferenceMacro ----------------------
@@ -403,8 +612,8 @@ OFString SOPInstanceReferenceMacro::getName() const
void SOPInstanceReferenceMacro::resetRules()
{
// Parameters for Rule are tag, VM, type (1,1C,2,2C,3), module name and logical IOD level
- m_Rules->addRule(new IODRule(DCM_ReferencedSOPClassUID, "1", "1", "SOPInstanceReferenceMacro", DcmIODTypes::IE_UNDEFINED), OFTrue);
- m_Rules->addRule(new IODRule(DCM_ReferencedSOPInstanceUID, "1", "1", "SOPInstanceReferenceMacro", DcmIODTypes::IE_UNDEFINED), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_ReferencedSOPClassUID, "1", "1", getName(), DcmIODTypes::IE_UNDEFINED), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_ReferencedSOPInstanceUID, "1", "1", getName(), DcmIODTypes::IE_UNDEFINED), OFTrue);
}
@@ -455,6 +664,58 @@ ImageSOPInstanceReferenceMacro::ImageSOPInstanceReferenceMacro()
}
+OFCondition ImageSOPInstanceReferenceMacro::create(const OFString& sopClassUID,
+ const OFString& sopInstanceUID,
+ ImageSOPInstanceReferenceMacro*& result)
+{
+ result = new ImageSOPInstanceReferenceMacro();
+ if (!result)
+ return EC_MemoryExhausted;
+
+ OFCondition cond = result->setReferencedSOPClassUID(sopClassUID);
+ if (cond.good())
+ {
+ cond = result->setReferencedSOPInstanceUID(sopInstanceUID);
+ }
+ if (cond.bad())
+ {
+ delete result;
+ result = NULL;
+ }
+ return cond;
+}
+
+
+OFCondition ImageSOPInstanceReferenceMacro::create(const OFString& sopClassUID,
+ const OFString& sopInstanceUID,
+ const OFVector< Uint16 >& refFramesOrSegments,
+ ImageSOPInstanceReferenceMacro*& result
+ )
+{
+ OFCondition cond = create(sopClassUID, sopInstanceUID, result);
+ if (cond.good())
+ {
+ if (!refFramesOrSegments.empty())
+ {
+ if (sopClassUID == UID_SegmentationStorage)
+ {
+ cond = result->setReferencedSegmentNumber(refFramesOrSegments);
+ }
+ else
+ {
+ cond = result->setReferencedFrameNumber(refFramesOrSegments);
+ }
+ }
+ if (cond.bad())
+ {
+ delete result;
+ result = NULL;
+ }
+ }
+ return cond;
+}
+
+
ImageSOPInstanceReferenceMacro::~ImageSOPInstanceReferenceMacro()
{
}
@@ -560,11 +821,9 @@ OFCondition ImageSOPInstanceReferenceMacro::addReferencedSegmentNumber(const Uin
}
-
// ---------------------- GeneralAnatomyMacro ----------------------
-
GeneralAnatomyMacro::GeneralAnatomyMacro(const OFString& type) :
m_Type(type),
m_AnatomicRegion(),
@@ -597,7 +856,6 @@ GeneralAnatomyMacro::GeneralAnatomyMacro(const GeneralAnatomyMacro& rhs)
}
-
GeneralAnatomyMacro::~GeneralAnatomyMacro()
{
clearData();
@@ -1189,14 +1447,40 @@ ContentIdentificationMacro::ContentIdentificationMacro() :
}
+ContentIdentificationMacro::ContentIdentificationMacro(const OFString& instanceNumber,
+ const OFString& contentLabel,
+ const OFString& contentDescription,
+ const OFString& contentCreatorName) :
+ m_InstanceNumber(DCM_InstanceNumber),
+ m_ContentLabel(DCM_ContentLabel),
+ m_ContentDescription(DCM_ContentDescription),
+ m_AlternateContentDescription(),
+ m_ContentCreatorName(DCM_ContentCreatorName),
+ m_ContentCreatorIdentificationCode(),
+ m_IODRules()
+{
+ resetRules();
+ setInstanceNumber(instanceNumber);
+ setContentLabel(contentLabel);
+ setContentDescription(contentDescription);
+ setContentCreatorName(contentCreatorName);
+}
+
+
void ContentIdentificationMacro::resetRules()
{
- m_IODRules.addRule(new IODRule(DCM_InstanceNumber, "1", "1", "ContentIdentificationMacro", DcmIODTypes::IE_INSTANCE), OFTrue);
- m_IODRules.addRule(new IODRule(DCM_ContentLabel, "1", "1", "ContentIdentificationMacro", DcmIODTypes::IE_INSTANCE), OFTrue);
- m_IODRules.addRule(new IODRule(DCM_ContentDescription, "1", "2", "ContentIdentificationMacro", DcmIODTypes::IE_INSTANCE), OFTrue);
- m_IODRules.addRule(new IODRule(DCM_ContentCreatorName, "1", "2", "ContentIdentificationMacro", DcmIODTypes::IE_INSTANCE), OFTrue);
- m_IODRules.addRule(new IODRule(DCM_AlternateContentDescriptionSequence, "1-n", "3", "ContentIdentificationMacro", DcmIODTypes::IE_INSTANCE), OFTrue);
- m_IODRules.addRule(new IODRule(DCM_ContentCreatorIdentificationCodeSequence, "1", "3", "ContentIdentificationMacro", DcmIODTypes::IE_INSTANCE), OFTrue);
+ m_IODRules.addRule(new IODRule(DCM_InstanceNumber, "1", "1", getName(), DcmIODTypes::IE_INSTANCE), OFTrue);
+ m_IODRules.addRule(new IODRule(DCM_ContentLabel, "1", "1", getName(), DcmIODTypes::IE_INSTANCE), OFTrue);
+ m_IODRules.addRule(new IODRule(DCM_ContentDescription, "1", "2", getName(), DcmIODTypes::IE_INSTANCE), OFTrue);
+ m_IODRules.addRule(new IODRule(DCM_ContentCreatorName, "1", "2", getName(), DcmIODTypes::IE_INSTANCE), OFTrue);
+ m_IODRules.addRule(new IODRule(DCM_AlternateContentDescriptionSequence, "1-n", "3", getName(), DcmIODTypes::IE_INSTANCE), OFTrue);
+ m_IODRules.addRule(new IODRule(DCM_ContentCreatorIdentificationCodeSequence, "1", "3", getName(), DcmIODTypes::IE_INSTANCE), OFTrue);
+}
+
+
+OFString ContentIdentificationMacro::getName() const
+{
+ return "ContentIdentificationMacro";
}
@@ -1234,6 +1518,42 @@ ContentIdentificationMacro::ContentIdentificationMacro(const ContentIdentificati
}
+OFCondition ContentIdentificationMacro::create(const OFString& instanceNumber,
+ const OFString& contentLabel,
+ const OFString& contentDescription,
+ const OFString& contentCreatorName,
+ ContentIdentificationMacro*& result)
+{
+ result = new ContentIdentificationMacro();
+ if (!result)
+ return EC_MemoryExhausted;
+ OFCondition cond = result->setInstanceNumber(instanceNumber);
+ if (cond.good())
+ {
+ cond = result->setContentLabel(contentLabel);
+ }
+ if (cond.good())
+ {
+ cond = result->setContentDescription(contentDescription);
+ }
+ if (cond.good())
+ {
+ cond = result->setContentCreatorName(contentCreatorName);
+ }
+ if (cond.good())
+ {
+ cond = result->check();
+ }
+ if (cond.bad())
+ {
+ delete result;
+ result = NULL;
+ }
+ return cond;
+}
+
+
+
ContentIdentificationMacro& ContentIdentificationMacro::operator=(const ContentIdentificationMacro& rhs)
{
if (&rhs != this)
@@ -1605,9 +1925,9 @@ OFString HL7HierarchicDesignatorMacro::getName() const
void HL7HierarchicDesignatorMacro::resetRules()
{
// parameters are tag, VM, type. Overwrite old rules if any.
- m_Rules->addRule(new IODRule(DCM_UniversalEntityID, "1","1C", "HL7HierarchicDesignatorMacro", DcmIODTypes::IE_UNDEFINED), OFTrue);
- m_Rules->addRule(new IODRule(DCM_LocalNamespaceEntityID, "1","1C", "HL7HierarchicDesignatorMacro", DcmIODTypes::IE_UNDEFINED), OFTrue);
- m_Rules->addRule(new IODRule(DCM_UniversalEntityIDType, "1","1C", "HL7HierarchicDesignatorMacro", DcmIODTypes::IE_UNDEFINED), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_UniversalEntityID, "1","1C", "getName()", DcmIODTypes::IE_UNDEFINED), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_LocalNamespaceEntityID, "1","1C", "getName()", DcmIODTypes::IE_UNDEFINED), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_UniversalEntityIDType, "1","1C", "getName()", DcmIODTypes::IE_UNDEFINED), OFTrue);
}
@@ -1637,9 +1957,9 @@ OFCondition HL7HierarchicDesignatorMacro::setUniversalEntityIDType(const OFStrin
}
-
// -------------------- Mandatory View and Slice Progression Direction Macro --------------------
+
MandatoryViewAndSliceProgressionDirectionMacro::MandatoryViewAndSliceProgressionDirectionMacro(OFshared_ptr< DcmItem > item,
OFshared_ptr< IODRules > rules,
IODComponent* parent)
@@ -1665,9 +1985,9 @@ OFString MandatoryViewAndSliceProgressionDirectionMacro::getName() const
void MandatoryViewAndSliceProgressionDirectionMacro::resetRules()
{
- m_Rules->addRule(new IODRule(DCM_ViewCodeSequence, "1","1", "MandatoryViewAndSliceProgressionDirectionMacro", DcmIODTypes::IE_UNDEFINED), OFTrue);
- m_Rules->addRule(new IODRule(DCM_ViewModifierCodeSequence, "1-n","2C", "MandatoryViewAndSliceProgressionDirectionMacro", DcmIODTypes::IE_UNDEFINED), OFTrue);
- m_Rules->addRule(new IODRule(DCM_SliceProgressionDirection, "1","1C", "MandatoryViewAndSliceProgressionDirectionMacro", DcmIODTypes::IE_UNDEFINED), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_ViewCodeSequence, "1","1", getName(), DcmIODTypes::IE_UNDEFINED), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_ViewModifierCodeSequence, "1-n","2C", getName(), DcmIODTypes::IE_UNDEFINED), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_SliceProgressionDirection, "1","1C", getName(), DcmIODTypes::IE_UNDEFINED), OFTrue);
}
@@ -1679,7 +1999,6 @@ void MandatoryViewAndSliceProgressionDirectionMacro::clearData()
}
-
OFCondition MandatoryViewAndSliceProgressionDirectionMacro::read(DcmItem& source,
const OFBool clearOldData)
{
diff --git a/dcmiod/libsrc/iodreferences.cc b/dcmiod/libsrc/iodreferences.cc
new file mode 100755
index 0000000..8294c5c
--- /dev/null
+++ b/dcmiod/libsrc/iodreferences.cc
@@ -0,0 +1,534 @@
+/*
+ *
+ * Copyright (C) 2016, Open Connections GmbH
+ * All rights reserved. See COPYRIGHT file for details.
+ *
+ * This software and supporting documentation are maintained by
+ *
+ * OFFIS e.V.
+ * R&D Division Health
+ * Escherweg 2
+ * D-26121 Oldenburg, Germany
+ *
+ *
+ * Module: dcmiod
+ *
+ * Author: Michael Onken
+ *
+ * Purpose: Class for managing SOP references as used in different modules
+ *
+ */
+
+#include "dcmtk/config/osconfig.h"
+#include "dcmtk/dcmiod/iodtypes.h"
+#include "dcmtk/dcmiod/iodreferences.h"
+#include "dcmtk/dcmiod/iodutil.h"
+#include "dcmtk/dcmdata/dcerror.h"
+#include "dcmtk/dcmdata/dcdatset.h"
+#include "dcmtk/dcmdata/dcvrui.h"
+#include "dcmtk/dcmdata/dcvrlo.h"
+#include "dcmtk/dcmdata/dcdeftag.h"
+#include "dcmtk/dcmdata/dcfilefo.h"
+
+
+// ------------------- class IODReference -------------------------------
+
+IODReference::IODReference(const IODReference::MAX_LEVEL level)
+: m_Level(level)
+{
+}
+
+
+IODReference::IODReference()
+: m_Level(LEVEL_STUDY)
+{
+}
+
+IODReference::~IODReference()
+{
+ // nothing to do
+}
+
+
+
+void IODReference::clear()
+{
+ m_StudyInstanceUID.clear();
+ m_SeriesInstanceUID.clear();
+ m_SOPClassUID.clear();
+ m_SOPInstanceUID.clear();
+}
+
+
+OFBool IODReferences::add(IODReference* ref)
+{
+ if (ref->check().good())
+ {
+ m_References.push_back(ref);
+ return OFTrue;
+ }
+ return OFFalse;
+}
+
+
+OFBool IODReference::readFromItem(DcmItem& item)
+{
+ if (m_Level >= LEVEL_PATIENT)
+ {
+ item.findAndGetOFString(DCM_PatientID, m_PatientID);
+ }
+ if (m_Level >= LEVEL_STUDY)
+ {
+ item.findAndGetOFString(DCM_StudyInstanceUID, m_StudyInstanceUID);
+ }
+ if (m_Level >= LEVEL_SERIES)
+ {
+ item.findAndGetOFString(DCM_SeriesInstanceUID, m_SeriesInstanceUID);
+ }
+ if (m_Level >= LEVEL_INSTANCE)
+ {
+ item.findAndGetOFString(DCM_SOPClassUID, m_SOPClassUID);
+ item.findAndGetOFString(DCM_SOPInstanceUID, m_SOPInstanceUID);
+ }
+ return check().good();
+}
+
+
+OFBool IODReference::readFromFile(const OFString& filename)
+{
+ clear();
+ DcmFileFormat ff;
+ OFCondition result = ff.loadFile(filename.c_str());
+ if (result.good())
+ {
+ DcmDataset* dset = ff.getDataset();
+ return readFromItem(*dset);
+ }
+ return OFFalse;
+}
+
+
+OFCondition IODReferences::readTractographyReferencedInstanceSequence(DcmItem& source)
+{
+ size_t omitted = 0;
+ size_t added = 0;
+ DcmSequenceOfItems *seq = NULL;
+ OFCondition result = source.findAndGetSequence(DCM_ReferencedInstanceSequence, seq);
+ if (result.good())
+ {
+ DcmItem* item = NULL;
+ item = OFstatic_cast(DcmItem*, seq->nextInContainer(item));
+ while ( (item != NULL) && result.good() )
+ {
+ IODImageReference* ref = new IODImageReference(IODReference::LEVEL_INSTANCE);
+ if (!ref)
+ {
+ return EC_MemoryExhausted;
+ }
+ item->findAndGetOFString(DCM_ReferencedSOPClassUID, ref->m_SOPClassUID);
+ item->findAndGetOFString(DCM_ReferencedSOPInstanceUID, ref->m_SOPInstanceUID);
+ // if present, copy referenced frame numbers
+ DcmElement* elem = NULL;
+ if (item->findAndGetElement(DCM_ReferencedFrameNumber, elem).good())
+ {
+ Uint32 vm = elem->getVM();
+ for (Uint32 f = 0; f < vm; f++)
+ {
+ Sint32 val = 0;
+ if (elem->getSint32(val, f).good())
+ {
+ if (val >= 0)
+ ref->m_ReferencedFrameNumber.push_back( OFstatic_cast(Uint32, val) );
+ else
+ {
+ DCMIOD_WARN("Referenced Frame Number must be > 0 but is " << val << ", omitting frame reference");
+ }
+ }
+ else
+ {
+ DCMIOD_WARN("Cannot get Referenced Frame Number from position #" << f << " omitting frame reference");
+ }
+ }
+ }
+ result = ref->check();
+ if (result.good())
+ {
+ added++;
+ m_References.push_back(ref);
+ }
+ else
+ {
+ DCMIOD_WARN("Could not read Image reference (invalid?): " << (*ref).toString());
+ omitted++;
+ delete ref;
+ ref = NULL;
+ }
+ item = OFstatic_cast(DcmItem*, seq->nextInContainer(item));
+ }
+ }
+ if ( (omitted > 0) && (added > 0) )
+ {
+ return IOD_EC_ReferencesOmitted;
+ }
+ else if (omitted > 0)
+ {
+ return IOD_EC_InvalidReference;
+ }
+ return EC_Normal;
+}
+
+
+
+OFCondition IODReferences::writeTractographyReferencedInstanceSequence(DcmItem& item)
+{
+ OFVector<IODReference*>::iterator it = m_References.begin();
+ item.findAndDeleteElement(DCM_ReferencedInstanceSequence);
+ DcmItem *seqItem = NULL;
+ size_t numItem = 0;
+ OFCondition result;
+ while ( (it != m_References.end() && result.good()) )
+ {
+ if (result.good())
+ {
+ result = item.findOrCreateSequenceItem(DCM_ReferencedInstanceSequence, seqItem, numItem);
+ numItem++;
+ }
+ if (result.good())
+ {
+ result = seqItem->putAndInsertOFStringArray(DCM_ReferencedSOPClassUID, (*it)->m_SOPClassUID);
+ }
+ if (result.good()) result = seqItem->putAndInsertOFStringArray(DCM_ReferencedSOPInstanceUID, (*it)->m_SOPInstanceUID);
+ if (result.good())
+ {
+ if ( (*it)->getType() == IODReference::IMAGE )
+ {
+ if (result.good())
+ {
+ IODImageReference* ref = OFstatic_cast(IODImageReference*, *it);
+ if (ref && !ref->m_ReferencedFrameNumber.empty())
+ {
+ OFStringStream oss;
+ for (size_t f = 0; f < ref->m_ReferencedFrameNumber.size(); f++)
+ {
+ oss << ref->m_ReferencedFrameNumber[f] << "\\";
+ }
+ OFSTRINGSTREAM_GETOFSTRING(oss, frameRefs)
+ // Insert all references into Referenced Frame Number attribute.
+ // Remove superfluous "\" at the end of the string.
+ result = seqItem->putAndInsertOFStringArray(DCM_ReferencedFrameNumber, frameRefs.substr(0, frameRefs.size() - 1));
+ }
+ }
+ }
+ }
+ it++;
+ }
+ if (result.bad())
+ {
+ item.findAndDeleteElement(DCM_ReferencedInstanceSequence);
+ }
+ return result;
+}
+
+
+OFString IODReference::toString() const
+{
+ char buf[400];
+ sprintf(buf, "Study/Series/SOPClass/SOPInstance UIDs: %s/%s/%s/%s", m_StudyInstanceUID.c_str(), m_SeriesInstanceUID.c_str(), m_SOPClassUID.c_str(), m_SOPInstanceUID.c_str());
+ return buf;
+}
+
+
+OFCondition IODReference::check() const
+{
+ OFCondition result;
+ if (m_Level >= LEVEL_PATIENT)
+ {
+ if (!m_PatientID.empty())
+ {
+ result = DcmLongString::checkStringValue(m_PatientID);
+ }
+ else
+ {
+ result = IOD_EC_InvalidElementValue;
+ }
+ }
+ if (result.good() && (m_Level >= LEVEL_STUDY))
+ {
+ if (!m_StudyInstanceUID.empty())
+ {
+ result= DcmUniqueIdentifier::checkStringValue(m_StudyInstanceUID, "1");
+ }
+ else
+ {
+ result = IOD_EC_InvalidElementValue;
+ }
+ }
+ if (result.good() && (m_Level >= LEVEL_SERIES))
+ {
+ if (!m_SeriesInstanceUID.empty())
+ {
+ result = DcmUniqueIdentifier::checkStringValue(m_SeriesInstanceUID, "1");
+ }
+ else
+ {
+ result = IOD_EC_InvalidElementValue;
+ }
+ }
+ if (result.good() && (m_Level >= LEVEL_INSTANCE))
+ {
+ if (!m_SOPClassUID.empty())
+ {
+ result = DcmUniqueIdentifier::checkStringValue(m_SOPClassUID, "1");
+ }
+ else
+ {
+ result = IOD_EC_InvalidElementValue;
+ }
+ }
+ if (result.good() && (m_Level >= LEVEL_INSTANCE))
+ {
+ if (!m_SOPInstanceUID.empty())
+ {
+ result = DcmUniqueIdentifier::checkStringValue(m_SOPInstanceUID, "1");
+ }
+ else
+ {
+ result = IOD_EC_InvalidElementValue;
+ }
+ }
+ return result;
+}
+
+
+IODReference* IODReference::clone() const
+{
+ IODReference* ref = new IODReference();
+ if (ref)
+ {
+ ref->m_PatientID = m_PatientID;
+ ref->m_StudyInstanceUID = m_StudyInstanceUID;
+ ref->m_SeriesInstanceUID = m_SeriesInstanceUID;
+ ref->m_SOPClassUID = m_SOPClassUID;
+ ref->m_SOPInstanceUID = m_SOPInstanceUID;
+ ref->m_Level = m_Level;
+ }
+ return ref;
+}
+
+
+// ------------------- class IODImageReference -------------------------------
+
+
+IODImageReference::IODImageReference(const IODReference::MAX_LEVEL level)
+: IODReference(level)
+{
+}
+
+IODImageReference::IODImageReference()
+: IODReference(LEVEL_INSTANCE)
+{
+
+}
+
+
+IODImageReference::IODImageReference(const OFString& patientID,
+ const OFString& studyUID,
+ const OFString& seriesUID,
+ const OFString& sopInstanceUID,
+ const OFString& sopClassUID,
+ const OFVector<Uint32>& refFrameNumbers)
+{
+ m_PatientID = patientID;
+ m_StudyInstanceUID = studyUID;
+ m_SeriesInstanceUID = seriesUID;
+ m_SOPInstanceUID = sopInstanceUID;
+ m_SOPClassUID = sopClassUID;
+ m_ReferencedFrameNumber = refFrameNumbers;
+}
+
+
+IODImageReference::IODImageReference(const OFString& patientID,
+ const OFString& studyUID,
+ const OFString& seriesUID,
+ const OFString& sopInstanceUID,
+ const OFString& sopClassUID)
+{
+ m_PatientID = patientID;
+ m_StudyInstanceUID = studyUID;
+ m_SeriesInstanceUID = seriesUID;
+ m_SOPInstanceUID = sopInstanceUID;
+ m_SOPClassUID = sopClassUID;
+}
+
+
+
+IODReference* IODImageReference::clone() const
+{
+ IODImageReference* ref = new IODImageReference(m_Level);
+ if (ref)
+ {
+ *(OFstatic_cast(IODReference*, ref)) = *this;
+ ref->m_ReferencedFrameNumber = m_ReferencedFrameNumber;
+ }
+ return ref;
+}
+
+
+void IODImageReference::clear()
+{
+ IODReference::clear();
+ m_ReferencedFrameNumber.clear();
+}
+
+
+OFBool IODImageReference::readFromFile(const OFString& filename,
+ const OFVector< Uint32 > frameNumbers)
+{
+ clear();
+ DcmFileFormat ff;
+ OFCondition result = ff.loadFile(filename.c_str());
+ if (result.good())
+ {
+ if ( readFromItem( *ff.getDataset() ) )
+ {
+ m_ReferencedFrameNumber = frameNumbers;
+ return OFTrue;
+ }
+ }
+ return OFFalse;
+}
+
+
+// ------------------ class IODSegmentationReference ---------------------------
+
+IODSegmentationReference::IODSegmentationReference(const IODReference::MAX_LEVEL level)
+: IODReference(level)
+{
+}
+
+
+IODSegmentationReference::IODSegmentationReference()
+: IODReference(LEVEL_INSTANCE)
+{
+
+}
+
+
+IODReference* IODSegmentationReference::clone() const
+{
+ IODSegmentationReference* ref = new IODSegmentationReference(m_Level);
+ if (ref)
+ {
+ *(OFstatic_cast(IODReference*, ref)) = *this;
+ ref->m_ReferencedSegmentNumber = m_ReferencedSegmentNumber;
+ }
+ return ref;
+}
+
+
+OFBool IODSegmentationReference::readFromFile(const OFString& filename,
+ const OFVector< Uint16 > segmentNumbers)
+{
+ clear();
+ DcmFileFormat ff;
+ OFCondition result = ff.loadFile(filename.c_str());
+ if (result.good())
+ {
+ if ( readFromItem(*ff.getDataset()) )
+ {
+ m_ReferencedSegmentNumber = segmentNumbers;
+ return OFTrue;
+ }
+ }
+ return OFFalse;
+}
+
+
+void IODSegmentationReference::clear()
+{
+ IODReference::clear();
+ m_ReferencedSegmentNumber.clear();
+}
+
+
+
+IODReferences::IODReferences()
+{
+ // nothing to do
+}
+
+
+IODReferences::~IODReferences()
+{
+ DcmIODUtil::freeContainer(m_References);
+}
+
+
+IODReferences::IODReferences(const IODReferences& rhs)
+{
+ *this = rhs;
+}
+
+
+IODReferences & IODReferences::operator=(const IODReferences& rhs)
+{
+ if (&rhs == this)
+ return *this;
+
+ OFVector<IODReference*>::const_iterator ref = rhs.m_References.begin();
+ while (ref != rhs.m_References.end())
+ {
+ m_References.push_back( (*ref)->clone());
+ ref++;
+ }
+ return *this;
+}
+
+
+
+const OFVector<IODReference*>& IODReferences::get() const
+{
+ return m_References;
+}
+
+
+size_t IODReferences::size() const
+{
+ return m_References.size();
+}
+
+
+size_t IODReferences::addFromFiles(const OFVector< OFString >& dcmFiles,
+ const IODReference::MAX_LEVEL level)
+{
+ if (dcmFiles.empty())
+ {
+ return 0;
+ }
+
+ OFCondition result;
+ OFVector<OFString>::const_iterator it = dcmFiles.begin();
+ size_t count = 0;
+ while (it != dcmFiles.end())
+ {
+ IODReference* ref = new IODReference(level);
+ if (ref && ref->readFromFile(*it))
+ {
+ m_References.push_back(ref);
+ count++;
+ }
+ else
+ {
+ DCMIOD_WARN("Could not add references from file " << (*it) << " (skipping)");
+ delete ref;
+ }
+ it++;
+ }
+ return count;
+}
+
+
+void IODReferences::clearData()
+{
+ DcmIODUtil::freeContainer(m_References);
+}
diff --git a/dcmiod/libsrc/iodrules.cc b/dcmiod/libsrc/iodrules.cc
index 0d0bc07..d9df261 100644
--- a/dcmiod/libsrc/iodrules.cc
+++ b/dcmiod/libsrc/iodrules.cc
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2015, Open Connections GmbH
+ * Copyright (C) 2015-2016, Open Connections GmbH
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation are maintained by
@@ -257,6 +257,58 @@ DcmIODTypes::IOD_IE IODRule::getIE() const
}
+OFBool IODRule::setType(const OFString& val)
+{
+ if ( (val != "1") && (val != "1C") && (val != "2") && (val != "2C") && (val != "3") )
+ {
+ return OFFalse;
+ }
+ m_Type = val;
+ return OFTrue;
+}
+
+
+OFBool IODRule::setModule(const OFString& val)
+{
+ if (val.empty())
+ {
+ return OFFalse;
+ }
+ m_Module = val;
+ return OFTrue;
+}
+
+
+
+OFBool IODRule::setPrivateCreator(const OFString& val)
+{
+ if (val.empty())
+ {
+ return OFFalse;
+ }
+ m_PrivateCreator = val;
+ return OFTrue;
+}
+
+
+OFBool IODRule::setDefaultValue(const OFString& val)
+{
+ if (val.empty())
+ {
+ return OFFalse;
+ }
+ m_DefaultValue = val;
+ return OFTrue;
+}
+
+
+OFBool IODRule::setVM(const OFString& val)
+{
+ // One could check whether this is a valid VM string...
+ m_VM = val;
+ return OFTrue;
+}
+
OFCondition IODRule::check(DcmItem& item,
const OFBool quiet)
@@ -281,7 +333,12 @@ OFCondition IODRule::check(DcmItem& item,
}
} else {
const OFCondition checkResult = elem->checkValue(m_VM, OFTrue /*oldFormat*/);
- if (checkResult == EC_ValueRepresentationViolated)
+ if (checkResult == EC_InvalidCharacter)
+ {
+ if (!quiet) DCMIOD_WARN(tagName << " " << m_Key << " contains invalid character(s) in " << m_Module);
+ result = checkResult;
+ }
+ else if (checkResult == EC_ValueRepresentationViolated)
{
if (!quiet) DCMIOD_WARN(tagName << " " << m_Key << " violates VR definition in " << m_Module);
result = checkResult;
diff --git a/dcmiod/libsrc/iodtypes.cc b/dcmiod/libsrc/iodtypes.cc
index 0fe15ca..74dc4d9 100644
--- a/dcmiod/libsrc/iodtypes.cc
+++ b/dcmiod/libsrc/iodtypes.cc
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2015, Open Connections GmbH
+ * Copyright (C) 2015-2016, Open Connections GmbH
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation are maintained by
@@ -42,3 +42,5 @@ makeOFConditionConst(IOD_EC_CannotDecompress, OFM_dcmiod, 8, OF_error, "Ca
makeOFConditionConst(IOD_EC_NoSuchRule, OFM_dcmiod, 9, OF_error, "No such IOD rule");
makeOFConditionConst(IOD_EC_InvalidLaterality, OFM_dcmiod, 10, OF_error, "Invalid value for 'Laterality' (only 'L' or 'R' permitted)");
makeOFConditionConst(IOD_EC_InvalidElementValue, OFM_dcmiod, 11, OF_error, "Value not allowed for element");
+makeOFConditionConst(IOD_EC_InvalidReference, OFM_dcmiod, 12, OF_error, "One or more invalid SOP references");
+makeOFConditionConst(IOD_EC_ReferencesOmitted, OFM_dcmiod, 13, OF_error, "One or more SOP references have been omitted");
diff --git a/dcmiod/libsrc/iodutil.cc b/dcmiod/libsrc/iodutil.cc
index 721334f..78e95d1 100644
--- a/dcmiod/libsrc/iodutil.cc
+++ b/dcmiod/libsrc/iodutil.cc
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2015, Open Connections GmbH
+ * Copyright (C) 2015-2016, Open Connections GmbH
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation are maintained by
@@ -36,7 +36,6 @@
#include "dcmtk/dcmdata/dcitem.h"
-
// --- static helpers ---
OFCondition DcmIODUtil::getAndCheckElementFromDataset(DcmItem &dataset,
@@ -166,33 +165,38 @@ OFCondition DcmIODUtil::addElementToDataset(OFCondition &result,
{
delem = newDicomElement(rule->getTagKey());
if (delem == NULL)
- return EC_MemoryExhausted;
+ {
+ result = EC_MemoryExhausted;
+ return result;
+ };
} else if (type != "1")
{
- // Not type 1 or type 2 means the is type 1C,2C or 3. For those it is
+ // Not type 1 or type 2 means the is type 1C, 2C or 3. For those it is
// fine to not insert anything
return EC_Normal;
}
else
{
// type 1 is missing
- DCMIOD_WARN(DcmTag(rule->getTagKey()).getTagName() << " " << rule->getTagKey() << " absent in " << rule->getModule() << " (type " << rule->getType() << ")");
- return IOD_EC_MissingAttribute;
+ DCMIOD_ERROR(DcmTag(rule->getTagKey()).getTagName() << " " << rule->getTagKey() << " absent in " << rule->getModule() << " (type " << rule->getType() << ")");
+ result = IOD_EC_MissingAttribute;
+ return result;
}
}
-
- // We have an element at this position, check its value
+ // At this point, we certainly have an element. Check its value (empty ok for type 2)
if ((type == "2") || !delem->isEmpty())
{
- /* insert non-empty element or empty "type 2" element */
- result = dataset.insert(delem, OFTrue /*replaceOld*/);
- checkElementValue(*delem, rule->getVM(), type, result, rule->getModule().c_str());
+ result = checkElementValue(*delem, rule->getVM(), type, result, rule->getModule().c_str());
+ // Insert non-empty element or empty "type 2" element
if (result.good())
- insertionOK = OFTrue;
+ {
+ result = dataset.insert(delem, OFTrue /*replaceOld*/);
+ if (result.good()) insertionOK = OFTrue;
+ }
}
else if (type == "1")
{
- /* empty element value not allowed for "type 1" */
+ // Empty element value not allowed for "type 1"
result = EC_InvalidValue;
checkElementValue(*delem, rule->getVM(), type, result, rule->getModule().c_str());
}
@@ -249,7 +253,7 @@ OFCondition DcmIODUtil::checkElementValue(const DcmElement *delem,
DCMIOD_WARN(tagName << " " << tagKey << " absent in " << module << " (type " << type << ")");
result = IOD_EC_MissingAttribute;
}
- else if ((delem == NULL) || OFconst_cast(DcmElement*, delem)->isEmpty(OFTrue /*normalize*/)) // cast away constness of delem; value modification can happpen (eg. to remove padding)
+ else if ((delem == NULL) || OFconst_cast(DcmElement*, delem)->isEmpty(OFTrue /*normalize*/)) // cast away constness of delem; value modification can happen (eg. to remove padding)
{
/* however, type 1C should never be present with empty value */
if (((type == "1") || (type == "1C")) && searchCond.good())
@@ -258,8 +262,12 @@ OFCondition DcmIODUtil::checkElementValue(const DcmElement *delem,
result = EC_MissingValue;
}
} else {
- result = OFconst_cast(DcmElement*, delem)->checkValue(vm, OFTrue /*oldFormat*/); // cast away constness of delem; value modification can happpen (eg. to remove padding)
- if (result == EC_ValueRepresentationViolated)
+ result = OFconst_cast(DcmElement*, delem)->checkValue(vm, OFTrue /*oldFormat*/); // cast away constness of delem; value modification can happen (eg. to remove padding)
+ if (result == EC_InvalidCharacter)
+ {
+ DCMIOD_WARN(tagName << " " << tagKey << " contains invalid character(s) in " << module);
+ }
+ else if (result == EC_ValueRepresentationViolated)
{
DCMIOD_WARN(tagName << " " << tagKey << " violates VR definition in " << module);
}
@@ -298,7 +306,7 @@ OFCondition DcmIODUtil::getStringValueFromElement(const DcmElement &delem,
const signed long pos)
{
OFCondition result = EC_Normal;
- // cast away constness of delem; value modification can happpen (eg. to remove padding)
+ // cast away constness of delem; value modification can happen (eg. to remove padding)
if (pos < 0)
result = OFconst_cast(DcmElement &, delem).getOFStringArray(stringValue);
else
@@ -473,7 +481,7 @@ OFCondition DcmIODUtil::getAndCheckSingleItem(DcmSequenceOfItems& seq,
item = seq.getItem(0);
if (item == NULL)
{
- DCMIOD_ERROR("Cannot read item from " << tagName << ": No item found (internal errror)");
+ DCMIOD_ERROR("Cannot read item from " << tagName << ": No item found (internal error)");
return EC_CorruptedData;
}
return EC_Normal;
@@ -566,4 +574,4 @@ OFString DcmIODUtil::createUID(const Uint8 level)
default: dcmGenerateUniqueIdentifier(uid, SITE_STUDY_UID_ROOT);
}
return uid;
-}
\ No newline at end of file
+}
diff --git a/dcmiod/libsrc/modacquisitioncontext.cc b/dcmiod/libsrc/modacquisitioncontext.cc
index b5601cc..ceedbb2 100644
--- a/dcmiod/libsrc/modacquisitioncontext.cc
+++ b/dcmiod/libsrc/modacquisitioncontext.cc
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2015, Open Connections GmbH
+ * Copyright (C) 2015-2016, Open Connections GmbH
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation are maintained by
@@ -53,7 +53,7 @@ OFString IODAcquisitionContextModule::getName() const
void IODAcquisitionContextModule::resetRules()
{
// parameters are tag, VM, type. Overwrite old rules if any.
- m_Rules->addRule(new IODRule(DCM_AcquisitionContextSequence, "1-n","2", m_ModuleName, DcmIODTypes::IE_INSTANCE), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_AcquisitionContextSequence, "1-n","2", getName(), DcmIODTypes::IE_INSTANCE), OFTrue);
}
diff --git a/dcmiod/libsrc/modbase.cc b/dcmiod/libsrc/modbase.cc
index d0a208f..4368674 100644
--- a/dcmiod/libsrc/modbase.cc
+++ b/dcmiod/libsrc/modbase.cc
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2015, Open Connections GmbH
+ * Copyright (C) 2015-2016, Open Connections GmbH
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation are maintained by
@@ -24,6 +24,7 @@
#include "dcmtk/dcmdata/dcitem.h"
#include "dcmtk/dcmiod/iodutil.h"
#include "dcmtk/dcmiod/iodrules.h"
+#include "dcmtk/dcmdata/dcdeftag.h"
IODComponent::IODComponent(OFshared_ptr<DcmItem> item,
@@ -127,13 +128,25 @@ void IODComponent::clearData()
}
+void IODComponent::makeOptional()
+{
+ OFVector<IODRule*> modRules = m_Rules->getByModule(getName());
+ OFVector<IODRule*>::iterator rule = modRules.begin();
+ while (rule != modRules.end())
+ {
+ (*rule)->setType("3");
+ rule++;
+ }
+}
+
+
OFCondition IODComponent::read(DcmItem& source,
OFBool clearOldData)
{
// Debug
DCMIOD_DEBUG("Reading component: " << getName());
- // Clear old data if desried
+ // Clear old data if desired
if (clearOldData)
{
clearData();
diff --git a/dcmiod/libsrc/modcommoninstanceref.cc b/dcmiod/libsrc/modcommoninstanceref.cc
index 78e6a10..921e9fb 100644
--- a/dcmiod/libsrc/modcommoninstanceref.cc
+++ b/dcmiod/libsrc/modcommoninstanceref.cc
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2015, Open Connections GmbH
+ * Copyright (C) 2015-2016, Open Connections GmbH
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation are maintained by
@@ -61,6 +61,12 @@ OFVector< IODSeriesAndInstanceReferenceMacro::ReferencedSeriesItem* >& IODCommon
}
+OFVector<IODCommonInstanceReferenceModule::StudiesOtherInstancesItem *> & IODCommonInstanceReferenceModule::getStudiesContainingOtherReferences()
+{
+ return m_StudiesContainingOtherReferencedInstancesSequence;
+}
+
+
void IODCommonInstanceReferenceModule::clearData()
{
DcmIODUtil::freeContainer(m_StudiesContainingOtherReferencedInstancesSequence);
@@ -68,17 +74,18 @@ void IODCommonInstanceReferenceModule::clearData()
}
+
OFCondition IODCommonInstanceReferenceModule::read(DcmItem& source,
const OFBool clearOldData)
{
if (clearOldData)
clearData();
- DcmIODUtil::readSubSequence<OFVector<IODSeriesAndInstanceReferenceMacro::ReferencedSeriesItem*> >(source, DCM_ReferencedSeriesSequence, m_ReferenceSeriesItems, m_Rules->getByTag(DCM_ReferencedSeriesSequence));
- DcmIODUtil::readSubSequence<OFVector<StudiesOtherInstancesItem*> >(source,
- DCM_StudiesContainingOtherReferencedInstancesSequence,
- m_StudiesContainingOtherReferencedInstancesSequence,
- m_Rules->getByTag(DCM_StudiesContainingOtherReferencedInstancesSequence));
+ DcmIODUtil::readSubSequence(source, DCM_ReferencedSeriesSequence, m_ReferenceSeriesItems, m_Rules->getByTag(DCM_ReferencedSeriesSequence));
+ DcmIODUtil::readSubSequence(source,
+ DCM_StudiesContainingOtherReferencedInstancesSequence,
+ m_StudiesContainingOtherReferencedInstancesSequence,
+ m_Rules->getByTag(DCM_StudiesContainingOtherReferencedInstancesSequence));
return EC_Normal;
}
@@ -88,21 +95,162 @@ OFCondition IODCommonInstanceReferenceModule::write(DcmItem& destination)
{
OFCondition result = EC_Normal;
- DcmIODUtil::writeSubSequence<OFVector<IODSeriesAndInstanceReferenceMacro::ReferencedSeriesItem*> >(result, DCM_ReferencedSeriesSequence, m_ReferenceSeriesItems, destination, m_Rules->getByTag(DCM_ReferencedSeriesSequence));
+ DcmIODUtil::writeSubSequence<OFVector<IODSeriesAndInstanceReferenceMacro::ReferencedSeriesItem*> >(result, DCM_ReferencedSeriesSequence, m_ReferenceSeriesItems, *m_Item, m_Rules->getByTag(DCM_ReferencedSeriesSequence));
DcmIODUtil::writeSubSequence<OFVector<StudiesOtherInstancesItem*> >(result,
DCM_StudiesContainingOtherReferencedInstancesSequence,
m_StudiesContainingOtherReferencedInstancesSequence,
*m_Item,
m_Rules->getByTag(DCM_StudiesContainingOtherReferencedInstancesSequence));
+ if (result.good()) result = IODModule::write(destination);
return result;
}
+size_t IODCommonInstanceReferenceModule::addReferences(
+ const IODReferences& references,
+ const OFString& studyInstanceUID,
+ const OFBool clearOldData)
+{
+ if (clearOldData)
+ {
+ clearData();
+ }
+ OFString ourStudy = studyInstanceUID;
+ if (ourStudy.empty())
+ {
+ m_Item->findAndGetOFString(DCM_StudyInstanceUID, ourStudy);
+ if (ourStudy.empty())
+ {
+ DCMIOD_ERROR("Could not add references: No Study Instance UID specified for \"this\" object");
+ return 0;
+ }
+ }
+
+ const OFVector<IODReference*> refs = references.get();
+ OFVector<IODReference*>::const_iterator ref = refs.begin();
+ size_t count = 0;
+ while (ref != refs.end())
+ {
+ OFCondition result;
+ // If reference belongs into "this" study, add it to Referenced Series Sequence
+ OFString refStudy = (*ref)->m_StudyInstanceUID;
+ if ( refStudy == ourStudy )
+ {
+ result = addSeriesReference(m_ReferenceSeriesItems, **ref);
+ }
+ else
+ {
+ // Reference lies outside of "this" study, put it into Studies Containing
+ // Other Referenced Instances Sequence
+ OFVector<StudiesOtherInstancesItem*>::iterator it = m_StudiesContainingOtherReferencedInstancesSequence.begin();
+ while (it != m_StudiesContainingOtherReferencedInstancesSequence.end())
+ {
+ OFString studyEntry;
+ (*it)->getStudyInstanceUID(studyEntry);
+ if (studyEntry == refStudy)
+ {
+ result = addSeriesReference(
+ (*it)->getReferencedSeriesAndInstanceReferences().getReferencedSeriesItems(),
+ **ref);
+ break;
+ }
+ else
+ {
+ it++;
+ }
+ }
+ // We did not find an entry for this study, add new one
+ if (it == m_StudiesContainingOtherReferencedInstancesSequence.end())
+ {
+ StudiesOtherInstancesItem* newItem = new StudiesOtherInstancesItem();
+ if (newItem)
+ {
+ result = newItem->setStudyInstanceUID(refStudy);
+ if (result.good())
+ {
+ result = addSeriesReference(newItem->getReferencedSeriesAndInstanceReferences().getReferencedSeriesItems(), **ref);
+ }
+ if (result.good())
+ {
+ m_StudiesContainingOtherReferencedInstancesSequence.push_back(newItem);
+ }
+ else
+ {
+ delete newItem;
+ }
+ }
+ else
+ {
+ DCMIOD_ERROR("Memory exhausted while adding references to Common Instance Reference Module");
+ return count;
+ }
+ }
+ }
+ if (result.good())
+ {
+ count++;
+ }
+ ref++;
+ }
+ return count;
+}
+
+
void IODCommonInstanceReferenceModule::resetRules()
{
// Parameters for Rule are tag, VM, type (1,1C,2,2C,3), module name and logical IOD level
- m_Rules->addRule(new IODRule(DCM_ReferencedSeriesSequence, "1-n", "1C", m_ComponentName, DcmIODTypes::IE_INSTANCE), OFTrue);
- m_Rules->addRule(new IODRule(DCM_StudiesContainingOtherReferencedInstancesSequence, "1-n", "1C", m_ComponentName, DcmIODTypes::IE_INSTANCE), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_ReferencedSeriesSequence, "1-n", "1C", getName(), DcmIODTypes::IE_INSTANCE), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_StudiesContainingOtherReferencedInstancesSequence, "1-n", "1C", getName(), DcmIODTypes::IE_INSTANCE), OFTrue);
+}
+
+
+
+OFCondition IODCommonInstanceReferenceModule::addSeriesReference(
+ OFVector<IODSeriesAndInstanceReferenceMacro::ReferencedSeriesItem*>& container,
+ const IODReference& ref)
+{
+ OFCondition result;
+ OFVector<IODSeriesAndInstanceReferenceMacro::ReferencedSeriesItem*>::iterator series = container.begin();
+ while ( series != container.end() )
+ {
+ OFString s;
+ (*series)->getSeriesInstanceUID(s);
+ if (s == ref.m_SeriesInstanceUID)
+ {
+ // There is already an entry for this series
+ result = (*series)->addReference(ref.m_SOPClassUID, ref.m_SOPInstanceUID);
+ if (result.good())
+ {
+ return EC_Normal;
+ }
+ else
+ {
+ DCMIOD_ERROR("Could not add reference to Common Instance Reference Module: " << ref.toString());
+ return IOD_EC_InvalidElementValue;
+ }
+ }
+ series++;
+ }
+ // If we do not have such a series Referenced Series Sequence, add it
+ if (series == container.end())
+ {
+ IODSeriesAndInstanceReferenceMacro::ReferencedSeriesItem* newseries = new IODSeriesAndInstanceReferenceMacro::ReferencedSeriesItem();
+ if (!newseries)
+ {
+ return EC_MemoryExhausted;
+ }
+ result = newseries->setSeriesInstanceUID( ref.m_SeriesInstanceUID);
+ if (result.good()) result = newseries->addReference(ref.m_SOPClassUID, ref.m_SOPInstanceUID);
+ if (result.good())
+ {
+ container.push_back(newseries);
+ }
+ else
+ {
+ DCMIOD_ERROR("Could not add reference to Common Instance Reference Module: " << ref.toString());
+ }
+ }
+ return result;
}
@@ -164,7 +312,6 @@ OFCondition IODCommonInstanceReferenceModule::StudiesOtherInstancesItem::read(Dc
OFCondition IODCommonInstanceReferenceModule::StudiesOtherInstancesItem::write(DcmItem& destination)
{
OFCondition result = EC_Normal;
-
result = IODComponent::write(destination);
if (result.good()) result = m_ReferencedSeriesAndInstance.write(destination);
@@ -176,7 +323,7 @@ OFCondition IODCommonInstanceReferenceModule::StudiesOtherInstancesItem::write(D
void IODCommonInstanceReferenceModule::StudiesOtherInstancesItem::resetRules()
{
// Parameters for Rule are tag, VM, type (1,1C,2,2C,3), module name and logical IOD level
- m_Rules->addRule(new IODRule(DCM_StudyInstanceUID, "1", "1", m_ComponentName, DcmIODTypes::IE_INSTANCE), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_StudyInstanceUID, "1", "1", getName(), DcmIODTypes::IE_INSTANCE), OFTrue);
}
diff --git a/dcmiod/libsrc/modenhequipment.cc b/dcmiod/libsrc/modenhequipment.cc
index 4f1ee33..6801c84 100644
--- a/dcmiod/libsrc/modenhequipment.cc
+++ b/dcmiod/libsrc/modenhequipment.cc
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2015, Open Connections GmbH
+ * Copyright (C) 2015-2016, Open Connections GmbH
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation are maintained by
@@ -44,12 +44,24 @@ IODEnhGeneralEquipmentModule::IODEnhGeneralEquipmentModule()
}
+OFCondition IODEnhGeneralEquipmentModule::create(const IODEnhGeneralEquipmentModule::EquipmentInfo& info,
+ IODEnhGeneralEquipmentModule* equipment)
+{
+ equipment = new IODEnhGeneralEquipmentModule();
+ if (!equipment)
+ {
+ return EC_MemoryExhausted;
+ }
+ return equipment->set(info);
+}
+
+
void IODEnhGeneralEquipmentModule::resetRules()
{
- m_Rules->addRule(new IODRule(DCM_Manufacturer, "1","1", m_ModuleName, DcmIODTypes::IE_EQUIPMENT), OFTrue);
- m_Rules->addRule(new IODRule(DCM_ManufacturerModelName, "1","1", m_ModuleName, DcmIODTypes::IE_EQUIPMENT), OFTrue);
- m_Rules->addRule(new IODRule(DCM_DeviceSerialNumber, "1","1", m_ModuleName, DcmIODTypes::IE_EQUIPMENT), OFTrue);
- m_Rules->addRule(new IODRule(DCM_SoftwareVersions, "1-n","1", m_ModuleName, DcmIODTypes::IE_EQUIPMENT), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_Manufacturer, "1","1", getName(), DcmIODTypes::IE_EQUIPMENT), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_ManufacturerModelName, "1","1", getName(), DcmIODTypes::IE_EQUIPMENT), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_DeviceSerialNumber, "1","1", getName(), DcmIODTypes::IE_EQUIPMENT), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_SoftwareVersions, "1-n","1", getName(), DcmIODTypes::IE_EQUIPMENT), OFTrue);
}
@@ -132,3 +144,17 @@ OFCondition IODEnhGeneralEquipmentModule::setSoftwareVersions(const OFString& va
result = m_Item->putAndInsertOFStringArray(DCM_SoftwareVersions, value);
return result;
}
+
+
+OFCondition IODEnhGeneralEquipmentModule::set(const IODEnhGeneralEquipmentModule::EquipmentInfo& info)
+{
+ if (info.m_DeviceSerialNumber.empty() || info.m_Manufacturer.empty() ||
+ info.m_ManufacturerModelName.empty() || info.m_SoftwareVersions.empty())
+ return IOD_EC_InvalidElementValue;
+
+ OFCondition result = setManufacturer(info.m_Manufacturer);
+ if (result.good()) result = setManufacturerModelName(info.m_ManufacturerModelName);
+ if (result.good()) result = setDeviceSerialNumber(info.m_DeviceSerialNumber);
+ if (result.good()) result = setSoftwareVersions(info.m_SoftwareVersions);
+ return result;
+}
diff --git a/dcmiod/libsrc/modenhusimage.cc b/dcmiod/libsrc/modenhusimage.cc
index ac77db0..9fdf4ac 100644
--- a/dcmiod/libsrc/modenhusimage.cc
+++ b/dcmiod/libsrc/modenhusimage.cc
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2015, Open Connections GmbH
+ * Copyright (C) 2015-2016, Open Connections GmbH
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation are maintained by
@@ -65,39 +65,39 @@ OFString IODEnhUSImageModule::getName() const
void IODEnhUSImageModule::resetRules()
{
// parameters are tag, VM, type. Overwrite old rules if any.
- m_Rules->addRule(new IODRule(DCM_ImageType, "4","1" ,m_ModuleName, DcmIODTypes::IE_IMAGE), OFTrue);
- m_Rules->addRule(new IODRule(DCM_SamplesPerPixel, "1","1" ,m_ModuleName, DcmIODTypes::IE_IMAGE, "1"), OFTrue);
- m_Rules->addRule(new IODRule(DCM_PhotometricInterpretation, "1","1" ,m_ModuleName, DcmIODTypes::IE_IMAGE, "MONOCHROME2"), OFTrue);
- m_Rules->addRule(new IODRule(DCM_Rows, "1","1" ,m_ModuleName, DcmIODTypes::IE_IMAGE), OFTrue);
- m_Rules->addRule(new IODRule(DCM_Columns, "1","1" ,m_ModuleName, DcmIODTypes::IE_IMAGE), OFTrue);
- m_Rules->addRule(new IODRule(DCM_BitsAllocated, "1","1" ,m_ModuleName, DcmIODTypes::IE_IMAGE), OFTrue);
- m_Rules->addRule(new IODRule(DCM_BitsStored, "1","1" ,m_ModuleName, DcmIODTypes::IE_IMAGE), OFTrue);
- m_Rules->addRule(new IODRule(DCM_HighBit, "1","1" ,m_ModuleName, DcmIODTypes::IE_IMAGE), OFTrue);
- m_Rules->addRule(new IODRule(DCM_PixelRepresentation, "1","1" ,m_ModuleName, DcmIODTypes::IE_IMAGE, "0"), OFTrue);
- m_Rules->addRule(new IODRule(DCM_DimensionOrganizationType, "1","1" ,m_ModuleName, DcmIODTypes::IE_IMAGE), OFTrue);
- m_Rules->addRule(new IODRule(DCM_AcquisitionDateTime, "1","1" ,m_ModuleName, DcmIODTypes::IE_IMAGE), OFTrue);
- m_Rules->addRule(new IODRule(DCM_AcquisitionDuration, "1","1" ,m_ModuleName, DcmIODTypes::IE_IMAGE), OFTrue);
- m_Rules->addRule(new IODRule(DCM_PixelSpacing, "2","1" ,m_ModuleName, DcmIODTypes::IE_IMAGE), OFTrue);
- m_Rules->addRule(new IODRule(DCM_PositionMeasuringDeviceUsed, "1","1C" ,m_ModuleName, DcmIODTypes::IE_IMAGE), OFTrue);
- m_Rules->addRule(new IODRule(DCM_LossyImageCompression, "1","1" ,m_ModuleName, DcmIODTypes::IE_IMAGE), OFTrue);
- m_Rules->addRule(new IODRule(DCM_LossyImageCompressionRatio, "1-n","1C" ,m_ModuleName, DcmIODTypes::IE_IMAGE), OFTrue);
- m_Rules->addRule(new IODRule(DCM_LossyImageCompressionMethod, "1-n","1C" ,m_ModuleName, DcmIODTypes::IE_IMAGE), OFTrue);
- m_Rules->addRule(new IODRule(DCM_PresentationLUTShape, "1","1" ,m_ModuleName, DcmIODTypes::IE_IMAGE, "IDENTITY"), OFTrue);
- m_Rules->addRule(new IODRule(DCM_RescaleSlope, "1","1" ,m_ModuleName, DcmIODTypes::IE_IMAGE, "1"), OFTrue);
- m_Rules->addRule(new IODRule(DCM_RescaleIntercept, "1","1" ,m_ModuleName, DcmIODTypes::IE_IMAGE, "0"), OFTrue);
- m_Rules->addRule(new IODRule(DCM_BurnedInAnnotation, "1","1" ,m_ModuleName, DcmIODTypes::IE_IMAGE, "NO"), OFTrue);
- m_Rules->addRule(new IODRule(DCM_RecognizableVisualFeatures, "1","3" ,m_ModuleName, DcmIODTypes::IE_IMAGE, "NO"), OFTrue);
- m_Rules->addRule(new IODRule(DCM_TransducerScanPatternCodeSequence, "1","1" ,m_ModuleName, DcmIODTypes::IE_IMAGE), OFTrue);
- m_Rules->addRule(new IODRule(DCM_TransducerGeometryCodeSequence, "1","1" ,m_ModuleName, DcmIODTypes::IE_IMAGE), OFTrue);
- m_Rules->addRule(new IODRule(DCM_TransducerBeamSteeringCodeSequence, "1","1" ,m_ModuleName, DcmIODTypes::IE_IMAGE), OFTrue);
- m_Rules->addRule(new IODRule(DCM_TransducerApplicationCodeSequence, "1","1" ,m_ModuleName, DcmIODTypes::IE_IMAGE), OFTrue);
- m_Rules->addRule(new IODRule(DCM_ProcessingFunction, "1","3" ,m_ModuleName, DcmIODTypes::IE_IMAGE), OFTrue);
- m_Rules->addRule(new IODRule(DCM_MechanicalIndex, "1","1" ,m_ModuleName, DcmIODTypes::IE_IMAGE), OFTrue);
- m_Rules->addRule(new IODRule(DCM_BoneThermalIndex, "1","1" ,m_ModuleName, DcmIODTypes::IE_IMAGE), OFTrue);
- m_Rules->addRule(new IODRule(DCM_CranialThermalIndex, "1","1" ,m_ModuleName, DcmIODTypes::IE_IMAGE), OFTrue);
- m_Rules->addRule(new IODRule(DCM_SoftTissueThermalIndex, "1","1" ,m_ModuleName, DcmIODTypes::IE_IMAGE), OFTrue);
- m_Rules->addRule(new IODRule(DCM_DepthsOfFocus, "1-n","1" ,m_ModuleName, DcmIODTypes::IE_IMAGE), OFTrue);
- m_Rules->addRule(new IODRule(DCM_DepthOfScanField, "1","1" ,m_ModuleName, DcmIODTypes::IE_IMAGE), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_ImageType, "4","1" ,getName(), DcmIODTypes::IE_IMAGE), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_SamplesPerPixel, "1","1" ,getName(), DcmIODTypes::IE_IMAGE, "1"), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_PhotometricInterpretation, "1","1" ,getName(), DcmIODTypes::IE_IMAGE, "MONOCHROME2"), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_Rows, "1","1" ,getName(), DcmIODTypes::IE_IMAGE), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_Columns, "1","1" ,getName(), DcmIODTypes::IE_IMAGE), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_BitsAllocated, "1","1" ,getName(), DcmIODTypes::IE_IMAGE), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_BitsStored, "1","1" ,getName(), DcmIODTypes::IE_IMAGE), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_HighBit, "1","1" ,getName(), DcmIODTypes::IE_IMAGE), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_PixelRepresentation, "1","1" ,getName(), DcmIODTypes::IE_IMAGE, "0"), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_DimensionOrganizationType, "1","1" ,getName(), DcmIODTypes::IE_IMAGE), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_AcquisitionDateTime, "1","1" ,getName(), DcmIODTypes::IE_IMAGE), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_AcquisitionDuration, "1","1" ,getName(), DcmIODTypes::IE_IMAGE), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_PixelSpacing, "2","1" ,getName(), DcmIODTypes::IE_IMAGE), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_PositionMeasuringDeviceUsed, "1","1C" ,getName(), DcmIODTypes::IE_IMAGE), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_LossyImageCompression, "1","1" ,getName(), DcmIODTypes::IE_IMAGE), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_LossyImageCompressionRatio, "1-n","1C" ,getName(), DcmIODTypes::IE_IMAGE), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_LossyImageCompressionMethod, "1-n","1C" ,getName(), DcmIODTypes::IE_IMAGE), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_PresentationLUTShape, "1","1" ,getName(), DcmIODTypes::IE_IMAGE, "IDENTITY"), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_RescaleSlope, "1","1" ,getName(), DcmIODTypes::IE_IMAGE, "1"), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_RescaleIntercept, "1","1" ,getName(), DcmIODTypes::IE_IMAGE, "0"), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_BurnedInAnnotation, "1","1" ,getName(), DcmIODTypes::IE_IMAGE, "NO"), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_RecognizableVisualFeatures, "1","3" ,getName(), DcmIODTypes::IE_IMAGE, "NO"), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_TransducerScanPatternCodeSequence, "1","1" ,getName(), DcmIODTypes::IE_IMAGE), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_TransducerGeometryCodeSequence, "1","1" ,getName(), DcmIODTypes::IE_IMAGE), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_TransducerBeamSteeringCodeSequence, "1","1" ,getName(), DcmIODTypes::IE_IMAGE), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_TransducerApplicationCodeSequence, "1","1" ,getName(), DcmIODTypes::IE_IMAGE), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_ProcessingFunction, "1","3" ,getName(), DcmIODTypes::IE_IMAGE), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_MechanicalIndex, "1","1" ,getName(), DcmIODTypes::IE_IMAGE), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_BoneThermalIndex, "1","1" ,getName(), DcmIODTypes::IE_IMAGE), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_CranialThermalIndex, "1","1" ,getName(), DcmIODTypes::IE_IMAGE), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_SoftTissueThermalIndex, "1","1" ,getName(), DcmIODTypes::IE_IMAGE), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_DepthsOfFocus, "1-n","1" ,getName(), DcmIODTypes::IE_IMAGE), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_DepthOfScanField, "1","1" ,getName(), DcmIODTypes::IE_IMAGE), OFTrue);
}
diff --git a/dcmiod/libsrc/modenhusseries.cc b/dcmiod/libsrc/modenhusseries.cc
index ea9726f..34c9dec 100644
--- a/dcmiod/libsrc/modenhusseries.cc
+++ b/dcmiod/libsrc/modenhusseries.cc
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2015, Open Connections GmbH
+ * Copyright (C) 2015-2016, Open Connections GmbH
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation are maintained by
@@ -52,9 +52,9 @@ OFString IODEnhancedUSSeriesModule::getName() const
void IODEnhancedUSSeriesModule::resetRules()
{
// parameters are tag, VM, type. Overwrite old rules if any.
- m_Rules->addRule(new IODRule(DCM_Modality, "1","1", m_ModuleName, DcmIODTypes::IE_SERIES, "US"), OFTrue);
- m_Rules->addRule(new IODRule(DCM_ReferencedPerformedProcedureStepSequence, "1","1C", m_ModuleName, DcmIODTypes::IE_SERIES), OFTrue);
- m_Rules->addRule(new IODRule(DCM_PerformedProtocolCodeSequence, "1","1C", m_ModuleName, DcmIODTypes::IE_SERIES), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_Modality, "1","1", getName(), DcmIODTypes::IE_SERIES, "US"), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_ReferencedPerformedProcedureStepSequence, "1","1C", getName(), DcmIODTypes::IE_SERIES), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_PerformedProtocolCodeSequence, "1","1C", getName(), DcmIODTypes::IE_SERIES), OFTrue);
}
diff --git a/dcmiod/libsrc/modequipment.cc b/dcmiod/libsrc/modequipment.cc
index 10f1cde..0d2abeb 100644
--- a/dcmiod/libsrc/modequipment.cc
+++ b/dcmiod/libsrc/modequipment.cc
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2016, Open Connections GmbH
+ * Copyright (C) 2015-2016, Open Connections GmbH
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation are maintained by
@@ -48,14 +48,14 @@ void IODGeneralEquipmentModule::resetRules()
{
// parameters are tag, VM, type. Overwrite old rules if any.
- m_Rules->addRule(new IODRule(DCM_Manufacturer, "1","3", m_ModuleName, DcmIODTypes::IE_EQUIPMENT), OFTrue);
- m_Rules->addRule(new IODRule(DCM_InstitutionName, "1","3", m_ModuleName, DcmIODTypes::IE_EQUIPMENT), OFTrue);
- m_Rules->addRule(new IODRule(DCM_InstitutionAddress, "1","3", m_ModuleName, DcmIODTypes::IE_EQUIPMENT), OFTrue);
- m_Rules->addRule(new IODRule(DCM_StationName, "1","3", m_ModuleName, DcmIODTypes::IE_EQUIPMENT), OFTrue);
- m_Rules->addRule(new IODRule(DCM_InstitutionalDepartmentName, "1","3", m_ModuleName, DcmIODTypes::IE_EQUIPMENT), OFTrue);
- m_Rules->addRule(new IODRule(DCM_ManufacturerModelName, "1","3", m_ModuleName, DcmIODTypes::IE_EQUIPMENT), OFTrue);
- m_Rules->addRule(new IODRule(DCM_DeviceSerialNumber, "1","3", m_ModuleName, DcmIODTypes::IE_EQUIPMENT), OFTrue);
- m_Rules->addRule(new IODRule(DCM_SoftwareVersions, "1-n","3", m_ModuleName, DcmIODTypes::IE_EQUIPMENT), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_Manufacturer, "1","3", getName(), DcmIODTypes::IE_EQUIPMENT), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_InstitutionName, "1","3", getName(), DcmIODTypes::IE_EQUIPMENT), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_InstitutionAddress, "1","3", getName(), DcmIODTypes::IE_EQUIPMENT), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_StationName, "1","3", getName(), DcmIODTypes::IE_EQUIPMENT), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_InstitutionalDepartmentName, "1","3", getName(), DcmIODTypes::IE_EQUIPMENT), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_ManufacturerModelName, "1","3", getName(), DcmIODTypes::IE_EQUIPMENT), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_DeviceSerialNumber, "1","3", getName(), DcmIODTypes::IE_EQUIPMENT), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_SoftwareVersions, "1-n","3", getName(), DcmIODTypes::IE_EQUIPMENT), OFTrue);
}
diff --git a/dcmiod/libsrc/modfor.cc b/dcmiod/libsrc/modfor.cc
index 272ad5b..3ca984d 100644
--- a/dcmiod/libsrc/modfor.cc
+++ b/dcmiod/libsrc/modfor.cc
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2015, Open Connections GmbH
+ * Copyright (C) 2015-2016, Open Connections GmbH
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation are maintained by
@@ -48,8 +48,8 @@ IODFoRModule::IODFoRModule()
void IODFoRModule::resetRules()
{
// parameters are tag, VM, type. Overwrite old rules if any.
- m_Rules->addRule(new IODRule(DCM_FrameOfReferenceUID, "1","1", m_ModuleName, DcmIODTypes::IE_FOR), OFTrue);
- m_Rules->addRule(new IODRule(DCM_PositionReferenceIndicator, "1","2", m_ModuleName, DcmIODTypes::IE_FOR), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_FrameOfReferenceUID, "1","1", getName(), DcmIODTypes::IE_FOR), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_PositionReferenceIndicator, "1","2", getName(), DcmIODTypes::IE_FOR), OFTrue);
}
diff --git a/dcmiod/libsrc/modgeneralimage.cc b/dcmiod/libsrc/modgeneralimage.cc
index c12bfb5..3b71561 100644
--- a/dcmiod/libsrc/modgeneralimage.cc
+++ b/dcmiod/libsrc/modgeneralimage.cc
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2015, Open Connections GmbH
+ * Copyright (C) 2015-2016, Open Connections GmbH
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation are maintained by
@@ -61,23 +61,23 @@ IODGeneralImageModule::~IODGeneralImageModule()
void IODGeneralImageModule::resetRules()
{
// parameters are tag, VM, type. Overwrite old rules if any.
- m_Rules->addRule(new IODRule(DCM_InstanceNumber, "1", "2", m_ModuleName, DcmIODTypes::IE_IMAGE), OFTrue);
- m_Rules->addRule(new IODRule(DCM_PatientOrientation, "2", "2C", m_ModuleName, DcmIODTypes::IE_IMAGE), OFTrue);
- m_Rules->addRule(new IODRule(DCM_ContentDate, "1", "2C", m_ModuleName, DcmIODTypes::IE_IMAGE), OFTrue);
- m_Rules->addRule(new IODRule(DCM_ContentTime, "1", "2C", m_ModuleName, DcmIODTypes::IE_IMAGE), OFTrue);
- m_Rules->addRule(new IODRule(DCM_ImageType, "2-n", "1", m_ModuleName, DcmIODTypes::IE_IMAGE), OFTrue);
- m_Rules->addRule(new IODRule(DCM_AcquisitionNumber, "1", "3", m_ModuleName, DcmIODTypes::IE_IMAGE), OFTrue);
- m_Rules->addRule(new IODRule(DCM_AcquisitionDate, "1", "3", m_ModuleName, DcmIODTypes::IE_IMAGE), OFTrue);
- m_Rules->addRule(new IODRule(DCM_AcquisitionTime, "1", "3", m_ModuleName, DcmIODTypes::IE_IMAGE), OFTrue);
- m_Rules->addRule(new IODRule(DCM_AcquisitionDateTime, "1", "3", m_ModuleName, DcmIODTypes::IE_IMAGE), OFTrue);
- m_Rules->addRule(new IODRule(DCM_ImageComments, "1", "3", m_ModuleName, DcmIODTypes::IE_IMAGE), OFTrue);
- m_Rules->addRule(new IODRule(DCM_BurnedInAnnotation, "1", "3", m_ModuleName, DcmIODTypes::IE_IMAGE), OFTrue);
- m_Rules->addRule(new IODRule(DCM_RecognizableVisualFeatures, "1", "3", m_ModuleName, DcmIODTypes::IE_IMAGE), OFTrue);
- m_Rules->addRule(new IODRule(DCM_LossyImageCompression, "1", "3", m_ModuleName, DcmIODTypes::IE_IMAGE), OFTrue);
- m_Rules->addRule(new IODRule(DCM_LossyImageCompressionRatio, "1", "3", m_ModuleName, DcmIODTypes::IE_IMAGE), OFTrue);
- m_Rules->addRule(new IODRule(DCM_LossyImageCompressionMethod, "1-n", "3", m_ModuleName, DcmIODTypes::IE_IMAGE), OFTrue);
- m_Rules->addRule(new IODRule(DCM_PresentationLUTShape, "1", "3", m_ModuleName, DcmIODTypes::IE_IMAGE), OFTrue);
- m_Rules->addRule(new IODRule(DCM_IrradiationEventUID, "1-n", "3", m_ModuleName, DcmIODTypes::IE_IMAGE), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_InstanceNumber, "1", "2", getName(), DcmIODTypes::IE_IMAGE), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_PatientOrientation, "2", "2C", getName(), DcmIODTypes::IE_IMAGE), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_ContentDate, "1", "2C", getName(), DcmIODTypes::IE_IMAGE), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_ContentTime, "1", "2C", getName(), DcmIODTypes::IE_IMAGE), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_ImageType, "2-n", "1", getName(), DcmIODTypes::IE_IMAGE), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_AcquisitionNumber, "1", "3", getName(), DcmIODTypes::IE_IMAGE), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_AcquisitionDate, "1", "3", getName(), DcmIODTypes::IE_IMAGE), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_AcquisitionTime, "1", "3", getName(), DcmIODTypes::IE_IMAGE), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_AcquisitionDateTime, "1", "3", getName(), DcmIODTypes::IE_IMAGE), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_ImageComments, "1", "3", getName(), DcmIODTypes::IE_IMAGE), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_BurnedInAnnotation, "1", "3", getName(), DcmIODTypes::IE_IMAGE), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_RecognizableVisualFeatures, "1", "3", getName(), DcmIODTypes::IE_IMAGE), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_LossyImageCompression, "1", "3", getName(), DcmIODTypes::IE_IMAGE), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_LossyImageCompressionRatio, "1", "3", getName(), DcmIODTypes::IE_IMAGE), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_LossyImageCompressionMethod, "1-n", "3", getName(), DcmIODTypes::IE_IMAGE), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_PresentationLUTShape, "1", "3", getName(), DcmIODTypes::IE_IMAGE), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_IrradiationEventUID, "1-n", "3", getName(), DcmIODTypes::IE_IMAGE), OFTrue);
}
diff --git a/dcmiod/libsrc/modgeneralseries.cc b/dcmiod/libsrc/modgeneralseries.cc
index 3577fc9..cacdb6c 100644
--- a/dcmiod/libsrc/modgeneralseries.cc
+++ b/dcmiod/libsrc/modgeneralseries.cc
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2015, Open Connections GmbH
+ * Copyright (C) 2015-2016, Open Connections GmbH
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation are maintained by
@@ -70,19 +70,19 @@ void IODGeneralSeriesModule::inventMissing()
void IODGeneralSeriesModule::resetRules()
{
// parameters are tag, VM, type. Overwrite old rules if any.
- m_Rules->addRule(new IODRule(DCM_Modality, "1","1", m_ModuleName, DcmIODTypes::IE_SERIES), OFTrue);
- m_Rules->addRule(new IODRule(DCM_SeriesInstanceUID, "1","1", m_ModuleName, DcmIODTypes::IE_SERIES), OFTrue);
- m_Rules->addRule(new IODRule(DCM_SeriesNumber, "1","2", m_ModuleName, DcmIODTypes::IE_SERIES), OFTrue);
- m_Rules->addRule(new IODRule(DCM_Laterality, "1","2C", m_ModuleName, DcmIODTypes::IE_SERIES), OFTrue);
- m_Rules->addRule(new IODRule(DCM_SeriesDate, "1","3", m_ModuleName, DcmIODTypes::IE_SERIES), OFTrue);
- m_Rules->addRule(new IODRule(DCM_SeriesTime, "1","3", m_ModuleName, DcmIODTypes::IE_SERIES), OFTrue);
- m_Rules->addRule(new IODRule(DCM_PerformingPhysicianName, "1","3", m_ModuleName, DcmIODTypes::IE_SERIES), OFTrue);
- m_Rules->addRule(new IODRule(DCM_ProtocolName, "1","3", m_ModuleName, DcmIODTypes::IE_SERIES), OFTrue);
- m_Rules->addRule(new IODRule(DCM_SeriesDescription, "1","3", m_ModuleName, DcmIODTypes::IE_SERIES), OFTrue);
- m_Rules->addRule(new IODRule(DCM_OperatorsName, "1-n","3", m_ModuleName, DcmIODTypes::IE_SERIES), OFTrue);
- m_Rules->addRule(new IODRule(DCM_BodyPartExamined, "1","3", m_ModuleName, DcmIODTypes::IE_SERIES), OFTrue);
- m_Rules->addRule(new IODRule(DCM_PatientPosition, "1","2C", m_ModuleName, DcmIODTypes::IE_SERIES), OFTrue);
- m_Rules->addRule(new IODRule(DCM_ReferencedPerformedProcedureStepSequence, "1","3", m_ModuleName, DcmIODTypes::IE_SERIES), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_Modality, "1","1", getName(), DcmIODTypes::IE_SERIES), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_SeriesInstanceUID, "1","1", getName(), DcmIODTypes::IE_SERIES), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_SeriesNumber, "1","2", getName(), DcmIODTypes::IE_SERIES), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_Laterality, "1","2C", getName(), DcmIODTypes::IE_SERIES), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_SeriesDate, "1","3", getName(), DcmIODTypes::IE_SERIES), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_SeriesTime, "1","3", getName(), DcmIODTypes::IE_SERIES), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_PerformingPhysicianName, "1","3", getName(), DcmIODTypes::IE_SERIES), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_ProtocolName, "1","3", getName(), DcmIODTypes::IE_SERIES), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_SeriesDescription, "1","3", getName(), DcmIODTypes::IE_SERIES), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_OperatorsName, "1-n","3", getName(), DcmIODTypes::IE_SERIES), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_BodyPartExamined, "1","3", getName(), DcmIODTypes::IE_SERIES), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_PatientPosition, "1","2C", getName(), DcmIODTypes::IE_SERIES), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_ReferencedPerformedProcedureStepSequence, "1","3", getName(), DcmIODTypes::IE_SERIES), OFTrue);
}
@@ -263,7 +263,8 @@ OFCondition IODGeneralSeriesModule::setLaterality(const DcmIODTypes::IOD_LATERAL
{
case DcmIODTypes::LATERALITY_L: result = m_Item->putAndInsertOFStringArray(DCM_Laterality, "L"); break;
case DcmIODTypes::LATERALITY_R: result = m_Item->putAndInsertOFStringArray(DCM_Laterality, "R"); break;
- case DcmIODTypes::LATERALITY_UNDEFINED: result = IOD_EC_InvalidLaterality; break;
+ case DcmIODTypes::LATERALITY_UNDEFINED:
+ default: result = IOD_EC_InvalidLaterality;
}
return result;
}
diff --git a/dcmiod/libsrc/modgeneralstudy.cc b/dcmiod/libsrc/modgeneralstudy.cc
index 5cc9b3e..6d67b0d 100644
--- a/dcmiod/libsrc/modgeneralstudy.cc
+++ b/dcmiod/libsrc/modgeneralstudy.cc
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2015, Open Connections GmbH
+ * Copyright (C) 2015-2016, Open Connections GmbH
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation are maintained by
@@ -65,16 +65,16 @@ void IODGeneralStudyModule::inventMissing()
void IODGeneralStudyModule::resetRules()
{
// parameters are tag, VM, type. Overwrite old rules if any.
- m_Rules->addRule(new IODRule(DCM_StudyInstanceUID, "1","1", m_ModuleName, DcmIODTypes::IE_STUDY), OFTrue);
- m_Rules->addRule(new IODRule(DCM_StudyDate, "1","2", m_ModuleName, DcmIODTypes::IE_STUDY), OFTrue);
- m_Rules->addRule(new IODRule(DCM_StudyTime, "1","2", m_ModuleName, DcmIODTypes::IE_STUDY), OFTrue);
- m_Rules->addRule(new IODRule(DCM_ReferringPhysicianName, "1","2", m_ModuleName, DcmIODTypes::IE_STUDY), OFTrue);
- m_Rules->addRule(new IODRule(DCM_StudyID, "1","2", m_ModuleName, DcmIODTypes::IE_STUDY), OFTrue);
- m_Rules->addRule(new IODRule(DCM_AccessionNumber, "1","2", m_ModuleName, DcmIODTypes::IE_STUDY), OFTrue);
- m_Rules->addRule(new IODRule(DCM_StudyDescription, "1","3", m_ModuleName, DcmIODTypes::IE_STUDY), OFTrue);
- m_Rules->addRule(new IODRule(DCM_IssuerOfAccessionNumberSequence, "1","3", m_ModuleName, DcmIODTypes::IE_STUDY), OFTrue);
- m_Rules->addRule(new IODRule(DCM_ProcedureCodeSequence, "1-n","3", m_ModuleName, DcmIODTypes::IE_STUDY), OFTrue);
- m_Rules->addRule(new IODRule(DCM_ReasonForPerformedProcedureCodeSequence, "1-n","3", m_ModuleName, DcmIODTypes::IE_STUDY), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_StudyInstanceUID, "1","1", getName(), DcmIODTypes::IE_STUDY), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_StudyDate, "1","2", getName(), DcmIODTypes::IE_STUDY), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_StudyTime, "1","2", getName(), DcmIODTypes::IE_STUDY), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_ReferringPhysicianName, "1","2", getName(), DcmIODTypes::IE_STUDY), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_StudyID, "1","2", getName(), DcmIODTypes::IE_STUDY), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_AccessionNumber, "1","2", getName(), DcmIODTypes::IE_STUDY), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_StudyDescription, "1","3", getName(), DcmIODTypes::IE_STUDY), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_IssuerOfAccessionNumberSequence, "1","3", getName(), DcmIODTypes::IE_STUDY), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_ProcedureCodeSequence, "1-n","3", getName(), DcmIODTypes::IE_STUDY), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_ReasonForPerformedProcedureCodeSequence, "1-n","3", getName(), DcmIODTypes::IE_STUDY), OFTrue);
}
diff --git a/dcmiod/libsrc/modimagepixel.cc b/dcmiod/libsrc/modimagepixel.cc
index 8c934ee..c2a8c58 100644
--- a/dcmiod/libsrc/modimagepixel.cc
+++ b/dcmiod/libsrc/modimagepixel.cc
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2015, Open Connections GmbH
+ * Copyright (C) 2016, Open Connections GmbH
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation are maintained by
@@ -55,17 +55,17 @@ IODImagePixelModule::IODImagePixelModule()
void IODImagePixelModule::resetRules()
{
// parameters are tag, VM, type. Overwrite old rules if any.
- m_Rules->addRule(new IODRule(DCM_SamplesPerPixel, "1", "1", m_ModuleName, DcmIODTypes::IE_IMAGE), OFTrue);
- m_Rules->addRule(new IODRule(DCM_PhotometricInterpretation, "1", "1", m_ModuleName, DcmIODTypes::IE_IMAGE), OFTrue);
- m_Rules->addRule(new IODRule(DCM_Rows, "1", "1", m_ModuleName, DcmIODTypes::IE_IMAGE), OFTrue);
- m_Rules->addRule(new IODRule(DCM_Columns, "1", "1n", m_ModuleName, DcmIODTypes::IE_IMAGE), OFTrue);
- m_Rules->addRule(new IODRule(DCM_BitsAllocated, "1", "1", m_ModuleName, DcmIODTypes::IE_IMAGE), OFTrue);
- m_Rules->addRule(new IODRule(DCM_BitsStored, "1", "1", m_ModuleName, DcmIODTypes::IE_IMAGE), OFTrue);
- m_Rules->addRule(new IODRule(DCM_HighBit, "1", "1", m_ModuleName, DcmIODTypes::IE_IMAGE), OFTrue);
- m_Rules->addRule(new IODRule(DCM_PixelRepresentation, "1", "1", m_ModuleName, DcmIODTypes::IE_IMAGE), OFTrue);
- m_Rules->addRule(new IODRule(DCM_PlanarConfiguration, "1", "1C", m_ModuleName, DcmIODTypes::IE_IMAGE), OFTrue);
- m_Rules->addRule(new IODRule(DCM_PixelAspectRatio, "2", "1C", m_ModuleName, DcmIODTypes::IE_IMAGE), OFTrue);
- m_Rules->addRule(new IODRule(DCM_ICCProfile, "1", "3", m_ModuleName, DcmIODTypes::IE_IMAGE), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_SamplesPerPixel, "1", "1", getName(), DcmIODTypes::IE_IMAGE), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_PhotometricInterpretation, "1", "1", getName(), DcmIODTypes::IE_IMAGE), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_Rows, "1", "1", getName(), DcmIODTypes::IE_IMAGE), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_Columns, "1", "1n", getName(), DcmIODTypes::IE_IMAGE), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_BitsAllocated, "1", "1", getName(), DcmIODTypes::IE_IMAGE), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_BitsStored, "1", "1", getName(), DcmIODTypes::IE_IMAGE), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_HighBit, "1", "1", getName(), DcmIODTypes::IE_IMAGE), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_PixelRepresentation, "1", "1", getName(), DcmIODTypes::IE_IMAGE), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_PlanarConfiguration, "1", "1C", getName(), DcmIODTypes::IE_IMAGE), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_PixelAspectRatio, "2", "1C", getName(), DcmIODTypes::IE_IMAGE), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_ICCProfile, "1", "3", getName(), DcmIODTypes::IE_IMAGE), OFTrue);
}
diff --git a/dcmiod/libsrc/modmultiframedimension.cc b/dcmiod/libsrc/modmultiframedimension.cc
index d92f4f2..199dfa4 100644
--- a/dcmiod/libsrc/modmultiframedimension.cc
+++ b/dcmiod/libsrc/modmultiframedimension.cc
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2015, Open Connections GmbH
+ * Copyright (C) 2015-2016, Open Connections GmbH
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation are maintained by
@@ -26,7 +26,7 @@
#include "dcmtk/dcmdata/dcvrlo.h"
#include "dcmtk/dcmdata/dcvrui.h"
#include "dcmtk/dcmdata/dcvrcs.h"
-#include "dcmtk/dcmdata/dcpath.h" // for private tag reservation checking // TODO move to DcmItem?
+#include "dcmtk/dcmdata/dcpath.h" // for private tag reservation checking
#include "dcmtk/dcmiod/iodutil.h" // for static helpers
const OFString IODMultiframeDimensionModule::m_ModuleName = "MultiframeDimensionModule";
@@ -140,9 +140,9 @@ OFCondition IODMultiframeDimensionModule::write(DcmItem& destination)
void IODMultiframeDimensionModule::resetRules()
{
// Parameters for Rule are tag, VM, type (1,1C,2,2C,3), module name and logical IOD level
- m_Rules->addRule(new IODRule(DCM_DimensionOrganizationSequence, "1-n", "1", m_ModuleName, DcmIODTypes::IE_INSTANCE), OFTrue);
- m_Rules->addRule(new IODRule(DCM_DimensionOrganizationType, "1", "3", m_ModuleName, DcmIODTypes::IE_INSTANCE), OFTrue);
- m_Rules->addRule(new IODRule(DCM_DimensionIndexSequence, "1-n", "1", m_ModuleName, DcmIODTypes::IE_INSTANCE), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_DimensionOrganizationSequence, "1-n", "1", getName(), DcmIODTypes::IE_INSTANCE), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_DimensionOrganizationType, "1", "3", getName(), DcmIODTypes::IE_INSTANCE), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_DimensionIndexSequence, "1-n", "1", getName(), DcmIODTypes::IE_INSTANCE), OFTrue);
}
diff --git a/dcmiod/libsrc/modmultiframefg.cc b/dcmiod/libsrc/modmultiframefg.cc
index 2260f39..6f324e9 100644
--- a/dcmiod/libsrc/modmultiframefg.cc
+++ b/dcmiod/libsrc/modmultiframefg.cc
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2015, Open Connections GmbH
+ * Copyright (C) 2015-2016, Open Connections GmbH
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation are maintained by
@@ -55,11 +55,11 @@ IODMultiFrameFGModule::IODMultiFrameFGModule()
void IODMultiFrameFGModule::resetRules()
{
- m_Rules->addRule(new IODRule(DCM_InstanceNumber, "1", "1", m_ModuleName, DcmIODTypes::IE_INSTANCE), OFTrue);
- m_Rules->addRule(new IODRule(DCM_ContentDate, "1", "1", m_ModuleName, DcmIODTypes::IE_INSTANCE), OFTrue);
- m_Rules->addRule(new IODRule(DCM_ContentTime, "1", "1", m_ModuleName, DcmIODTypes::IE_INSTANCE), OFTrue);
- m_Rules->addRule(new IODRule(DCM_NumberOfFrames, "1", "1", m_ModuleName, DcmIODTypes::IE_INSTANCE), OFTrue);
- m_Rules->addRule(new IODRule(DCM_RepresentativeFrameNumber, "1", "3", m_ModuleName, DcmIODTypes::IE_INSTANCE), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_InstanceNumber, "1", "1", getName(), DcmIODTypes::IE_INSTANCE), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_ContentDate, "1", "1", getName(), DcmIODTypes::IE_INSTANCE), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_ContentTime, "1", "1", getName(), DcmIODTypes::IE_INSTANCE), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_NumberOfFrames, "1", "1", getName(), DcmIODTypes::IE_INSTANCE), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_RepresentativeFrameNumber, "1", "3", getName(), DcmIODTypes::IE_INSTANCE), OFTrue);
m_ConcatenationInfo.resetRules();
}
diff --git a/dcmiod/libsrc/modpatient.cc b/dcmiod/libsrc/modpatient.cc
index 5b040e6..48013f5 100644
--- a/dcmiod/libsrc/modpatient.cc
+++ b/dcmiod/libsrc/modpatient.cc
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2015, Open Connections GmbH
+ * Copyright (C) 2015-2016, Open Connections GmbH
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation are maintained by
@@ -52,10 +52,10 @@ IODPatientModule::IODPatientModule()
void IODPatientModule::resetRules()
{
// parameters are tag, VM, type. Overwrite old rules if any.
- m_Rules->addRule(new IODRule(DCM_PatientName, "1","2",m_ModuleName, DcmIODTypes::IE_PATIENT), OFTrue);
- m_Rules->addRule(new IODRule(DCM_PatientID, "1","2", m_ModuleName, DcmIODTypes::IE_PATIENT), OFTrue);
- m_Rules->addRule(new IODRule(DCM_PatientBirthDate, "1","2", m_ModuleName, DcmIODTypes::IE_PATIENT), OFTrue);
- m_Rules->addRule(new IODRule(DCM_PatientSex, "1","2", m_ModuleName, DcmIODTypes::IE_PATIENT), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_PatientName, "1","2",getName(), DcmIODTypes::IE_PATIENT), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_PatientID, "1","2", getName(), DcmIODTypes::IE_PATIENT), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_PatientBirthDate, "1","2", getName(), DcmIODTypes::IE_PATIENT), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_PatientSex, "1","2", getName(), DcmIODTypes::IE_PATIENT), OFTrue);
}
diff --git a/dcmiod/libsrc/modpatientstudy.cc b/dcmiod/libsrc/modpatientstudy.cc
index 210e1ce..d87b22c 100644
--- a/dcmiod/libsrc/modpatientstudy.cc
+++ b/dcmiod/libsrc/modpatientstudy.cc
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2015, Open Connections GmbH
+ * Copyright (C) 2015-2016, Open Connections GmbH
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation are maintained by
@@ -50,10 +50,10 @@ IODPatientStudyModule::IODPatientStudyModule()
void IODPatientStudyModule::resetRules()
{
// parameters are tag, VM, type. Overwrite old rules if any.
- m_Rules->addRule(new IODRule(DCM_AdmittingDiagnosesDescription, "1-n","3",m_ModuleName, DcmIODTypes::IE_STUDY), OFTrue);
- m_Rules->addRule(new IODRule(DCM_PatientAge, "1","3", m_ModuleName, DcmIODTypes::IE_STUDY), OFTrue);
- m_Rules->addRule(new IODRule(DCM_PatientSize, "1","3", m_ModuleName, DcmIODTypes::IE_STUDY), OFTrue);
- m_Rules->addRule(new IODRule(DCM_PatientWeight, "1","3", m_ModuleName, DcmIODTypes::IE_STUDY), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_AdmittingDiagnosesDescription, "1-n","3",getName(), DcmIODTypes::IE_STUDY), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_PatientAge, "1","3", getName(), DcmIODTypes::IE_STUDY), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_PatientSize, "1","3", getName(), DcmIODTypes::IE_STUDY), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_PatientWeight, "1","3", getName(), DcmIODTypes::IE_STUDY), OFTrue);
}
diff --git a/dcmiod/libsrc/modsegmentationseries.cc b/dcmiod/libsrc/modsegmentationseries.cc
index ff31d0e..4019fd1 100644
--- a/dcmiod/libsrc/modsegmentationseries.cc
+++ b/dcmiod/libsrc/modsegmentationseries.cc
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2015, Open Connections GmbH
+ * Copyright (C) 2015-2016, Open Connections GmbH
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation are maintained by
@@ -56,10 +56,10 @@ OFString IODSegmentationSeriesModule::getName() const
void IODSegmentationSeriesModule::resetRules()
{
// parameters are tag, VM, type. Overwrite old rules if any.
- m_Rules->addRule(new IODRule(DCM_Modality, "1","1", m_ModuleName, DcmIODTypes::IE_SERIES, "SEG"), OFTrue);
- m_Rules->addRule(new IODRule(DCM_SeriesNumber, "1","1", m_ModuleName, DcmIODTypes::IE_SERIES, "1"), OFTrue);
- m_Rules->addRule(new IODRule(DCM_ReferencedSOPClassUID, "1","1C", m_ModuleName, DcmIODTypes::IE_SERIES), OFTrue);
- m_Rules->addRule(new IODRule(DCM_ReferencedSOPInstanceUID, "1","1C", m_ModuleName, DcmIODTypes::IE_SERIES), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_Modality, "1","1", getName(), DcmIODTypes::IE_SERIES, "SEG"), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_SeriesNumber, "1","1", getName(), DcmIODTypes::IE_SERIES, "1"), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_ReferencedSOPClassUID, "1","1C", getName(), DcmIODTypes::IE_SERIES), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_ReferencedSOPInstanceUID, "1","1C", getName(), DcmIODTypes::IE_SERIES), OFTrue);
}
diff --git a/dcmiod/libsrc/modsopcommon.cc b/dcmiod/libsrc/modsopcommon.cc
index fcfb705..9ea9f07 100644
--- a/dcmiod/libsrc/modsopcommon.cc
+++ b/dcmiod/libsrc/modsopcommon.cc
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2015, Open Connections GmbH
+ * Copyright (C) 2015-2016, Open Connections GmbH
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation are maintained by
@@ -52,13 +52,13 @@ IODSOPCommonModule::IODSOPCommonModule()
void IODSOPCommonModule::resetRules()
{
// parameters are tag, VM, type. Overwrite old rules if any.
- m_Rules->addRule(new IODRule(DCM_SOPClassUID, "1","1", m_ModuleName, DcmIODTypes::IE_INSTANCE), OFTrue);
- m_Rules->addRule(new IODRule(DCM_SOPInstanceUID, "1","1", m_ModuleName, DcmIODTypes::IE_INSTANCE), OFTrue);
- m_Rules->addRule(new IODRule(DCM_SpecificCharacterSet, "1-n","1C", m_ModuleName, DcmIODTypes::IE_INSTANCE), OFTrue);
- m_Rules->addRule(new IODRule(DCM_InstanceCreationDate, "1","3", m_ModuleName, DcmIODTypes::IE_INSTANCE), OFTrue);
- m_Rules->addRule(new IODRule(DCM_InstanceCreationTime, "1","3", m_ModuleName, DcmIODTypes::IE_INSTANCE), OFTrue);
- m_Rules->addRule(new IODRule(DCM_InstanceCreatorUID, "1","3", m_ModuleName, DcmIODTypes::IE_INSTANCE), OFTrue);
- m_Rules->addRule(new IODRule(DCM_TimezoneOffsetFromUTC, "1","3", m_ModuleName, DcmIODTypes::IE_INSTANCE), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_SOPClassUID, "1","1", getName(), DcmIODTypes::IE_INSTANCE), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_SOPInstanceUID, "1","1", getName(), DcmIODTypes::IE_INSTANCE), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_SpecificCharacterSet, "1-n","1C", getName(), DcmIODTypes::IE_INSTANCE), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_InstanceCreationDate, "1","3", getName(), DcmIODTypes::IE_INSTANCE), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_InstanceCreationTime, "1","3", getName(), DcmIODTypes::IE_INSTANCE), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_InstanceCreatorUID, "1","3", getName(), DcmIODTypes::IE_INSTANCE), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_TimezoneOffsetFromUTC, "1","3", getName(), DcmIODTypes::IE_INSTANCE), OFTrue);
}
diff --git a/dcmiod/libsrc/modsynchronization.cc b/dcmiod/libsrc/modsynchronization.cc
index 9345a76..3aceba7 100644
--- a/dcmiod/libsrc/modsynchronization.cc
+++ b/dcmiod/libsrc/modsynchronization.cc
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2015, Open Connections GmbH
+ * Copyright (C) 2015-2016, Open Connections GmbH
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation are maintained by
@@ -30,7 +30,7 @@
#include "dcmtk/dcmiod/iodutil.h"
-const OFString IODSynchronizationModule::m_ModuleName = "SynchronizationModul";
+const OFString IODSynchronizationModule::m_ModuleName = "SynchronizationModule";
IODSynchronizationModule::IODSynchronizationModule(OFshared_ptr<DcmItem> item,
@@ -52,14 +52,14 @@ IODSynchronizationModule::IODSynchronizationModule()
void IODSynchronizationModule::resetRules()
{
// parameters are tag, VM, type. Overwrite old rules if any.
- m_Rules->addRule(new IODRule(DCM_SynchronizationFrameOfReferenceUID, "1","1", m_ModuleName, DcmIODTypes::IE_FOR), OFTrue);
- m_Rules->addRule(new IODRule(DCM_SynchronizationTrigger, "1","1", m_ModuleName, DcmIODTypes::IE_FOR), OFTrue);
- m_Rules->addRule(new IODRule(DCM_TriggerSourceOrType, "1","3", m_ModuleName, DcmIODTypes::IE_FOR), OFTrue);
- m_Rules->addRule(new IODRule(DCM_SynchronizationChannel, "2","1C", m_ModuleName, DcmIODTypes::IE_FOR), OFTrue);
- m_Rules->addRule(new IODRule(DCM_AcquisitionTimeSynchronized, "1","1", m_ModuleName, DcmIODTypes::IE_FOR), OFTrue);
- m_Rules->addRule(new IODRule(DCM_TimeSource, "1","3", m_ModuleName, DcmIODTypes::IE_FOR), OFTrue);
- m_Rules->addRule(new IODRule(DCM_TimeDistributionProtocol, "1","3", m_ModuleName, DcmIODTypes::IE_FOR), OFTrue);
- m_Rules->addRule(new IODRule(DCM_NTPSourceAddress, "1","3", m_ModuleName, DcmIODTypes::IE_FOR), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_SynchronizationFrameOfReferenceUID, "1","1", getName(), DcmIODTypes::IE_FOR), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_SynchronizationTrigger, "1","1", getName(), DcmIODTypes::IE_FOR), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_TriggerSourceOrType, "1","3", getName(), DcmIODTypes::IE_FOR), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_SynchronizationChannel, "2","1C", getName(), DcmIODTypes::IE_FOR), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_AcquisitionTimeSynchronized, "1","1", getName(), DcmIODTypes::IE_FOR), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_TimeSource, "1","3", getName(), DcmIODTypes::IE_FOR), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_TimeDistributionProtocol, "1","3", getName(), DcmIODTypes::IE_FOR), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_NTPSourceAddress, "1","3", getName(), DcmIODTypes::IE_FOR), OFTrue);
}
diff --git a/dcmiod/libsrc/modusfor.cc b/dcmiod/libsrc/modusfor.cc
index 41d9d27..231cb61 100644
--- a/dcmiod/libsrc/modusfor.cc
+++ b/dcmiod/libsrc/modusfor.cc
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2015, Open Connections GmbH
+ * Copyright (C) 2015-2016, Open Connections GmbH
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation are maintained by
@@ -51,14 +51,14 @@ IODUSFoRModule::IODUSFoRModule()
void IODUSFoRModule::resetRules()
{
// parameters are tag, VM, type. Overwrite old rules if any.
- m_Rules->addRule(new IODRule(DCM_VolumeFrameOfReferenceUID, "1","1", m_ModuleName, DcmIODTypes::IE_FOR), OFTrue);
- m_Rules->addRule(new IODRule(DCM_UltrasoundAcquisitionGeometry, "1","1", m_ModuleName, DcmIODTypes::IE_FOR), OFTrue);
- m_Rules->addRule(new IODRule(DCM_ApexPosition, "3","1C", m_ModuleName, DcmIODTypes::IE_FOR), OFTrue);
- m_Rules->addRule(new IODRule(DCM_VolumeToTransducerRelationship, "1","1C", m_ModuleName, DcmIODTypes::IE_FOR), OFTrue);
- m_Rules->addRule(new IODRule(DCM_VolumeToTransducerMappingMatrix, "16","1", m_ModuleName, DcmIODTypes::IE_FOR), OFTrue);
- m_Rules->addRule(new IODRule(DCM_PatientFrameOfReferenceSource, "1","1C", m_ModuleName, DcmIODTypes::IE_FOR), OFTrue);
- m_Rules->addRule(new IODRule(DCM_TableFrameOfReferenceUID, "1","1C", m_ModuleName, DcmIODTypes::IE_FOR), OFTrue);
- m_Rules->addRule(new IODRule(DCM_VolumeToTableMappingMatrix, "16","1C", m_ModuleName, DcmIODTypes::IE_FOR), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_VolumeFrameOfReferenceUID, "1","1", getName(), DcmIODTypes::IE_FOR), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_UltrasoundAcquisitionGeometry, "1","1", getName(), DcmIODTypes::IE_FOR), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_ApexPosition, "3","1C", getName(), DcmIODTypes::IE_FOR), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_VolumeToTransducerRelationship, "1","1C", getName(), DcmIODTypes::IE_FOR), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_VolumeToTransducerMappingMatrix, "16","1", getName(), DcmIODTypes::IE_FOR), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_PatientFrameOfReferenceSource, "1","1C", getName(), DcmIODTypes::IE_FOR), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_TableFrameOfReferenceUID, "1","1C", getName(), DcmIODTypes::IE_FOR), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_VolumeToTableMappingMatrix, "16","1C", getName(), DcmIODTypes::IE_FOR), OFTrue);
}
diff --git a/dcmiod/tests/tcielabutil.cc b/dcmiod/tests/tcielabutil.cc
index 87f98ca..a4502f5 100644
--- a/dcmiod/tests/tcielabutil.cc
+++ b/dcmiod/tests/tcielabutil.cc
@@ -11,7 +11,7 @@
* D-26121 Oldenburg, Germany
*
*
- * Module: dcmseg
+ * Module: dcmiod
*
* Author: Michael Onken
*
diff --git a/dcmjpeg/docs/dcmcjpeg.man b/dcmjpeg/docs/dcmcjpeg.man
index 52ce96a..f41886a 100644
--- a/dcmjpeg/docs/dcmcjpeg.man
+++ b/dcmjpeg/docs/dcmcjpeg.man
@@ -376,14 +376,14 @@ VOI windowing for monochrome images (not with +tl):
compute VOI window using min-max algorithm
# Compute and apply a window center and width that covers the
- # range from the smallest to the largest occuring pixel value.
+ # range from the smallest to the largest occurring pixel value.
+Wn --min-max-window-n
compute VOI window using min-max algorithm,
ignoring extreme values
# Compute and apply a window center and width that covers the
- # range from the second smallest to the second largest occuring
+ # range from the second smallest to the second largest occurring
# pixel value. This is useful if the background is set to an
# artificial black (padding value) or if white overlays are burned
# into the image data which should not be considered for the window
@@ -417,7 +417,7 @@ pixel scaling for monochrome images (--no-windowing; ignored by +tl):
# Monochrome image pixel values are always scaled to make use of the
# pixel range available with the selected JPEG process as good as
# possible. This option selects a scaling based on the minimum and
- # maximum pixel value occuring in the image. This often leads to
+ # maximum pixel value occurring in the image. This often leads to
# significantly better image quality, but may cause different
# compressed images within one series to have different values for
# rescale slope and intercept, which is a problem if a presentation
@@ -549,7 +549,7 @@ are compliant with the DICOM standard. If in question, the \b dcmcjpeg utility
allows one to convert an image to secondary capture - this SOP class does not pose
restrictions as the ones mentioned above.
-With version DCMTK 3.5.4 a new encoder for truely lossless JPEG compression was
+With version DCMTK 3.5.4 a new encoder for truly lossless JPEG compression was
added (\e --true-lossless). Compared to the old (\e --pseudo-lossless) encoder,
that creates slightly lossy images caused from internal color space conversions,
windowing etc., there are a some issues to consider:
@@ -668,6 +668,6 @@ It is an error if no data dictionary can be loaded.
\section copyright COPYRIGHT
-Copyright (C) 2001-2014 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany.
+Copyright (C) 2001-2016 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany.
*/
diff --git a/dcmjpeg/libijg12/jdlhuff.c b/dcmjpeg/libijg12/jdlhuff.c
index 0480878..007e559 100644
--- a/dcmjpeg/libijg12/jdlhuff.c
+++ b/dcmjpeg/libijg12/jdlhuff.c
@@ -133,11 +133,16 @@ static const int extend_test[16] = /* entry n is 2**(n-1) */
{ 0, 0x0001, 0x0002, 0x0004, 0x0008, 0x0010, 0x0020, 0x0040, 0x0080,
0x0100, 0x0200, 0x0400, 0x0800, 0x1000, 0x2000, 0x4000 };
+/*
+ * Originally, a -1 was shifted but since shifting a negative value is
+ * undefined behavior, now "~0U" (bit-wise NOT unsigned int 0) is used,
+ * shifted and casted to an int. The result is the same, of course.
+ */
static const int extend_offset[16] = /* entry n is (-1 << n) + 1 */
- { 0, ((-1)<<1) + 1, ((-1)<<2) + 1, ((-1)<<3) + 1, ((-1)<<4) + 1,
- ((-1)<<5) + 1, ((-1)<<6) + 1, ((-1)<<7) + 1, ((-1)<<8) + 1,
- ((-1)<<9) + 1, ((-1)<<10) + 1, ((-1)<<11) + 1, ((-1)<<12) + 1,
- ((-1)<<13) + 1, ((-1)<<14) + 1, ((-1)<<15) + 1 };
+ { 0, (int)((~0U)<<1) + 1, (int)((~0U)<<2) + 1, (int)((~0U)<<3) + 1, (int)((~0U)<<4) + 1,
+ (int)((~0U)<<5) + 1, (int)((~0U)<<6) + 1, (int)((~0U)<<7) + 1, (int)((~0U)<<8) + 1,
+ (int)((~0U)<<9) + 1, (int)((~0U)<<10) + 1, (int)((~0U)<<11) + 1, (int)((~0U)<<12) + 1,
+ (int)((~0U)<<13) + 1, (int)((~0U)<<14) + 1, (int)((~0U)<<15) + 1 };
#endif /* AVOID_TABLES */
diff --git a/dcmjpeg/libijg12/jdphuff.c b/dcmjpeg/libijg12/jdphuff.c
index 5ed1732..5adbbaf 100644
--- a/dcmjpeg/libijg12/jdphuff.c
+++ b/dcmjpeg/libijg12/jdphuff.c
@@ -211,11 +211,16 @@ static const int extend_test[16] = /* entry n is 2**(n-1) */
{ 0, 0x0001, 0x0002, 0x0004, 0x0008, 0x0010, 0x0020, 0x0040, 0x0080,
0x0100, 0x0200, 0x0400, 0x0800, 0x1000, 0x2000, 0x4000 };
+/*
+ * Originally, a -1 was shifted but since shifting a negative value is
+ * undefined behavior, now "~0U" (bit-wise NOT unsigned int 0) is used,
+ * shifted and casted to an int. The result is the same, of course.
+ */
static const int extend_offset[16] = /* entry n is (-1 << n) + 1 */
- { 0, ((-1)<<1) + 1, ((-1)<<2) + 1, ((-1)<<3) + 1, ((-1)<<4) + 1,
- ((-1)<<5) + 1, ((-1)<<6) + 1, ((-1)<<7) + 1, ((-1)<<8) + 1,
- ((-1)<<9) + 1, ((-1)<<10) + 1, ((-1)<<11) + 1, ((-1)<<12) + 1,
- ((-1)<<13) + 1, ((-1)<<14) + 1, ((-1)<<15) + 1 };
+ { 0, (int)((~0U)<<1) + 1, (int)((~0U)<<2) + 1, (int)((~0U)<<3) + 1, (int)((~0U)<<4) + 1,
+ (int)((~0U)<<5) + 1, (int)((~0U)<<6) + 1, (int)((~0U)<<7) + 1, (int)((~0U)<<8) + 1,
+ (int)((~0U)<<9) + 1, (int)((~0U)<<10) + 1, (int)((~0U)<<11) + 1, (int)((~0U)<<12) + 1,
+ (int)((~0U)<<13) + 1, (int)((~0U)<<14) + 1, (int)((~0U)<<15) + 1 };
#endif /* AVOID_TABLES */
@@ -265,7 +270,7 @@ process_restart (j_decompress_ptr cinfo)
/*
* Huffman MCU decoding.
* Each of these routines decodes and returns one MCU's worth of
- * Huffman-compressed coefficients.
+ * Huffman-compressed coefficients.
* The coefficients are reordered from zigzag order into natural array order,
* but are not dequantized.
*
@@ -286,7 +291,7 @@ process_restart (j_decompress_ptr cinfo)
METHODDEF(boolean)
decode_mcu_DC_first (j_decompress_ptr cinfo, JBLOCKROW *MCU_data)
-{
+{
j_lossy_d_ptr lossyd = (j_lossy_d_ptr) cinfo->codec;
phuff_entropy_ptr entropy = (phuff_entropy_ptr) lossyd->entropy_private;
int Al = cinfo->Al;
@@ -358,7 +363,7 @@ decode_mcu_DC_first (j_decompress_ptr cinfo, JBLOCKROW *MCU_data)
METHODDEF(boolean)
decode_mcu_AC_first (j_decompress_ptr cinfo, JBLOCKROW *MCU_data)
-{
+{
j_lossy_d_ptr lossyd = (j_lossy_d_ptr) cinfo->codec;
phuff_entropy_ptr entropy = (phuff_entropy_ptr) lossyd->entropy_private;
int Se = cinfo->Se;
@@ -444,7 +449,7 @@ decode_mcu_AC_first (j_decompress_ptr cinfo, JBLOCKROW *MCU_data)
METHODDEF(boolean)
decode_mcu_DC_refine (j_decompress_ptr cinfo, JBLOCKROW *MCU_data)
-{
+{
j_lossy_d_ptr lossyd = (j_lossy_d_ptr) cinfo->codec;
phuff_entropy_ptr entropy = (phuff_entropy_ptr) lossyd->entropy_private;
int p1 = 1 << cinfo->Al; /* 1 in the bit position being coded */
@@ -494,12 +499,18 @@ decode_mcu_DC_refine (j_decompress_ptr cinfo, JBLOCKROW *MCU_data)
METHODDEF(boolean)
decode_mcu_AC_refine (j_decompress_ptr cinfo, JBLOCKROW *MCU_data)
-{
+{
j_lossy_d_ptr lossyd = (j_lossy_d_ptr) cinfo->codec;
phuff_entropy_ptr entropy = (phuff_entropy_ptr) lossyd->entropy_private;
int Se = cinfo->Se;
int p1 = 1 << cinfo->Al; /* 1 in the bit position being coded */
- int m1 = (-1) << cinfo->Al; /* -1 in the bit position being coded */
+
+ /* Originally, a -1 was shifted but since shifting a negative value is
+ * undefined behavior, now "~0U" (bit-wise NOT unsigned int 0) is used,
+ * shifted and casted to an int. The result is the same, of course.
+ */
+ int m1 = (int)((~0U) << cinfo->Al); /* -1 in the bit position being coded */
+
register int s, k, r;
unsigned int EOBRUN;
JBLOCKROW block;
@@ -667,7 +678,7 @@ jinit_phuff_decoder (j_decompress_ptr cinfo)
(*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
(size_t)cinfo->num_components*DCTSIZE2*SIZEOF(int));
coef_bit_ptr = & cinfo->coef_bits[0][0];
- for (ci = 0; ci < cinfo->num_components; ci++)
+ for (ci = 0; ci < cinfo->num_components; ci++)
for (i = 0; i < DCTSIZE2; i++)
*coef_bit_ptr++ = -1;
}
diff --git a/dcmjpeg/libijg12/jdshuff.c b/dcmjpeg/libijg12/jdshuff.c
index 5d2a043..79fbfdb 100644
--- a/dcmjpeg/libijg12/jdshuff.c
+++ b/dcmjpeg/libijg12/jdshuff.c
@@ -156,11 +156,16 @@ static const int extend_test[16] = /* entry n is 2**(n-1) */
{ 0, 0x0001, 0x0002, 0x0004, 0x0008, 0x0010, 0x0020, 0x0040, 0x0080,
0x0100, 0x0200, 0x0400, 0x0800, 0x1000, 0x2000, 0x4000 };
+/*
+ * Originally, a -1 was shifted but since shifting a negative value is
+ * undefined behavior, now "~0U" (bit-wise NOT unsigned int 0) is used,
+ * shifted and casted to an int. The result is the same, of course.
+ */
static const int extend_offset[16] = /* entry n is (-1 << n) + 1 */
- { 0, ((-1)<<1) + 1, ((-1)<<2) + 1, ((-1)<<3) + 1, ((-1)<<4) + 1,
- ((-1)<<5) + 1, ((-1)<<6) + 1, ((-1)<<7) + 1, ((-1)<<8) + 1,
- ((-1)<<9) + 1, ((-1)<<10) + 1, ((-1)<<11) + 1, ((-1)<<12) + 1,
- ((-1)<<13) + 1, ((-1)<<14) + 1, ((-1)<<15) + 1 };
+ { 0, (int)((~0U)<<1) + 1, (int)((~0U)<<2) + 1, (int)((~0U)<<3) + 1, (int)((~0U)<<4) + 1,
+ (int)((~0U)<<5) + 1, (int)((~0U)<<6) + 1, (int)((~0U)<<7) + 1, (int)((~0U)<<8) + 1,
+ (int)((~0U)<<9) + 1, (int)((~0U)<<10) + 1, (int)((~0U)<<11) + 1, (int)((~0U)<<12) + 1,
+ (int)((~0U)<<13) + 1, (int)((~0U)<<14) + 1, (int)((~0U)<<15) + 1 };
#endif /* AVOID_TABLES */
@@ -278,10 +283,10 @@ decode_mcu (j_decompress_ptr cinfo, JBLOCKROW *MCU_data)
/* Since zeroes are skipped, output area must be cleared beforehand */
for (k = 1; k < DCTSIZE2; k++) {
HUFF_DECODE(s, br_state, actbl, return FALSE, label2);
-
+
r = s >> 4;
s &= 15;
-
+
if (s) {
k += r;
CHECK_BIT_BUFFER(br_state, s, return FALSE);
@@ -305,10 +310,10 @@ decode_mcu (j_decompress_ptr cinfo, JBLOCKROW *MCU_data)
/* In this path we just discard the values */
for (k = 1; k < DCTSIZE2; k++) {
HUFF_DECODE(s, br_state, actbl, return FALSE, label3);
-
+
r = s >> 4;
s &= 15;
-
+
if (s) {
k += r;
CHECK_BIT_BUFFER(br_state, s, return FALSE);
diff --git a/dcmjpeg/libijg16/jdlhuff.c b/dcmjpeg/libijg16/jdlhuff.c
index 06797d8..34d18aa 100644
--- a/dcmjpeg/libijg16/jdlhuff.c
+++ b/dcmjpeg/libijg16/jdlhuff.c
@@ -133,11 +133,16 @@ static const int extend_test[16] = /* entry n is 2**(n-1) */
{ 0, 0x0001, 0x0002, 0x0004, 0x0008, 0x0010, 0x0020, 0x0040, 0x0080,
0x0100, 0x0200, 0x0400, 0x0800, 0x1000, 0x2000, 0x4000 };
+/*
+ * Originally, a -1 was shifted but since shifting a negative value is
+ * undefined behavior, now "~0U" (bit-wise NOT unsigned int 0) is used,
+ * shifted and casted to an int. The result is the same, of course.
+ */
static const int extend_offset[16] = /* entry n is (-1 << n) + 1 */
- { 0, ((-1)<<1) + 1, ((-1)<<2) + 1, ((-1)<<3) + 1, ((-1)<<4) + 1,
- ((-1)<<5) + 1, ((-1)<<6) + 1, ((-1)<<7) + 1, ((-1)<<8) + 1,
- ((-1)<<9) + 1, ((-1)<<10) + 1, ((-1)<<11) + 1, ((-1)<<12) + 1,
- ((-1)<<13) + 1, ((-1)<<14) + 1, ((-1)<<15) + 1 };
+ { 0, (int)((~0U)<<1) + 1, (int)((~0U)<<2) + 1, (int)((~0U)<<3) + 1, (int)((~0U)<<4) + 1,
+ (int)((~0U)<<5) + 1, (int)((~0U)<<6) + 1, (int)((~0U)<<7) + 1, (int)((~0U)<<8) + 1,
+ (int)((~0U)<<9) + 1, (int)((~0U)<<10) + 1, (int)((~0U)<<11) + 1, (int)((~0U)<<12) + 1,
+ (int)((~0U)<<13) + 1, (int)((~0U)<<14) + 1, (int)((~0U)<<15) + 1 };
#endif /* AVOID_TABLES */
diff --git a/dcmjpeg/libijg16/jdphuff.c b/dcmjpeg/libijg16/jdphuff.c
index 1367966..f68cf51 100644
--- a/dcmjpeg/libijg16/jdphuff.c
+++ b/dcmjpeg/libijg16/jdphuff.c
@@ -211,11 +211,16 @@ static const int extend_test[16] = /* entry n is 2**(n-1) */
{ 0, 0x0001, 0x0002, 0x0004, 0x0008, 0x0010, 0x0020, 0x0040, 0x0080,
0x0100, 0x0200, 0x0400, 0x0800, 0x1000, 0x2000, 0x4000 };
+/*
+ * Originally, a -1 was shifted but since shifting a negative value is
+ * undefined behavior, now "~0U" (bit-wise NOT unsigned int 0) is used,
+ * shifted and casted to an int. The result is the same, of course.
+ */
static const int extend_offset[16] = /* entry n is (-1 << n) + 1 */
- { 0, ((-1)<<1) + 1, ((-1)<<2) + 1, ((-1)<<3) + 1, ((-1)<<4) + 1,
- ((-1)<<5) + 1, ((-1)<<6) + 1, ((-1)<<7) + 1, ((-1)<<8) + 1,
- ((-1)<<9) + 1, ((-1)<<10) + 1, ((-1)<<11) + 1, ((-1)<<12) + 1,
- ((-1)<<13) + 1, ((-1)<<14) + 1, ((-1)<<15) + 1 };
+ { 0, (int)((~0U)<<1) + 1, (int)((~0U)<<2) + 1, (int)((~0U)<<3) + 1, (int)((~0U)<<4) + 1,
+ (int)((~0U)<<5) + 1, (int)((~0U)<<6) + 1, (int)((~0U)<<7) + 1, (int)((~0U)<<8) + 1,
+ (int)((~0U)<<9) + 1, (int)((~0U)<<10) + 1, (int)((~0U)<<11) + 1, (int)((~0U)<<12) + 1,
+ (int)((~0U)<<13) + 1, (int)((~0U)<<14) + 1, (int)((~0U)<<15) + 1 };
#endif /* AVOID_TABLES */
@@ -265,7 +270,7 @@ process_restart (j_decompress_ptr cinfo)
/*
* Huffman MCU decoding.
* Each of these routines decodes and returns one MCU's worth of
- * Huffman-compressed coefficients.
+ * Huffman-compressed coefficients.
* The coefficients are reordered from zigzag order into natural array order,
* but are not dequantized.
*
@@ -286,7 +291,7 @@ process_restart (j_decompress_ptr cinfo)
METHODDEF(boolean)
decode_mcu_DC_first (j_decompress_ptr cinfo, JBLOCKROW *MCU_data)
-{
+{
j_lossy_d_ptr lossyd = (j_lossy_d_ptr) cinfo->codec;
phuff_entropy_ptr entropy = (phuff_entropy_ptr) lossyd->entropy_private;
int Al = cinfo->Al;
@@ -358,7 +363,7 @@ decode_mcu_DC_first (j_decompress_ptr cinfo, JBLOCKROW *MCU_data)
METHODDEF(boolean)
decode_mcu_AC_first (j_decompress_ptr cinfo, JBLOCKROW *MCU_data)
-{
+{
j_lossy_d_ptr lossyd = (j_lossy_d_ptr) cinfo->codec;
phuff_entropy_ptr entropy = (phuff_entropy_ptr) lossyd->entropy_private;
int Se = cinfo->Se;
@@ -444,7 +449,7 @@ decode_mcu_AC_first (j_decompress_ptr cinfo, JBLOCKROW *MCU_data)
METHODDEF(boolean)
decode_mcu_DC_refine (j_decompress_ptr cinfo, JBLOCKROW *MCU_data)
-{
+{
j_lossy_d_ptr lossyd = (j_lossy_d_ptr) cinfo->codec;
phuff_entropy_ptr entropy = (phuff_entropy_ptr) lossyd->entropy_private;
int p1 = 1 << cinfo->Al; /* 1 in the bit position being coded */
@@ -494,12 +499,18 @@ decode_mcu_DC_refine (j_decompress_ptr cinfo, JBLOCKROW *MCU_data)
METHODDEF(boolean)
decode_mcu_AC_refine (j_decompress_ptr cinfo, JBLOCKROW *MCU_data)
-{
+{
j_lossy_d_ptr lossyd = (j_lossy_d_ptr) cinfo->codec;
phuff_entropy_ptr entropy = (phuff_entropy_ptr) lossyd->entropy_private;
int Se = cinfo->Se;
int p1 = 1 << cinfo->Al; /* 1 in the bit position being coded */
- int m1 = (-1) << cinfo->Al; /* -1 in the bit position being coded */
+
+ /* Originally, a -1 was shifted but since shifting a negative value is
+ * undefined behavior, now "~0U" (bit-wise NOT unsigned int 0) is used,
+ * shifted and casted to an int. The result is the same, of course.
+ */
+ int m1 = (int)((~0U) << cinfo->Al); /* -1 in the bit position being coded */
+
register int s, k, r;
unsigned int EOBRUN;
JBLOCKROW block;
@@ -667,7 +678,7 @@ jinit_phuff_decoder (j_decompress_ptr cinfo)
(*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
(size_t)cinfo->num_components*DCTSIZE2*SIZEOF(int));
coef_bit_ptr = & cinfo->coef_bits[0][0];
- for (ci = 0; ci < cinfo->num_components; ci++)
+ for (ci = 0; ci < cinfo->num_components; ci++)
for (i = 0; i < DCTSIZE2; i++)
*coef_bit_ptr++ = -1;
}
diff --git a/dcmjpeg/libijg16/jdshuff.c b/dcmjpeg/libijg16/jdshuff.c
index 342c589..16b4f2e 100644
--- a/dcmjpeg/libijg16/jdshuff.c
+++ b/dcmjpeg/libijg16/jdshuff.c
@@ -156,11 +156,16 @@ static const int extend_test[16] = /* entry n is 2**(n-1) */
{ 0, 0x0001, 0x0002, 0x0004, 0x0008, 0x0010, 0x0020, 0x0040, 0x0080,
0x0100, 0x0200, 0x0400, 0x0800, 0x1000, 0x2000, 0x4000 };
+/*
+ * Originally, a -1 was shifted but since shifting a negative value is
+ * undefined behavior, now "~0U" (bit-wise NOT unsigned int 0) is used,
+ * shifted and casted to an int. The result is the same, of course.
+ */
static const int extend_offset[16] = /* entry n is (-1 << n) + 1 */
- { 0, ((-1)<<1) + 1, ((-1)<<2) + 1, ((-1)<<3) + 1, ((-1)<<4) + 1,
- ((-1)<<5) + 1, ((-1)<<6) + 1, ((-1)<<7) + 1, ((-1)<<8) + 1,
- ((-1)<<9) + 1, ((-1)<<10) + 1, ((-1)<<11) + 1, ((-1)<<12) + 1,
- ((-1)<<13) + 1, ((-1)<<14) + 1, ((-1)<<15) + 1 };
+ { 0, (int)((~0U)<<1) + 1, (int)((~0U)<<2) + 1, (int)((~0U)<<3) + 1, (int)((~0U)<<4) + 1,
+ (int)((~0U)<<5) + 1, (int)((~0U)<<6) + 1, (int)((~0U)<<7) + 1, (int)((~0U)<<8) + 1,
+ (int)((~0U)<<9) + 1, (int)((~0U)<<10) + 1, (int)((~0U)<<11) + 1, (int)((~0U)<<12) + 1,
+ (int)((~0U)<<13) + 1, (int)((~0U)<<14) + 1, (int)((~0U)<<15) + 1 };
#endif /* AVOID_TABLES */
@@ -278,10 +283,10 @@ decode_mcu (j_decompress_ptr cinfo, JBLOCKROW *MCU_data)
/* Since zeroes are skipped, output area must be cleared beforehand */
for (k = 1; k < DCTSIZE2; k++) {
HUFF_DECODE(s, br_state, actbl, return FALSE, label2);
-
+
r = s >> 4;
s &= 15;
-
+
if (s) {
k += r;
CHECK_BIT_BUFFER(br_state, s, return FALSE);
@@ -305,10 +310,10 @@ decode_mcu (j_decompress_ptr cinfo, JBLOCKROW *MCU_data)
/* In this path we just discard the values */
for (k = 1; k < DCTSIZE2; k++) {
HUFF_DECODE(s, br_state, actbl, return FALSE, label3);
-
+
r = s >> 4;
s &= 15;
-
+
if (s) {
k += r;
CHECK_BIT_BUFFER(br_state, s, return FALSE);
diff --git a/dcmjpeg/libijg8/jdlhuff.c b/dcmjpeg/libijg8/jdlhuff.c
index 21bd09a..13ec816 100644
--- a/dcmjpeg/libijg8/jdlhuff.c
+++ b/dcmjpeg/libijg8/jdlhuff.c
@@ -133,11 +133,16 @@ static const int extend_test[16] = /* entry n is 2**(n-1) */
{ 0, 0x0001, 0x0002, 0x0004, 0x0008, 0x0010, 0x0020, 0x0040, 0x0080,
0x0100, 0x0200, 0x0400, 0x0800, 0x1000, 0x2000, 0x4000 };
+/*
+ * Originally, a -1 was shifted but since shifting a negative value is
+ * undefined behavior, now "~0U" (bit-wise NOT unsigned int 0) is used,
+ * shifted and casted to an int. The result is the same, of course.
+ */
static const int extend_offset[16] = /* entry n is (-1 << n) + 1 */
- { 0, ((-1)<<1) + 1, ((-1)<<2) + 1, ((-1)<<3) + 1, ((-1)<<4) + 1,
- ((-1)<<5) + 1, ((-1)<<6) + 1, ((-1)<<7) + 1, ((-1)<<8) + 1,
- ((-1)<<9) + 1, ((-1)<<10) + 1, ((-1)<<11) + 1, ((-1)<<12) + 1,
- ((-1)<<13) + 1, ((-1)<<14) + 1, ((-1)<<15) + 1 };
+ { 0, (int)((~0U)<<1) + 1, (int)((~0U)<<2) + 1, (int)((~0U)<<3) + 1, (int)((~0U)<<4) + 1,
+ (int)((~0U)<<5) + 1, (int)((~0U)<<6) + 1, (int)((~0U)<<7) + 1, (int)((~0U)<<8) + 1,
+ (int)((~0U)<<9) + 1, (int)((~0U)<<10) + 1, (int)((~0U)<<11) + 1, (int)((~0U)<<12) + 1,
+ (int)((~0U)<<13) + 1, (int)((~0U)<<14) + 1, (int)((~0U)<<15) + 1 };
#endif /* AVOID_TABLES */
diff --git a/dcmjpeg/libijg8/jdphuff.c b/dcmjpeg/libijg8/jdphuff.c
index 3f0cf16..2dcfe77 100644
--- a/dcmjpeg/libijg8/jdphuff.c
+++ b/dcmjpeg/libijg8/jdphuff.c
@@ -211,11 +211,16 @@ static const int extend_test[16] = /* entry n is 2**(n-1) */
{ 0, 0x0001, 0x0002, 0x0004, 0x0008, 0x0010, 0x0020, 0x0040, 0x0080,
0x0100, 0x0200, 0x0400, 0x0800, 0x1000, 0x2000, 0x4000 };
+/*
+ * Originally, a -1 was shifted but since shifting a negative value is
+ * undefined behavior, now "~0U" (bit-wise NOT unsigned int 0) is used,
+ * shifted and casted to an int. The result is the same, of course.
+ */
static const int extend_offset[16] = /* entry n is (-1 << n) + 1 */
- { 0, ((-1)<<1) + 1, ((-1)<<2) + 1, ((-1)<<3) + 1, ((-1)<<4) + 1,
- ((-1)<<5) + 1, ((-1)<<6) + 1, ((-1)<<7) + 1, ((-1)<<8) + 1,
- ((-1)<<9) + 1, ((-1)<<10) + 1, ((-1)<<11) + 1, ((-1)<<12) + 1,
- ((-1)<<13) + 1, ((-1)<<14) + 1, ((-1)<<15) + 1 };
+ { 0, (int)((~0U)<<1) + 1, (int)((~0U)<<2) + 1, (int)((~0U)<<3) + 1, (int)((~0U)<<4) + 1,
+ (int)((~0U)<<5) + 1, (int)((~0U)<<6) + 1, (int)((~0U)<<7) + 1, (int)((~0U)<<8) + 1,
+ (int)((~0U)<<9) + 1, (int)((~0U)<<10) + 1, (int)((~0U)<<11) + 1, (int)((~0U)<<12) + 1,
+ (int)((~0U)<<13) + 1, (int)((~0U)<<14) + 1, (int)((~0U)<<15) + 1 };
#endif /* AVOID_TABLES */
@@ -265,7 +270,7 @@ process_restart (j_decompress_ptr cinfo)
/*
* Huffman MCU decoding.
* Each of these routines decodes and returns one MCU's worth of
- * Huffman-compressed coefficients.
+ * Huffman-compressed coefficients.
* The coefficients are reordered from zigzag order into natural array order,
* but are not dequantized.
*
@@ -286,7 +291,7 @@ process_restart (j_decompress_ptr cinfo)
METHODDEF(boolean)
decode_mcu_DC_first (j_decompress_ptr cinfo, JBLOCKROW *MCU_data)
-{
+{
j_lossy_d_ptr lossyd = (j_lossy_d_ptr) cinfo->codec;
phuff_entropy_ptr entropy = (phuff_entropy_ptr) lossyd->entropy_private;
int Al = cinfo->Al;
@@ -358,7 +363,7 @@ decode_mcu_DC_first (j_decompress_ptr cinfo, JBLOCKROW *MCU_data)
METHODDEF(boolean)
decode_mcu_AC_first (j_decompress_ptr cinfo, JBLOCKROW *MCU_data)
-{
+{
j_lossy_d_ptr lossyd = (j_lossy_d_ptr) cinfo->codec;
phuff_entropy_ptr entropy = (phuff_entropy_ptr) lossyd->entropy_private;
int Se = cinfo->Se;
@@ -444,7 +449,7 @@ decode_mcu_AC_first (j_decompress_ptr cinfo, JBLOCKROW *MCU_data)
METHODDEF(boolean)
decode_mcu_DC_refine (j_decompress_ptr cinfo, JBLOCKROW *MCU_data)
-{
+{
j_lossy_d_ptr lossyd = (j_lossy_d_ptr) cinfo->codec;
phuff_entropy_ptr entropy = (phuff_entropy_ptr) lossyd->entropy_private;
int p1 = 1 << cinfo->Al; /* 1 in the bit position being coded */
@@ -494,12 +499,18 @@ decode_mcu_DC_refine (j_decompress_ptr cinfo, JBLOCKROW *MCU_data)
METHODDEF(boolean)
decode_mcu_AC_refine (j_decompress_ptr cinfo, JBLOCKROW *MCU_data)
-{
+{
j_lossy_d_ptr lossyd = (j_lossy_d_ptr) cinfo->codec;
phuff_entropy_ptr entropy = (phuff_entropy_ptr) lossyd->entropy_private;
int Se = cinfo->Se;
int p1 = 1 << cinfo->Al; /* 1 in the bit position being coded */
- int m1 = (-1) << cinfo->Al; /* -1 in the bit position being coded */
+
+ /* Originally, a -1 was shifted but since shifting a negative value is
+ * undefined behavior, now "~0U" (bit-wise NOT unsigned int 0) is used,
+ * shifted and casted to an int. The result is the same, of course.
+ */
+ int m1 = (int)((~0U) << cinfo->Al); /* -1 in the bit position being coded */
+
register int s, k, r;
unsigned int EOBRUN;
JBLOCKROW block;
@@ -667,7 +678,7 @@ jinit_phuff_decoder (j_decompress_ptr cinfo)
(*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
(size_t)cinfo->num_components*DCTSIZE2*SIZEOF(int));
coef_bit_ptr = & cinfo->coef_bits[0][0];
- for (ci = 0; ci < cinfo->num_components; ci++)
+ for (ci = 0; ci < cinfo->num_components; ci++)
for (i = 0; i < DCTSIZE2; i++)
*coef_bit_ptr++ = -1;
}
diff --git a/dcmjpeg/libijg8/jdshuff.c b/dcmjpeg/libijg8/jdshuff.c
index 930f8c9..efb207b 100644
--- a/dcmjpeg/libijg8/jdshuff.c
+++ b/dcmjpeg/libijg8/jdshuff.c
@@ -156,11 +156,16 @@ static const int extend_test[16] = /* entry n is 2**(n-1) */
{ 0, 0x0001, 0x0002, 0x0004, 0x0008, 0x0010, 0x0020, 0x0040, 0x0080,
0x0100, 0x0200, 0x0400, 0x0800, 0x1000, 0x2000, 0x4000 };
+/*
+ * Originally, a -1 was shifted but since shifting a negative value is
+ * undefined behavior, now "~0U" (bit-wise NOT unsigned int 0) is used,
+ * shifted and casted to an int. The result is the same, of course.
+ */
static const int extend_offset[16] = /* entry n is (-1 << n) + 1 */
- { 0, ((-1)<<1) + 1, ((-1)<<2) + 1, ((-1)<<3) + 1, ((-1)<<4) + 1,
- ((-1)<<5) + 1, ((-1)<<6) + 1, ((-1)<<7) + 1, ((-1)<<8) + 1,
- ((-1)<<9) + 1, ((-1)<<10) + 1, ((-1)<<11) + 1, ((-1)<<12) + 1,
- ((-1)<<13) + 1, ((-1)<<14) + 1, ((-1)<<15) + 1 };
+ { 0, (int)((~0U)<<1) + 1, (int)((~0U)<<2) + 1, (int)((~0U)<<3) + 1, (int)((~0U)<<4) + 1,
+ (int)((~0U)<<5) + 1, (int)((~0U)<<6) + 1, (int)((~0U)<<7) + 1, (int)((~0U)<<8) + 1,
+ (int)((~0U)<<9) + 1, (int)((~0U)<<10) + 1, (int)((~0U)<<11) + 1, (int)((~0U)<<12) + 1,
+ (int)((~0U)<<13) + 1, (int)((~0U)<<14) + 1, (int)((~0U)<<15) + 1 };
#endif /* AVOID_TABLES */
@@ -278,10 +283,10 @@ decode_mcu (j_decompress_ptr cinfo, JBLOCKROW *MCU_data)
/* Since zeroes are skipped, output area must be cleared beforehand */
for (k = 1; k < DCTSIZE2; k++) {
HUFF_DECODE(s, br_state, actbl, return FALSE, label2);
-
+
r = s >> 4;
s &= 15;
-
+
if (s) {
k += r;
CHECK_BIT_BUFFER(br_state, s, return FALSE);
@@ -305,10 +310,10 @@ decode_mcu (j_decompress_ptr cinfo, JBLOCKROW *MCU_data)
/* In this path we just discard the values */
for (k = 1; k < DCTSIZE2; k++) {
HUFF_DECODE(s, br_state, actbl, return FALSE, label3);
-
+
r = s >> 4;
s &= 15;
-
+
if (s) {
k += r;
CHECK_BIT_BUFFER(br_state, s, return FALSE);
diff --git a/dcmjpeg/libsrc/djcodecd.cc b/dcmjpeg/libsrc/djcodecd.cc
index 319c8e6..b5aad2e 100644
--- a/dcmjpeg/libsrc/djcodecd.cc
+++ b/dcmjpeg/libsrc/djcodecd.cc
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2001-2014, OFFIS e.V.
+ * Copyright (C) 2001-2016, OFFIS e.V.
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation were developed by
@@ -767,11 +767,11 @@ OFCondition DJCodecDecoder::createPlanarConfigurationByte(
if (buf)
{
memcpy(buf, imageFrame, 3*numPixels);
- register Uint8 *s = buf; // source
- register Uint8 *r = imageFrame; // red plane
- register Uint8 *g = imageFrame + numPixels; // green plane
- register Uint8 *b = imageFrame + (2*numPixels); // blue plane
- for (register size_t i=numPixels; i; i--)
+ Uint8 *s = buf; // source
+ Uint8 *r = imageFrame; // red plane
+ Uint8 *g = imageFrame + numPixels; // green plane
+ Uint8 *b = imageFrame + (2*numPixels); // blue plane
+ for (size_t i=numPixels; i; i--)
{
*r++ = *s++;
*g++ = *s++;
@@ -796,11 +796,11 @@ OFCondition DJCodecDecoder::createPlanarConfigurationWord(
if (buf)
{
memcpy(buf, imageFrame, 3*numPixels*sizeof(Uint16));
- register Uint16 *s = buf; // source
- register Uint16 *r = imageFrame; // red plane
- register Uint16 *g = imageFrame + numPixels; // green plane
- register Uint16 *b = imageFrame + (2*numPixels); // blue plane
- for (register size_t i=numPixels; i; i--)
+ Uint16 *s = buf; // source
+ Uint16 *r = imageFrame; // red plane
+ Uint16 *g = imageFrame + numPixels; // green plane
+ Uint16 *b = imageFrame + (2*numPixels); // blue plane
+ for (size_t i=numPixels; i; i--)
{
*r++ = *s++;
*g++ = *s++;
diff --git a/dcmjpeg/libsrc/djcodece.cc b/dcmjpeg/libsrc/djcodece.cc
index 72c0404..43461aa 100644
--- a/dcmjpeg/libsrc/djcodece.cc
+++ b/dcmjpeg/libsrc/djcodece.cc
@@ -1415,7 +1415,7 @@ OFCondition DJCodecEncoder::togglePlanarConfiguration8(
const Uint16 samplesPerPixel,
const Uint16 oldPlanarConfig)
{
- if ( (pixelData == NULL) || (numValues%samplesPerPixel != 0) )
+ if ( (pixelData == NULL) )
return EC_IllegalParameter;
// allocate target buffer
Uint8* px8 = new Uint8[numValues];
@@ -1451,7 +1451,7 @@ OFCondition DJCodecEncoder::togglePlanarConfiguration16(
const Uint16 samplesPerPixel,
const Uint16 oldPlanarConfig)
{
- if ( (pixelData == NULL) || (numValues%samplesPerPixel != 0) )
+ if ( (pixelData == NULL) )
return EC_IllegalParameter;
// allocate target buffer
Uint16* px16 = new Uint16[numValues];
diff --git a/dcmjpls/docs/dcmcjpls.man b/dcmjpls/docs/dcmcjpls.man
index ceb4a03..be5fe13 100644
--- a/dcmjpls/docs/dcmcjpls.man
+++ b/dcmjpls/docs/dcmcjpls.man
@@ -160,7 +160,7 @@ JPEG-LS interleave:
# This flag forces sample-interleaved mode for the resulting image.
# In sample-interleave mode each pixel's components are encoded before
- # the next pixe is encoded.
+ # the next pixel is encoded.
+in --interleave-none
force uninterleaved JPEG-LS images
@@ -376,6 +376,6 @@ It is an error if no data dictionary can be loaded.
\section copyright COPYRIGHT
-Copyright (C) 2009-2014 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany.
+Copyright (C) 2009-2016 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany.
*/
diff --git a/dcmjpls/libcharls/encodstr.h b/dcmjpls/libcharls/encodstr.h
index 7cd32ea..ecc823c 100644
--- a/dcmjpls/libcharls/encodstr.h
+++ b/dcmjpls/libcharls/encodstr.h
@@ -15,147 +15,153 @@ class EncoderStrategy
{
public:
- explicit EncoderStrategy(const JlsParameters& info) :
- _qdecoder(0),
- _info(info),
- _processLine(0),
- valcurrent(0),
- bitpos(0),
- _isFFWritten(false),
- _bytesWritten(0)
-
- {
- }
-
- virtual ~EncoderStrategy()
- {
- }
-
- LONG PeekByte();
-
- void OnLineBegin(LONG cpixel, void* ptypeBuffer, LONG pixelStride)
- {
- _processLine->NewLineRequested(ptypeBuffer, cpixel, pixelStride);
- }
-
- void OnLineEnd(LONG /*cpixel*/, void* /*ptypeBuffer*/, LONG /*pixelStride*/) { }
+ explicit EncoderStrategy(const JlsParameters& info) :
+ _qdecoder(0),
+ _info(info),
+ _processLine(0),
+ valcurrent(0),
+ bitpos(0),
+ _isFFWritten(false),
+ _bytesWritten(0)
+
+ {
+ }
+
+ virtual ~EncoderStrategy()
+ {
+ }
+
+ LONG PeekByte();
+
+ void OnLineBegin(LONG cpixel, void* ptypeBuffer, LONG pixelStride)
+ {
+ _processLine->NewLineRequested(ptypeBuffer, cpixel, pixelStride);
+ }
+
+ void OnLineEnd(LONG /*cpixel*/, void* /*ptypeBuffer*/, LONG /*pixelStride*/) { }
virtual void SetPresets(const JlsCustomParameters& presets) = 0;
-
- virtual size_t EncodeScan(const void* pvoid, void* pvoidOut, size_t byteCount, void* pvoidCompare) = 0;
+
+ virtual size_t EncodeScan(const void* pvoid, void* pvoidOut, size_t byteCount, void* pvoidCompare) = 0;
protected:
- void Init(BYTE* compressedBytes, size_t byteCount)
- {
- bitpos = 32;
- valcurrent = 0;
- _position = compressedBytes;
- _compressedLength = byteCount;
- }
+ void Init(BYTE* compressedBytes, size_t byteCount)
+ {
+ bitpos = 32;
+ valcurrent = 0;
+ _position = compressedBytes;
+ _compressedLength = byteCount;
+ }
- void AppendToBitStream(LONG value, LONG length)
- {
- ASSERT(length < 32 && length >= 0);
+ void AppendToBitStream(LONG value, LONG length)
+ {
+ ASSERT(length < 32 && length >= 0);
- ASSERT((_qdecoder.get() == NULL) || (length == 0 && value == 0) ||( _qdecoder->ReadLongValue(length) == value));
+ ASSERT((_qdecoder.get() == NULL) || (length == 0 && value == 0) ||( _qdecoder->ReadLongValue(length) == value));
#ifndef NDEBUG
- if (length < 32)
- {
- int mask = (1 << (length)) - 1;
- ASSERT((value | mask) == mask);
- }
+ if (length < 32)
+ {
+ int mask = (1 << (length)) - 1;
+ ASSERT((value | mask) == mask);
+ }
#endif
- bitpos -= length;
- if (bitpos > 0)
- {
- valcurrent = valcurrent | (value << bitpos);
- return;
- }
- valcurrent |= value >> -bitpos;
-
- Flush();
-
- ASSERT(bitpos >= 0);
- if (bitpos < 32)
- valcurrent |= value << bitpos;
- }
-
- void EndScan()
- {
- Flush();
-
- // if a 0xff was written, Flush() will force one unset bit anyway
- if (_isFFWritten)
- AppendToBitStream(0, (bitpos - 1) % 8);
- else
- AppendToBitStream(0, bitpos % 8);
-
- Flush();
- ASSERT(bitpos == 0x20);
- }
-
- void Flush()
- {
- for (LONG i = 0; i < 4; ++i)
- {
- if (bitpos >= 32)
- break;
-
- if (_isFFWritten)
- {
- // insert highmost bit
- *_position = BYTE(valcurrent >> 25);
- valcurrent = valcurrent << 7;
- bitpos += 7;
- _isFFWritten = false;
- }
- else
- {
- *_position = BYTE(valcurrent >> 24);
- valcurrent = valcurrent << 8;
- bitpos += 8;
- _isFFWritten = *_position == 0xFF;
- }
-
- _position++;
- _compressedLength--;
- _bytesWritten++;
-
- }
-
- }
-
- size_t GetLength()
- {
- return _bytesWritten - (bitpos -32)/8;
- }
-
-
- inlinehint void AppendOnesToBitStream(LONG length)
- {
- AppendToBitStream((1 << length) - 1, length);
- }
-
-
- OFauto_ptr<DecoderStrategy> _qdecoder;
+ bitpos -= length;
+ if (bitpos >= 0)
+ {
+ valcurrent = valcurrent | (value << bitpos);
+ return;
+ }
+
+ valcurrent |= value >> -bitpos;
+ Flush();
+
+ // A second flush may be required if extra marker-detect bits were needed and not all bits could be written.
+ if (bitpos < 0)
+ {
+ valcurrent |= value >> -bitpos;
+ Flush();
+ }
+
+ ASSERT(bitpos >=0);
+ valcurrent |= value << bitpos;
+ }
+
+ void EndScan()
+ {
+ Flush();
+
+ // if a 0xff was written, Flush() will force one unset bit anyway
+ if (_isFFWritten)
+ AppendToBitStream(0, (bitpos - 1) % 8);
+ else
+ AppendToBitStream(0, bitpos % 8);
+
+ Flush();
+ ASSERT(bitpos == 0x20);
+ }
+
+ void Flush()
+ {
+ for (LONG i = 0; i < 4; ++i)
+ {
+ if (bitpos >= 32)
+ break;
+
+ if (_isFFWritten)
+ {
+ // JPEG-LS requirement (T.87, A.1) to detect markers: after a xFF value a single 0 bit needs to be inserted.
+ *_position = BYTE(valcurrent >> 25);
+ valcurrent = valcurrent << 7;
+ bitpos += 7;
+ _isFFWritten = false;
+ }
+ else
+ {
+ *_position = BYTE(valcurrent >> 24);
+ valcurrent = valcurrent << 8;
+ bitpos += 8;
+ _isFFWritten = *_position == 0xFF;
+ }
+
+ _position++;
+ _compressedLength--;
+ _bytesWritten++;
+
+ }
+
+ }
+
+ size_t GetLength()
+ {
+ return _bytesWritten - (bitpos -32)/8;
+ }
+
+
+ inlinehint void AppendOnesToBitStream(LONG length)
+ {
+ AppendToBitStream((1 << length) - 1, length);
+ }
+
+
+ OFauto_ptr<DecoderStrategy> _qdecoder;
protected:
- JlsParameters _info;
- OFauto_ptr<ProcessLine> _processLine;
+ JlsParameters _info;
+ OFauto_ptr<ProcessLine> _processLine;
private:
- unsigned int valcurrent;
- LONG bitpos;
- size_t _compressedLength;
-
- // encoding
- BYTE* _position;
- bool _isFFWritten;
- size_t _bytesWritten;
+ unsigned int valcurrent;
+ LONG bitpos;
+ size_t _compressedLength;
+
+ // encoding
+ BYTE* _position;
+ bool _isFFWritten;
+ size_t _bytesWritten;
};
diff --git a/dcmjpls/libsrc/djcodecd.cc b/dcmjpls/libsrc/djcodecd.cc
index a6c0c6f..3e75759 100644
--- a/dcmjpls/libsrc/djcodecd.cc
+++ b/dcmjpls/libsrc/djcodecd.cc
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2007-2011, OFFIS e.V.
+ * Copyright (C) 2007-2016, OFFIS e.V.
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation were developed by
@@ -637,11 +637,11 @@ OFCondition DJLSDecoderBase::createPlanarConfiguration1Byte(
if (buf)
{
memcpy(buf, imageFrame, (size_t)(3*numPixels));
- register Uint8 *s = buf; // source
- register Uint8 *r = imageFrame; // red plane
- register Uint8 *g = imageFrame + numPixels; // green plane
- register Uint8 *b = imageFrame + (2*numPixels); // blue plane
- for (register unsigned long i=numPixels; i; i--)
+ Uint8 *s = buf; // source
+ Uint8 *r = imageFrame; // red plane
+ Uint8 *g = imageFrame + numPixels; // green plane
+ Uint8 *b = imageFrame + (2*numPixels); // blue plane
+ for (unsigned long i=numPixels; i; i--)
{
*r++ = *s++;
*g++ = *s++;
@@ -667,11 +667,11 @@ OFCondition DJLSDecoderBase::createPlanarConfiguration1Word(
if (buf)
{
memcpy(buf, imageFrame, (size_t)(3*numPixels*sizeof(Uint16)));
- register Uint16 *s = buf; // source
- register Uint16 *r = imageFrame; // red plane
- register Uint16 *g = imageFrame + numPixels; // green plane
- register Uint16 *b = imageFrame + (2*numPixels); // blue plane
- for (register unsigned long i=numPixels; i; i--)
+ Uint16 *s = buf; // source
+ Uint16 *r = imageFrame; // red plane
+ Uint16 *g = imageFrame + numPixels; // green plane
+ Uint16 *b = imageFrame + (2*numPixels); // blue plane
+ for (unsigned long i=numPixels; i; i--)
{
*r++ = *s++;
*g++ = *s++;
@@ -696,11 +696,11 @@ OFCondition DJLSDecoderBase::createPlanarConfiguration0Byte(
if (buf)
{
memcpy(buf, imageFrame, (size_t)(3*numPixels));
- register Uint8 *t = imageFrame; // target
- register Uint8 *r = buf; // red plane
- register Uint8 *g = buf + numPixels; // green plane
- register Uint8 *b = buf + (2*numPixels); // blue plane
- for (register unsigned long i=numPixels; i; i--)
+ Uint8 *t = imageFrame; // target
+ Uint8 *r = buf; // red plane
+ Uint8 *g = buf + numPixels; // green plane
+ Uint8 *b = buf + (2*numPixels); // blue plane
+ for (unsigned long i=numPixels; i; i--)
{
*t++ = *r++;
*t++ = *g++;
@@ -726,11 +726,11 @@ OFCondition DJLSDecoderBase::createPlanarConfiguration0Word(
if (buf)
{
memcpy(buf, imageFrame, (size_t)(3*numPixels*sizeof(Uint16)));
- register Uint16 *t = imageFrame; // target
- register Uint16 *r = buf; // red plane
- register Uint16 *g = buf + numPixels; // green plane
- register Uint16 *b = buf + (2*numPixels); // blue plane
- for (register unsigned long i=numPixels; i; i--)
+ Uint16 *t = imageFrame; // target
+ Uint16 *r = buf; // red plane
+ Uint16 *g = buf + numPixels; // green plane
+ Uint16 *b = buf + (2*numPixels); // blue plane
+ for (unsigned long i=numPixels; i; i--)
{
*t++ = *r++;
*t++ = *g++;
diff --git a/dcmnet/docs/movescu.man b/dcmnet/docs/movescu.man
index 6501cad..02897d7 100644
--- a/dcmnet/docs/movescu.man
+++ b/dcmnet/docs/movescu.man
@@ -428,12 +428,14 @@ DigitalIntraOralXRayImageStorageForPresentation 1.2.840.10008.5.1.4.1.1.1.3
DigitalIntraOralXRayImageStorageForProcessing 1.2.840.10008.5.1.4.1.1.1.3.1
CTImageStorage 1.2.840.10008.5.1.4.1.1.2
EnhancedCTImageStorage 1.2.840.10008.5.1.4.1.1.2.1
+LegacyConvertedEnhancedCTImageStorage 1.2.840.10008.5.1.4.1.1.2.2
RETIRED_UltrasoundMultiframeImageStorage 1.2.840.10008.5.1.4.1.1.3
UltrasoundMultiframeImageStorage 1.2.840.10008.5.1.4.1.1.3.1
MRImageStorage 1.2.840.10008.5.1.4.1.1.4
EnhancedMRImageStorage 1.2.840.10008.5.1.4.1.1.4.1
MRSpectroscopyStorage 1.2.840.10008.5.1.4.1.1.4.2
EnhancedMRColorImageStorage 1.2.840.10008.5.1.4.1.1.4.3
+LegacyConvertedEnhancedMRImageStorage 1.2.840.10008.5.1.4.1.1.4.4
RETIRED_NuclearMedicineImageStorage 1.2.840.10008.5.1.4.1.1.5
RETIRED_UltrasoundImageStorage 1.2.840.10008.5.1.4.1.1.6
UltrasoundImageStorage 1.2.840.10008.5.1.4.1.1.6.1
@@ -462,6 +464,8 @@ ColorSoftcopyPresentationStateStorage 1.2.840.10008.5.1.4.1.1.11.
PseudoColorSoftcopyPresentationStateStorage 1.2.840.10008.5.1.4.1.1.11.3
BlendingSoftcopyPresentationStateStorage 1.2.840.10008.5.1.4.1.1.11.4
XAXRFGrayscaleSoftcopyPresentationStateStorage 1.2.840.10008.5.1.4.1.1.11.5
+GrayscalePlanarMPRVolumetricPresentationStateStorage 1.2.840.10008.5.1.4.1.1.11.6
+CompositingPlanarMPRVolumetricPresentationStateStor. 1.2.840.10008.5.1.4.1.1.11.7
XRayAngiographicImageStorage 1.2.840.10008.5.1.4.1.1.12.1
EnhancedXAImageStorage 1.2.840.10008.5.1.4.1.1.12.1.1
XRayRadiofluoroscopicImageStorage 1.2.840.10008.5.1.4.1.1.12.2
@@ -470,15 +474,19 @@ RETIRED_XRayAngiographicBiPlaneImageStorage 1.2.840.10008.5.1.4.1.1.12.
XRay3DAngiographicImageStorage 1.2.840.10008.5.1.4.1.1.13.1.1
XRay3DCraniofacialImageStorage 1.2.840.10008.5.1.4.1.1.13.1.2
BreastTomosynthesisImageStorage 1.2.840.10008.5.1.4.1.1.13.1.3
+BreastProjectionXRayImageStorageForPresentation 1.2.840.10008.5.1.4.1.1.13.1.4
+BreastProjectionXRayImageStorageForProcessing 1.2.840.10008.5.1.4.1.1.13.1.5
IntravascularOpt.Coh.Tom.ImageStorageForPresentation 1.2.840.10008.5.1.4.1.1.14.1
IntravascularOpt.Coh.Tom.ImageStorageForProcessing 1.2.840.10008.5.1.4.1.1.14.2
NuclearMedicineImageStorage 1.2.840.10008.5.1.4.1.1.20
+ParametricMapStorage 1.2.840.10008.5.1.4.1.1.30
RawDataStorage 1.2.840.10008.5.1.4.1.1.66
SpatialRegistrationStorage 1.2.840.10008.5.1.4.1.1.66.1
SpatialFiducialsStorage 1.2.840.10008.5.1.4.1.1.66.2
DeformableSpatialRegistrationStorage 1.2.840.10008.5.1.4.1.1.66.3
SegmentationStorage 1.2.840.10008.5.1.4.1.1.66.4
SurfaceSegmentationStorage 1.2.840.10008.5.1.4.1.1.66.5
+TractographyResultsStorage 1.2.840.10008.5.1.4.1.1.66.6
RealWorldValueMappingStorage 1.2.840.10008.5.1.4.1.1.67
SurfaceScanMeshStorage 1.2.840.10008.5.1.4.1.1.68.1
SurfaceScanPointCloudStorage 1.2.840.10008.5.1.4.1.1.68.2
@@ -494,6 +502,8 @@ OphthalmicPhotography8BitImageStorage 1.2.840.10008.5.1.4.1.1.77.
OphthalmicPhotography16BitImageStorage 1.2.840.10008.5.1.4.1.1.77.1.5.2
StereometricRelationshipStorage 1.2.840.10008.5.1.4.1.1.77.1.5.3
OphthalmicTomographyImageStorage 1.2.840.10008.5.1.4.1.1.77.1.5.4
+WideFieldOphthalmicPhoto.Stereogr.Proj.ImageStorage 1.2.840.10008.5.1.4.1.1.77.1.5.5
+WideFieldOphthalmicPhotogr.3DCoordinatesImageStorage 1.2.840.10008.5.1.4.1.1.77.1.5.6
VLWholeSlideMicroscopyImageStorage 1.2.840.10008.5.1.4.1.1.77.1.6
RETIRED_VLMultiFrameImageStorage 1.2.840.10008.5.1.4.1.1.77.2
LensometryMeasurementsStorage 1.2.840.10008.5.1.4.1.1.78.1
@@ -507,6 +517,7 @@ IntraocularLensCalculationsStorage 1.2.840.10008.5.1.4.1.1.78.
MacularGridThicknessAndVolumeReportStorage 1.2.840.10008.5.1.4.1.1.79.1
OphthalmicVisualFieldStaticPerimetryMeasurementsSt. 1.2.840.10008.5.1.4.1.1.80.1
OphthalmicThicknessMapStorage 1.2.840.10008.5.1.4.1.1.81.1
+CornealTopographyMapStorage 1.2.840.10008.5.1.4.1.1.82.1
DRAFT_SRTextStorage 1.2.840.10008.5.1.4.1.1.88.1
DRAFT_SRAudioStorage 1.2.840.10008.5.1.4.1.1.88.2
DRAFT_SRDetailStorage 1.2.840.10008.5.1.4.1.1.88.3
@@ -515,16 +526,21 @@ BasicTextSRStorage 1.2.840.10008.5.1.4.1.1.88.
EnhancedSRStorage 1.2.840.10008.5.1.4.1.1.88.22
ComprehensiveSRStorage 1.2.840.10008.5.1.4.1.1.88.33
Comprehensive3DSRStorage 1.2.840.10008.5.1.4.1.1.88.34
+ExtensibleSRStorage 1.2.840.10008.5.1.4.1.1.88.35
ProcedureLogStorage 1.2.840.10008.5.1.4.1.1.88.40
MammographyCADSRStorage 1.2.840.10008.5.1.4.1.1.88.50
KeyObjectSelectionDocumentStorage 1.2.840.10008.5.1.4.1.1.88.59
ChestCADSRStorage 1.2.840.10008.5.1.4.1.1.88.65
XRayRadiationDoseSRStorage 1.2.840.10008.5.1.4.1.1.88.67
+RadiopharmaceuticalRadiationDoseSRStorage 1.2.840.10008.5.1.4.1.1.88.68
ColonCADSRStorage 1.2.840.10008.5.1.4.1.1.88.69
ImplantationPlanSRDocumentStorage 1.2.840.10008.5.1.4.1.1.88.70
+AcquisitionContextSRStorage 1.2.840.10008.5.1.4.1.1.88.71
+ContentAssessmentResultsStorage 1.2.840.10008.5.1.4.1.1.90.1
EncapsulatedPDFStorage 1.2.840.10008.5.1.4.1.1.104.1
EncapsulatedCDAStorage 1.2.840.10008.5.1.4.1.1.104.2
PositronEmissionTomographyImageStorage 1.2.840.10008.5.1.4.1.1.128
+LegacyConvertedEnhancedPETImageStorage 1.2.840.10008.5.1.4.1.1.128.1
RETIRED_StandalonePETCurveStorage 1.2.840.10008.5.1.4.1.1.129
EnhancedPETImageStorage 1.2.840.10008.5.1.4.1.1.130
BasicStructuredDisplayStorage 1.2.840.10008.5.1.4.1.1.131
@@ -541,10 +557,14 @@ DICOS_CTImageStorage 1.2.840.10008.5.1.4.1.1.501
DICOS_DigitalXRayImageStorageForPresentation 1.2.840.10008.5.1.4.1.1.501.2.1
DICOS_DigitalXRayImageStorageForProcessing 1.2.840.10008.5.1.4.1.1.501.2.2
DICOS_ThreatDetectionReportStorage 1.2.840.10008.5.1.4.1.1.501.3
+DICOS_2DAITStorage 1.2.840.10008.5.1.4.1.1.501.4
+DICOS_3DAITStorage 1.2.840.10008.5.1.4.1.1.501.5
+DICOS_QuadrupoleResonanceStorage 1.2.840.10008.5.1.4.1.1.501.6
DICONDE_EddyCurrentImageStorage 1.2.840.10008.5.1.4.1.1.601.1
DICONDE_EddyCurrentMultiframeImageStorage 1.2.840.10008.5.1.4.1.1.601.2
DRAFT_RTBeamsDeliveryInstructionStorage 1.2.840.10008.5.1.4.34.1
RTBeamsDeliveryInstructionStorage 1.2.840.10008.5.1.4.34.7
+RTBrachyApplicationSetupDeliveryInstructionStorage 1.2.840.10008.5.1.4.34.10
GenericImplantTemplateStorage 1.2.840.10008.5.1.4.43.1
ImplantAssemblyTemplateStorage 1.2.840.10008.5.1.4.44.1
ImplantTemplateGroupStorage 1.2.840.10008.5.1.4.45.1
@@ -608,7 +628,7 @@ movescu --patient --port 9876 --move TEST_AE --call ARCHIVE caesar 104 q.dcm
sends the attributes contained in the DICOM file "q.dcm" as part of a C-MOVE
request to application entity ARCHIVE on the host caesar at port 104 using the
Patient Root query model. \b movescu itself uses the default AE title MOVESCU.
-The C-MOVE request will specifiy that images should be transferred to the
+The C-MOVE request will specify that images should be transferred to the
destination AE title TEST_AE (via the \e --move option). How the SCP
interprets this request depends on its configuration. \b movescu will listen
on part 9876 for incoming associations in order to receive the requested images
@@ -682,6 +702,6 @@ It is an error if no data dictionary can be loaded.
\section copyright COPYRIGHT
-Copyright (C) 1994-2014 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany.
+Copyright (C) 1994-2016 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany.
*/
diff --git a/dcmnet/docs/storescp.man b/dcmnet/docs/storescp.man
index 72c3fbc..1d58a38 100644
--- a/dcmnet/docs/storescp.man
+++ b/dcmnet/docs/storescp.man
@@ -654,6 +654,7 @@ RadiopharmaceuticalRadiationDoseSRStorage 1.2.840.10008.5.1.4.1.1.88.
ColonCADSRStorage 1.2.840.10008.5.1.4.1.1.88.69
ImplantationPlanSRDocumentStorage 1.2.840.10008.5.1.4.1.1.88.70
AcquisitionContextSRStorage 1.2.840.10008.5.1.4.1.1.88.71
+ContentAssessmentResultsStorage 1.2.840.10008.5.1.4.1.1.90.1
EncapsulatedPDFStorage 1.2.840.10008.5.1.4.1.1.104.1
EncapsulatedCDAStorage 1.2.840.10008.5.1.4.1.1.104.2
PositronEmissionTomographyImageStorage 1.2.840.10008.5.1.4.1.1.128
@@ -674,6 +675,9 @@ DICOS_CTImageStorage 1.2.840.10008.5.1.4.1.1.501
DICOS_DigitalXRayImageStorageForPresentation 1.2.840.10008.5.1.4.1.1.501.2.1
DICOS_DigitalXRayImageStorageForProcessing 1.2.840.10008.5.1.4.1.1.501.2.2
DICOS_ThreatDetectionReportStorage 1.2.840.10008.5.1.4.1.1.501.3
+DICOS_2DAITStorage 1.2.840.10008.5.1.4.1.1.501.4
+DICOS_3DAITStorage 1.2.840.10008.5.1.4.1.1.501.5
+DICOS_QuadrupoleResonanceStorage 1.2.840.10008.5.1.4.1.1.501.6
DICONDE_EddyCurrentImageStorage 1.2.840.10008.5.1.4.1.1.601.1
DICONDE_EddyCurrentMultiframeImageStorage 1.2.840.10008.5.1.4.1.1.601.2
DRAFT_RTBeamsDeliveryInstructionStorage 1.2.840.10008.5.1.4.34.1
diff --git a/dcmnet/etc/storescp.cfg b/dcmnet/etc/storescp.cfg
index 24db915..03959da 100644
--- a/dcmnet/etc/storescp.cfg
+++ b/dcmnet/etc/storescp.cfg
@@ -205,6 +205,7 @@ PresentationContext128 = DRAFT_WaveformStorage\UncompressedOrZlib
# - BreastProjectionXRayImageStorageForPresentation
# - BreastProjectionXRayImageStorageForProcessing
# - CompositingPlanarMPRVolumetricPresentationStateStorage
+# - ContentAssessmentResultsStorage
# - ExtensibleSRStorage
# - GrayscalePlanarMPRVolumetricPresentationStateStorage
# - LegacyConvertedEnhancedCTImageStorage
@@ -217,9 +218,12 @@ PresentationContext128 = DRAFT_WaveformStorage\UncompressedOrZlib
# - WideFieldOphthalmicPhotographyStereographicProjectionImageStorage
# - WideFieldOphthalmicPhotography3DCoordinatesImageStorage
#
+# - DICOS_2DAITStorage
+# - DICOS_3DAITStorage
# - DICOS_CTImageStorage
# - DICOS_DigitalXRayImageStorageForPresentation
# - DICOS_DigitalXRayImageStorageForProcessing
+# - DICOS_QuadrupoleResonanceStorage
# - DICOS_ThreatDetectionReportStorage
#
# - DICONDE_EddyCurrentImageStorage
diff --git a/dcmnet/etc/storescu.cfg b/dcmnet/etc/storescu.cfg
index 4d3f6d6..5b655d2 100644
--- a/dcmnet/etc/storescu.cfg
+++ b/dcmnet/etc/storescu.cfg
@@ -209,6 +209,7 @@ PresentationContext128 = VideoPhotographicImageStorage\MPEG2
# - BreastTomosynthesisImageStorage
# - CompositingPlanarMPRVolumetricPresentationStateStorage
# - Comprehensive3DSRStorage
+# - ContentAssessmentResultsStorage
# - CornealTopographyMapStorage
# - DeformableSpatialRegistrationStorage
# - EncapsulatedCDAStorage
@@ -272,9 +273,12 @@ PresentationContext128 = VideoPhotographicImageStorage\MPEG2
# - DRAFT_SRTextStorage
# - DRAFT_WaveformStorage
#
+# - DICOS_2DAITStorage
+# - DICOS_3DAITStorage
# - DICOS_CTImageStorage
# - DICOS_DigitalXRayImageStorageForPresentation
# - DICOS_DigitalXRayImageStorageForProcessing
+# - DICOS_QuadrupoleResonanceStorage
# - DICOS_ThreatDetectionReportStorage
#
# - DICONDE_EddyCurrentImageStorage
diff --git a/dcmnet/include/dcmtk/dcmnet/assoc.h b/dcmnet/include/dcmtk/dcmnet/assoc.h
index 1f89e25..240684d 100644
--- a/dcmnet/include/dcmtk/dcmnet/assoc.h
+++ b/dcmnet/include/dcmtk/dcmnet/assoc.h
@@ -71,7 +71,7 @@
** This file contains the routines which provide association management
** for DICOM applications. It maintains structures which describe
** active associations and provides access to association specific
-** informtion. Also provided are routines for aiding association
+** information. Also provided are routines for aiding association
** negotiation (presentation contexts, abstract syntaxes, transfer
** syntaxes, maximum PDU length, and other extended negotiation).
**
@@ -122,9 +122,9 @@
enum T_ASC_NetworkRole
{
- NET_ACCEPTOR, /* Provider Only */
- NET_REQUESTOR, /* User Only */
- NET_ACCEPTORREQUESTOR /* User and Provider */
+ NET_ACCEPTOR, /* Provider Only */
+ NET_REQUESTOR, /* User Only */
+ NET_ACCEPTORREQUESTOR /* User and Provider */
};
struct DCMTK_DCMNET_EXPORT T_ASC_Network
@@ -245,7 +245,7 @@ struct DCMTK_DCMNET_EXPORT T_ASC_Association
DUL_ASSOCIATIONKEY *DULassociation;
T_ASC_Parameters *params;
- unsigned short nextMsgID; /* should be incremented by user */
+ unsigned short nextMsgID; /* should be incremented by user */
unsigned long sendPDVLength; /* max length of PDV to send out */
unsigned char *sendPDVBuffer; /* buffer of size sendPDVLength */
};
@@ -493,7 +493,7 @@ DCMTK_DCMNET_EXPORT OFCondition ASC_setIdentAC(
const Uint16& length );
/** Returns a copy of the User Identity Negotiation response value.
- * CAUTION: The returned buffer (copy of orginal data) must be freed by the
+ * CAUTION: The returned buffer (copy of original data) must be freed by the
* caller!
* @param params - [in] The association parameters to get response from
* @param buffer - [out] The buffer to write to. Memory is allocated inside
@@ -636,7 +636,7 @@ DCMTK_DCMNET_EXPORT void
ASC_dumpConnectionParameters(T_ASC_Association *association, STD_NAMESPACE ostream& outstream);
/** Converts given ASC role to string (e.g. for printing)
- * @param role The role to vconvert
+ * @param role The role to convert
@return The role as a string
*/
DCMTK_DCMNET_EXPORT const char*
diff --git a/dcmnet/include/dcmtk/dcmnet/dicom.h b/dcmnet/include/dcmtk/dcmnet/dicom.h
index c9d35d7..be7d580 100644
--- a/dcmnet/include/dcmtk/dcmnet/dicom.h
+++ b/dcmnet/include/dcmtk/dcmnet/dicom.h
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 1994-2010, OFFIS e.V.
+ * Copyright (C) 1994-2016, OFFIS e.V.
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation were partly developed by
@@ -98,7 +98,7 @@
#include "dcmtk/ofstd/ofstdinc.h"
#include "dcmtk/dcmnet/cond.h" /* condition typedefs */
-#include "dcmtk/dcmnet/dcompat.h" /* compatability routines */
+#include "dcmtk/dcmnet/dcompat.h" /* compatibility routines */
#include "dcmtk/dcmdata/dctypes.h" /* dcmdata toolkit basic types */
#include "dcmtk/dcmdata/dcuid.h" /* dcmdata UID definitions */
@@ -113,8 +113,6 @@ typedef Uint32 MASK_32; /* for bit masks */
#define DICOM_STDAPPLICATIONCONTEXT UID_StandardApplicationContext
-#define DICOM_NET_IMPLEMENTATIONCLASSUID OFFIS_IMPLEMENTATION_CLASS_UID
-#define DICOM_NET_IMPLEMENTATIONVERSIONNAME OFFIS_DTK_IMPLEMENTATION_VERSION_NAME
/* network type constants as used by the DUL layer */
#define DICOM_APPLICATION_ACCEPTOR 0x01
diff --git a/dcmnet/include/dcmtk/dcmnet/dimse.h b/dcmnet/include/dcmtk/dcmnet/dimse.h
index 53e529e..59c199d 100644
--- a/dcmnet/include/dcmtk/dcmnet/dimse.h
+++ b/dcmnet/include/dcmtk/dcmnet/dimse.h
@@ -602,7 +602,7 @@ struct DCMTK_DCMNET_EXPORT T_DIMSE_Message {
/*
- * Globale Variables
+ * Global Variables
*/
/*
@@ -648,7 +648,7 @@ extern DCMTK_DCMNET_EXPORT OFBool g_dimse_save_dimse_data;
* If the parameter blockMode is DIMSE_NONBLOCKING then the DIMSE routine
* will wait at most timeout seconds for a response and if no response arrives
* will return DIMSE_NODATAAVAILABLE. In both cases waiting will be
- * interupted by association release, and abort messages, or network
+ * interrupted by association release, and abort messages, or network
* disruption.
*/
@@ -669,7 +669,7 @@ DIMSE_echoUser(
DCMTK_DCMNET_EXPORT OFCondition
DIMSE_sendEchoResponse(T_ASC_Association * assoc,
T_ASC_PresentationContextID presID,
- T_DIMSE_C_EchoRQ *request, DIC_US status, DcmDataset *statusDetail);
+ const T_DIMSE_C_EchoRQ *request, DIC_US status, DcmDataset *statusDetail);
/*
@@ -677,16 +677,16 @@ DIMSE_sendEchoResponse(T_ASC_Association * assoc,
*/
typedef enum {
- DIMSE_StoreBegin, /* before data set */
+ DIMSE_StoreBegin, /* before data set */
DIMSE_StoreProgressing, /* during data set */
- DIMSE_StoreEnd /* after data set */
+ DIMSE_StoreEnd /* after data set */
} T_DIMSE_StoreProgressState;
struct DCMTK_DCMNET_EXPORT T_DIMSE_StoreProgress { /* progress structure for store callback routines */
T_DIMSE_StoreProgressState state; /* current state */
long callbackCount; /* callback execution count */
long progressBytes; /* sent/received so far */
- long totalBytes; /* total/estimated total to send/receive */
+ long totalBytes; /* total/estimated total to send/receive */
} ;
@@ -743,8 +743,8 @@ DIMSE_storeProvider(/* in */
DCMTK_DCMNET_EXPORT OFCondition
DIMSE_sendStoreResponse(T_ASC_Association * assoc,
T_ASC_PresentationContextID presID,
- T_DIMSE_C_StoreRQ *request, /* send response to this request */
- T_DIMSE_C_StoreRSP *response, /* response structure */
+ const T_DIMSE_C_StoreRQ *request, /* send response to this request */
+ T_DIMSE_C_StoreRSP *response, /* response structure */
DcmDataset *statusDetail);
/*
@@ -796,7 +796,7 @@ DIMSE_findProvider(
DCMTK_DCMNET_EXPORT OFCondition
DIMSE_sendFindResponse(T_ASC_Association * assoc,
T_ASC_PresentationContextID presID,
- T_DIMSE_C_FindRQ *request,
+ const T_DIMSE_C_FindRQ *request,
T_DIMSE_C_FindRSP *response, DcmDataset *responseIdentifiers,
DcmDataset *statusDetail);
@@ -852,7 +852,7 @@ DIMSE_moveProvider(
DCMTK_DCMNET_EXPORT OFCondition
DIMSE_sendMoveResponse(T_ASC_Association * assoc,
- T_ASC_PresentationContextID presID, T_DIMSE_C_MoveRQ *request,
+ T_ASC_PresentationContextID presID, const T_DIMSE_C_MoveRQ *request,
T_DIMSE_C_MoveRSP *response, DcmDataset *rspIds,
DcmDataset *statusDetail);
@@ -907,7 +907,7 @@ DIMSE_getProvider(
DCMTK_DCMNET_EXPORT OFCondition
DIMSE_sendGetResponse(T_ASC_Association * assoc,
- T_ASC_PresentationContextID presID, T_DIMSE_C_GetRQ *request,
+ T_ASC_PresentationContextID presID, const T_DIMSE_C_GetRQ *request,
T_DIMSE_C_GetRSP *response, DcmDataset *rspIds,
DcmDataset *statusDetail);
diff --git a/dcmnet/include/dcmtk/dcmnet/dstorscu.h b/dcmnet/include/dcmtk/dcmnet/dstorscu.h
index d651053..8737e87 100644
--- a/dcmnet/include/dcmtk/dcmnet/dstorscu.h
+++ b/dcmnet/include/dcmtk/dcmnet/dstorscu.h
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2011-2015, OFFIS e.V.
+ * Copyright (C) 2011-2016, OFFIS e.V.
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation were developed by
@@ -413,9 +413,13 @@ class DCMTK_DCMNET_EXPORT DcmStorageSCU
const OFString TransferSyntaxUID;
/// transfer syntax that was used to send this SOP instance
E_TransferSyntax NetworkTransferSyntax;
- /// flag indicating whether the SOP instance is uncompressed, i.e.\ uses any of the
- /// three uncompressed transfer syntaxes
+ /// flag indicating whether the SOP instance is uncompressed, i.e.\ uses any of
+ /// the three uncompressed transfer syntaxes
OFBool Uncompressed;
+ /// size of the dataset of the SOP instance (in bytes, 0 = not yet determined).
+ /// NB: The number of bytes that are actually transferred might deviate because
+ /// of minor changes to the DICOM dataset when appended to the C-STORE request.
+ unsigned long DatasetSize;
/// association number that was used to send this SOP instance (0 = not sent)
unsigned long AssociationNumber;
/// presentation context ID to be used for sending this SOP instance
@@ -477,15 +481,21 @@ class DCMTK_DCMNET_EXPORT DcmStorageSCU
const OFString &transferSyntaxUID,
const OFBool checkValues);
- /** This method is called each time a SOP instance is sent to a peer. Since it is called
- * after the SOP instance has been processed, the transfer entry passed to this method
- * contains current information, e.g. the DIMSE status of the C-STORE response. This
- * also allows for counting the number of successful and failed transfers.
+ /** this method is called each time before a SOP instance is sent to a peer. Therefore,
+ * the transfer entry passed to this method does not yet contain all information.
+ * @param transferEntry reference to current transfer entry that will be processed
+ */
+ virtual void notifySOPInstanceToBeSent(const TransferEntry &transferEntry);
+
+ /** this method is called each time after a SOP instance has been sent to a peer.
+ * Therefore, the transfer entry passed to this method contains current and usually
+ * also complete information, e.g. the DIMSE status of the C-STORE response. This
+ * allows for counting the number of successful and failed transfers.
* @param transferEntry reference to current transfer entry that has been processed
*/
virtual void notifySOPInstanceSent(const TransferEntry &transferEntry);
- /** This method is called each time after a SOP instance is sent to a peer. If the
+ /** this method is called each time after a SOP instance is sent to a peer. If the
* return value is OFTrue, the SCU will stop the sending process after the current SOP
* instance. This could for example make sense when transferring SOP instances due to
* a C-MOVE request, which is externally canceled by a C-CANCEL message. The default
diff --git a/dcmnet/include/dcmtk/dcmnet/dul.h b/dcmnet/include/dcmtk/dcmnet/dul.h
index 52c9877..a107287 100644
--- a/dcmnet/include/dcmtk/dcmnet/dul.h
+++ b/dcmnet/include/dcmtk/dcmnet/dul.h
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 1994-2011, OFFIS e.V.
+ * Copyright (C) 1994-2016, OFFIS e.V.
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation were partly developed by
@@ -429,7 +429,6 @@ DCMTK_DCMNET_EXPORT OFString& DUL_DumpParams(OFString& str, DUL_ASSOCIATESERVICE
DCMTK_DCMNET_EXPORT OFString& DUL_DumpConnectionParameters(OFString& str, DUL_ASSOCIATIONKEY *association);
DCMTK_DCMNET_EXPORT OFCondition DUL_ClearServiceParameters(DUL_ASSOCIATESERVICEPARAMETERS * params);
-DCMTK_DCMNET_EXPORT void DUL_DefaultServiceParameters(DUL_ASSOCIATESERVICEPARAMETERS * params);
DCMTK_DCMNET_EXPORT OFString& dumpExtNegList(OFString& str, SOPClassExtendedNegotiationSubItemList& lst);
/*
diff --git a/dcmnet/libsrc/assoc.cc b/dcmnet/libsrc/assoc.cc
index 22cacce..acb8756 100644
--- a/dcmnet/libsrc/assoc.cc
+++ b/dcmnet/libsrc/assoc.cc
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 1994-2015, OFFIS e.V.
+ * Copyright (C) 1994-2016, OFFIS e.V.
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation were partly developed by
@@ -71,7 +71,7 @@
** This file contains the routines which provide association management
** for DICOM V.3 applications. It maintains structures which describe
** active associations and provides access to association specific
-** informtion. Also provided are routines for performing association
+** information. Also provided are routines for performing association
** negotiation (presentation contexts, abstract syntaxes, transfer
** syntaxes, maximum PDU length, and other extended negotiation).
**
@@ -211,7 +211,7 @@ typedef struct {
*/
/*
- * Network creation/distroy wrappers.
+ * Network creation/destroy wrappers.
* The T_ASC_Network structure will be allocated/freed by
* these routines.
*/
@@ -664,7 +664,6 @@ ASC_addPresentationContext(
/* we cannot simply use DUL_MakePresentationCtx() because
** it takes variable arguments (for transfer syntax).
*/
-
pc = (DUL_PRESENTATIONCONTEXT *) calloc(1, sizeof(DUL_PRESENTATIONCONTEXT));
if (pc == NULL) return EC_MemoryExhausted;
lst = LST_Create();
@@ -680,10 +679,13 @@ ASC_addPresentationContext(
pc->acceptedSCRole = ascRole2dulRole(ASC_SC_ROLE_DEFAULT);
/* there must be at least one transfer syntax */
- if (transferSyntaxListCount < 1 ) return ASC_MISSINGTRANSFERSYNTAX;
+ if (transferSyntaxListCount < 1)
+ {
+ free(pc);
+ return ASC_MISSINGTRANSFERSYNTAX;
+ }
/* add the transfer syntaxes */
- OFCondition cond = EC_Normal;
for (i=0; i<transferSyntaxListCount; i++)
{
transfer = (DUL_TRANSFERSYNTAX*)malloc(sizeof(DUL_TRANSFERSYNTAX));
@@ -694,7 +696,6 @@ ASC_addPresentationContext(
pc->proposedTransferSyntax = lst;
/* add to presentation context list */
-
lst = params->DULparams.requestedPresentationContext;
if (lst == NULL) {
lst = LST_Create();
@@ -858,7 +859,7 @@ ASC_acceptPresentationContext(
if (proposedContext == NULL) return ASC_BADPRESENTATIONCONTEXTID;
strcpy(proposedContext->acceptedTransferSyntax, transferSyntax);
- /* we want to mark this proposed context as beeing ok */
+ /* we want to mark this proposed context as being ok */
proposedContext->result = ASC_P_ACCEPTANCE;
proposedContext->acceptedSCRole = ascRole2dulRole(acceptedRole);
@@ -1975,7 +1976,7 @@ ASC_requestAssociation(T_ASC_Network * network,
strcpy(params->theirImplementationVersionName,
params->DULparams.calledImplementationVersionName);
- /* make sure accepted PCs are marked as such in the requsted PC list */
+ /* make sure accepted PCs are marked as such in the requested PC list */
cond = updateRequestedPCListFromAcceptedPCList(¶ms->DULparams);
}
return cond;
diff --git a/dcmnet/libsrc/dimecho.cc b/dcmnet/libsrc/dimecho.cc
index 4524a0a..4440bec 100644
--- a/dcmnet/libsrc/dimecho.cc
+++ b/dcmnet/libsrc/dimecho.cc
@@ -155,7 +155,7 @@ DIMSE_echoUser(
OFCondition
DIMSE_sendEchoResponse(T_ASC_Association * assoc,
T_ASC_PresentationContextID presID,
- T_DIMSE_C_EchoRQ *req, DIC_US status, DcmDataset *statusDetail)
+ const T_DIMSE_C_EchoRQ *req, DIC_US status, DcmDataset *statusDetail)
{
T_DIMSE_Message rsp;
diff --git a/dcmnet/libsrc/dimfind.cc b/dcmnet/libsrc/dimfind.cc
index da52239..179f5bd 100644
--- a/dcmnet/libsrc/dimfind.cc
+++ b/dcmnet/libsrc/dimfind.cc
@@ -274,7 +274,7 @@ DIMSE_findUser(
OFCondition
DIMSE_sendFindResponse(T_ASC_Association * assoc,
T_ASC_PresentationContextID presID,
- T_DIMSE_C_FindRQ *request,
+ const T_DIMSE_C_FindRQ *request,
T_DIMSE_C_FindRSP *response, DcmDataset *rspIds,
DcmDataset *statusDetail)
/*
diff --git a/dcmnet/libsrc/dimget.cc b/dcmnet/libsrc/dimget.cc
index 82f531e..e1adac3 100644
--- a/dcmnet/libsrc/dimget.cc
+++ b/dcmnet/libsrc/dimget.cc
@@ -224,7 +224,7 @@ DIMSE_getUser(
OFCondition
DIMSE_sendGetResponse(T_ASC_Association * assoc,
- T_ASC_PresentationContextID presID, T_DIMSE_C_GetRQ *request,
+ T_ASC_PresentationContextID presID, const T_DIMSE_C_GetRQ *request,
T_DIMSE_C_GetRSP *response, DcmDataset *rspIds,
DcmDataset *statusDetail)
{
diff --git a/dcmnet/libsrc/dimmove.cc b/dcmnet/libsrc/dimmove.cc
index e0ada66..b5244d6 100644
--- a/dcmnet/libsrc/dimmove.cc
+++ b/dcmnet/libsrc/dimmove.cc
@@ -300,7 +300,7 @@ OFCondition
DIMSE_sendMoveResponse(
T_ASC_Association *assoc,
T_ASC_PresentationContextID presID,
- T_DIMSE_C_MoveRQ *request,
+ const T_DIMSE_C_MoveRQ *request,
T_DIMSE_C_MoveRSP *response, DcmDataset *rspIds,
DcmDataset *statusDetail)
{
diff --git a/dcmnet/libsrc/dimse.cc b/dcmnet/libsrc/dimse.cc
index 3c34608..4770e0c 100644
--- a/dcmnet/libsrc/dimse.cc
+++ b/dcmnet/libsrc/dimse.cc
@@ -115,7 +115,7 @@
#include "dcmtk/dcmdata/dcvrobow.h" /* for class DcmOtherByteOtherWord */
#include "dcmtk/dcmdata/dcvrsh.h" /* for class DcmShortString */
#include "dcmtk/dcmdata/dcvrae.h" /* for class DcmApplicationEntity */
-#include "dcmtk/dcmdata/dcdicent.h" /* for DcmDictEntry, needed for MSVC5 */
+#include "dcmtk/dcmdata/dcdicent.h" /* for class DcmDictEntry, needed for MSVC5 */
#include "dcmtk/dcmdata/dcwcache.h" /* for class DcmWriteCache */
#include "dcmtk/dcmdata/dcvrui.h" /* for class DcmUniqueIdentifier */
diff --git a/dcmnet/libsrc/dimstore.cc b/dcmnet/libsrc/dimstore.cc
index bec7694..1689993 100644
--- a/dcmnet/libsrc/dimstore.cc
+++ b/dcmnet/libsrc/dimstore.cc
@@ -297,7 +297,7 @@ DIMSE_storeUser(
OFCondition
DIMSE_sendStoreResponse(T_ASC_Association * assoc,
T_ASC_PresentationContextID presID,
- T_DIMSE_C_StoreRQ *request,
+ const T_DIMSE_C_StoreRQ *request,
T_DIMSE_C_StoreRSP *response,
DcmDataset *statusDetail)
/*
diff --git a/dcmnet/libsrc/dstorscu.cc b/dcmnet/libsrc/dstorscu.cc
index c26d410..27b7b22 100644
--- a/dcmnet/libsrc/dstorscu.cc
+++ b/dcmnet/libsrc/dstorscu.cc
@@ -75,6 +75,7 @@ DcmStorageSCU::TransferEntry::TransferEntry(const OFFilename &filename,
TransferSyntaxUID(transferSyntaxUID),
NetworkTransferSyntax(EXS_Unknown),
Uncompressed(OFFalse),
+ DatasetSize(0),
AssociationNumber(0),
PresentationContextID(0),
RequestSent(OFFalse),
@@ -98,6 +99,7 @@ DcmStorageSCU::TransferEntry::TransferEntry(DcmDataset *dataset,
TransferSyntaxUID(transferSyntaxUID),
NetworkTransferSyntax(EXS_Unknown),
Uncompressed(OFFalse),
+ DatasetSize(0),
AssociationNumber(0),
PresentationContextID(0),
RequestSent(OFFalse),
@@ -863,6 +865,10 @@ OFCondition DcmStorageSCU::sendSOPInstances()
}
}
}
+ // determine size of the dataset (in bytes) based on the original transfer syntax
+ (*CurrentTransferEntry)->DatasetSize = dataset->calcElementLength(dataset->getOriginalXfer(), g_dimse_send_sequenceType_encoding);
+ // notify user of this class that the current SOP instance is to be sent
+ notifySOPInstanceToBeSent(**CurrentTransferEntry);
// call the inherited method from the base class doing the real work
status = sendSTORERequest((*CurrentTransferEntry)->PresentationContextID, "" /* filename */,
dataset, (*CurrentTransferEntry)->ResponseStatusCode,
@@ -921,6 +927,12 @@ OFCondition DcmStorageSCU::sendSOPInstances()
}
+void DcmStorageSCU::notifySOPInstanceToBeSent(const TransferEntry &transferEntry)
+{
+ // do nothing in the default implementation
+}
+
+
void DcmStorageSCU::notifySOPInstanceSent(const TransferEntry & /*transferEntry*/)
{
// do nothing in the default implementation
@@ -1053,6 +1065,7 @@ OFCondition DcmStorageSCU::createReportFile(const OFString &filename) const
stream << "SOP Class : " << (*transferEntry)->SOPClassUID << " = "
<< dcmFindNameOfUID((*transferEntry)->SOPClassUID.c_str(), "unknown") << OFendl;
stream << "Original Xfer : " << (*transferEntry)->TransferSyntaxUID << " = " << orgXfer.getXferName() << OFendl;
+ stream << "Dataset Size : " << (*transferEntry)->DatasetSize << " bytes" << OFendl;
stream << "Association : " << (*transferEntry)->AssociationNumber << OFendl;
stream << "Pres. Context : " << OFstatic_cast(unsigned int, (*transferEntry)->PresentationContextID) << OFendl;
stream << "Network Xfer : ";
diff --git a/dcmnet/libsrc/dul.cc b/dcmnet/libsrc/dul.cc
index 1bb8c56..feca04d 100644
--- a/dcmnet/libsrc/dul.cc
+++ b/dcmnet/libsrc/dul.cc
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 1994-2015, OFFIS e.V.
+ * Copyright (C) 1994-2016, OFFIS e.V.
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation were partly developed by
@@ -1409,58 +1409,6 @@ DUL_ClearServiceParameters(DUL_ASSOCIATESERVICEPARAMETERS * params)
}
-/* DUL_DefaultServiceParameters
-**
-** Purpose:
-** DUL_DefaultServiceParameters is used to set a number of default
-** parameters in a DUL_ASSOCIATESERVICEPARAMETERS structure. These
-** parameters are the default MIR parameters (which should be
-** adequate for most Unix installations).
-**
-** Parameter Dictionary:
-** params Pointer to a DUL_ASSOCIATESERVICEPARAMETERS structure
-** to be set.
-**
-** Return Values:
-** none
-** Notes:
-**
-** Algorithm:
-*/
-void
-DUL_DefaultServiceParameters(DUL_ASSOCIATESERVICEPARAMETERS * params)
-{
- static DUL_ASSOCIATESERVICEPARAMETERS p = {
- DICOM_STDAPPLICATIONCONTEXT, /* Application Ctx Name */
- "Calling AP Title", /* Calling AP Title */
- "Called AP Title", /* Called AP Title */
- "", /* Responding AP Title */
- 16384, /* Max PDU */
- 0, /* result */
- 0, /* result source */
- 0, /* diagnostic */
- "localhost", /* Calling presentation addr */
- "localhost:104", /* Called presentation addr */
- NULL, /* Requested presentation ctx list */
- NULL, /* Accepted presentation ctx list */
- 0, /* Maximum operations invoked */
- 0, /* Maximum operations performed */
- DICOM_NET_IMPLEMENTATIONCLASSUID, /* Calling implementation class UID */
- DICOM_NET_IMPLEMENTATIONVERSIONNAME, /* Calling implementation vers name */
- "", /* Called implementation class UID */
- "", /* Called implementation vers name */
- 0, /* peer max pdu */
- NULL, /* Requested Extended Negotiation List */
- NULL, /* Accepted Extended Negotiation List */
- NULL, /* Requested User Identify Negotiation */
- NULL, /* Accepted User Identify Negotiation */
- OFFalse /* don't use Secure Transport Layer */
- };
-
- *params = p;
-}
-
-
/* ========================================================================
* Private functions not meant for users of the package are included below.
*/
diff --git a/dcmpstat/libsrc/Makefile.dep b/dcmpstat/libsrc/Makefile.dep
index 85a137e..cd8e037 100644
--- a/dcmpstat/libsrc/Makefile.dep
+++ b/dcmpstat/libsrc/Makefile.dep
@@ -305,12 +305,13 @@ dviface.o: dviface.cc ../../config/include/dcmtk/config/osconfig.h \
../../dcmsr/include/dcmtk/dcmsr/dsrtypes.h \
../../dcmsr/include/dcmtk/dcmsr/dsdefine.h \
../../dcmsr/include/dcmtk/dcmsr/dsrtncsr.h \
- ../../ofstd/include/dcmtk/ofstd/ofstack.h \
../../dcmsr/include/dcmtk/dcmsr/dsrposcn.h \
../../dcmsr/include/dcmtk/dcmsr/dsrtnant.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstack.h \
../../dcmsr/include/dcmtk/dcmsr/dsrdoctn.h \
../../dcmsr/include/dcmtk/dcmsr/dsrcodvl.h \
../../ofstd/include/dcmtk/ofstd/ofexbl.h \
+ ../../dcmsr/include/dcmtk/dcmsr/dsrdncsr.h \
../../dcmsr/include/dcmtk/dcmsr/dsrcitem.h \
../../dcmsr/include/dcmtk/dcmsr/dsrnumvl.h \
../../dcmsr/include/dcmtk/dcmsr/dsrscovl.h \
diff --git a/dcmpstat/libsrc/dviface.cc b/dcmpstat/libsrc/dviface.cc
index 29f5e77..5f81d37 100644
--- a/dcmpstat/libsrc/dviface.cc
+++ b/dcmpstat/libsrc/dviface.cc
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 1998-2015, OFFIS e.V.
+ * Copyright (C) 1998-2016, OFFIS e.V.
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation were developed by
@@ -1982,7 +1982,7 @@ int DVInterface::findStudyIdx(StudyDescRecord *study,
{
if ((study != NULL) && (uid != NULL))
{
- register int i = 0;
+ int i = 0;
for (i = 0; i < PSTAT_MAXSTUDYCOUNT; i++)
{
if ((study[i].StudyInstanceUID != NULL) &&
@@ -2133,7 +2133,7 @@ OFCondition DVInterface::deleteInstance(const char *studyUID,
{
if (pHandle->DB_GetStudyDesc(study_desc).good())
{
- register int i = 0;
+ int i = 0;
for (i = 0; i < PSTAT_MAXSTUDYCOUNT; i++)
{
if ((study_desc[i].StudyInstanceUID != NULL) &&
diff --git a/dcmqrdb/docs/dcmqrscp.man b/dcmqrdb/docs/dcmqrscp.man
index c678668..8150a6b 100644
--- a/dcmqrdb/docs/dcmqrscp.man
+++ b/dcmqrdb/docs/dcmqrscp.man
@@ -759,6 +759,7 @@ RadiopharmaceuticalRadiationDoseSRStorage 1.2.840.10008.5.1.4.1.1.88.
ColonCADSRStorage 1.2.840.10008.5.1.4.1.1.88.69
ImplantationPlanSRDocumentStorage 1.2.840.10008.5.1.4.1.1.88.70
AcquisitionContextSRStorage 1.2.840.10008.5.1.4.1.1.88.71
+ContentAssessmentResultsStorage 1.2.840.10008.5.1.4.1.1.90.1
EncapsulatedPDFStorage 1.2.840.10008.5.1.4.1.1.104.1
EncapsulatedCDAStorage 1.2.840.10008.5.1.4.1.1.104.2
PositronEmissionTomographyImageStorage 1.2.840.10008.5.1.4.1.1.128
@@ -779,6 +780,9 @@ DICOS_CTImageStorage 1.2.840.10008.5.1.4.1.1.501
DICOS_DigitalXRayImageStorageForPresentation 1.2.840.10008.5.1.4.1.1.501.2.1
DICOS_DigitalXRayImageStorageForProcessing 1.2.840.10008.5.1.4.1.1.501.2.2
DICOS_ThreatDetectionReportStorage 1.2.840.10008.5.1.4.1.1.501.3
+DICOS_2DAITStorage 1.2.840.10008.5.1.4.1.1.501.4
+DICOS_3DAITStorage 1.2.840.10008.5.1.4.1.1.501.5
+DICOS_QuadrupoleResonanceStorage 1.2.840.10008.5.1.4.1.1.501.6
DICONDE_EddyCurrentImageStorage 1.2.840.10008.5.1.4.1.1.601.1
DICONDE_EddyCurrentMultiframeImageStorage 1.2.840.10008.5.1.4.1.1.601.2
DRAFT_RTBeamsDeliveryInstructionStorage 1.2.840.10008.5.1.4.34.1
diff --git a/dcmqrdb/libsrc/dcmqrdbi.cc b/dcmqrdb/libsrc/dcmqrdbi.cc
index 53424b8..babcdac 100644
--- a/dcmqrdb/libsrc/dcmqrdbi.cc
+++ b/dcmqrdb/libsrc/dcmqrdbi.cc
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 1993-2015, OFFIS e.V.
+ * Copyright (C) 1993-2016, OFFIS e.V.
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation were developed by
@@ -624,19 +624,20 @@ OFCondition DcmQueryRetrieveIndexDatabaseHandle::DB_unlock()
static OFCondition DB_FreeUidList (DB_UidList *lst)
{
- if (lst == NULL) return EC_Normal;
-
- OFCondition cond = DB_FreeUidList (lst -> next);
- if (lst -> patient)
- free (lst -> patient);
- if (lst -> study)
- free (lst -> study);
- if (lst -> serie)
- free (lst -> serie);
- if (lst -> image)
- free (lst -> image);
- free (lst);
- return (cond);
+ while (lst != NULL) {
+ if (lst -> patient)
+ free (lst -> patient);
+ if (lst -> study)
+ free (lst -> study);
+ if (lst -> serie)
+ free (lst -> serie);
+ if (lst -> image)
+ free (lst -> image);
+ DB_UidList *curlst = lst;
+ lst = lst->next;
+ free (curlst);
+ }
+ return EC_Normal;
}
diff --git a/dcmrt/include/dcmtk/dcmrt/drttypes.h b/dcmrt/include/dcmtk/dcmrt/drttypes.h
index 76bfd6c..9f9a8ba 100644
--- a/dcmrt/include/dcmtk/dcmrt/drttypes.h
+++ b/dcmrt/include/dcmtk/dcmrt/drttypes.h
@@ -1,13 +1,14 @@
/*
*
- * Copyright (c) 2008-2014, OFFIS e.V. and ICSMED AG, Oldenburg, Germany
+ * Copyright (c) 2008-2012, OFFIS e.V. and ICSMED AG, Oldenburg, Germany
+ * Copyright (C) 2013-2016, J. Riesmeier, Oldenburg, Germany
* All rights reserved. See COPYRIGHT file for details.
*
* Header file for class DRTTypes
*
* Generated manually based on dsrtypes.h
* File created on 2008-12-05
- * Last modified on 2012-10-24 by Riesmeier
+ * Last modified on 2016-02-12 by Riesmeier
*
*/
diff --git a/dcmrt/libsrc/drtbvcps.cc b/dcmrt/libsrc/drtbvcps.cc
index 271e85d..857a7c7 100644
--- a/dcmrt/libsrc/drtbvcps.cc
+++ b/dcmrt/libsrc/drtbvcps.cc
@@ -1,13 +1,14 @@
/*
*
* Copyright (C) 2008-2012, OFFIS e.V. and ICSMED AG, Oldenburg, Germany
- * Copyright (C) 2013-2015, J. Riesmeier, Oldenburg, Germany
+ * Copyright (C) 2013-2016, J. Riesmeier, Oldenburg, Germany
* All rights reserved. See COPYRIGHT file for details.
*
* Source file for class DRTBeamDoseVerificationControlPointSequence
*
* Generated automatically from DICOM PS 3.3-2015c
* File created on 2015-12-07 16:29:33
+ * Last modified on 2016-02-20 by J. Riesmeier
*
*/
@@ -24,7 +25,7 @@ DRTBeamDoseVerificationControlPointSequence::Item::Item(const OFBool emptyDefaul
AverageBeamDosePointDepth(DCM_AverageBeamDosePointDepth),
AverageBeamDosePointEquivalentDepth(DCM_AverageBeamDosePointEquivalentDepth),
AverageBeamDosePointSSD(DCM_AverageBeamDosePointSSD),
- AverageBeamDosePointSourceToExternalContourSurfaceDistance(DCM_AverageBeamDosePointSourceToExternalContourSurfaceDistance),
+ AverageBeamDosePointSourceToExternalContourSurfaceDistance(DCM_AverageBeamDosePointSourceToExternalContourDistance),
CumulativeMetersetWeight(DCM_CumulativeMetersetWeight),
ReferencedControlPointIndex(DCM_ReferencedControlPointIndex)
{
diff --git a/dcmrt/libsrc/drttypes.cc b/dcmrt/libsrc/drttypes.cc
index 0441ff5..b98a8d3 100644
--- a/dcmrt/libsrc/drttypes.cc
+++ b/dcmrt/libsrc/drttypes.cc
@@ -1,13 +1,14 @@
/*
*
- * Copyright (c) 2008-2015, OFFIS e.V. and ICSMED AG, Oldenburg, Germany
+ * Copyright (c) 2008-2012, OFFIS e.V. and ICSMED AG, Oldenburg, Germany
+ * Copyright (C) 2013-2016, J. Riesmeier, Oldenburg, Germany
* All rights reserved. See COPYRIGHT file for details.
*
* Source file for class DRTTypes
*
* Generated manually based on dsrtypes.cc
* File created on 2008-12-05
- * Last modified on 2015-08-18 by Riesmeier
+ * Last modified on 2016-02-12 by Riesmeier
*
*/
@@ -164,7 +165,12 @@ OFBool DRTTypes::checkElementValue(DcmElement &element,
}
} else {
const OFCondition checkResult = element.checkValue(vm, OFTrue /*oldFormat*/);
- if (checkResult == EC_ValueRepresentationViolated)
+ if (checkResult == EC_InvalidCharacter)
+ {
+ DCMRT_WARN(tagName << " " << tag << " contains invalid character(s) in " << module);
+ result = OFFalse;
+ }
+ else if (checkResult == EC_ValueRepresentationViolated)
{
DCMRT_WARN(tagName << " " << tag << " violates VR definition in " << module);
result = OFFalse;
diff --git a/dcmrt/tests/tests.cc b/dcmrt/tests/tests.cc
index 0a8190d..40840d2 100644
--- a/dcmrt/tests/tests.cc
+++ b/dcmrt/tests/tests.cc
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2012, OFFIS e.V.
+ * Copyright (C) 2012-2016, OFFIS e.V.
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation were developed by
@@ -11,7 +11,7 @@
* D-26121 Oldenburg, Germany
*
*
- * Module: ofstd
+ * Module: dcmrt
*
* Author: Uli Schlachter
*
diff --git a/dcmseg/include/dcmtk/dcmseg/segdoc.h b/dcmseg/include/dcmtk/dcmseg/segdoc.h
index 55a3e0c..5e70154 100644
--- a/dcmseg/include/dcmtk/dcmseg/segdoc.h
+++ b/dcmseg/include/dcmtk/dcmseg/segdoc.h
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2015, Open Connections GmbH
+ * Copyright (C) 2015-2016, Open Connections GmbH
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation are maintained by
@@ -33,7 +33,7 @@
#include "dcmtk/dcmiod/modmultiframedimension.h"// for multi-frame dimension module
#include "dcmtk/dcmdata/dcvrui.h"
-#include "dcmtk/dcmfg/fginterface.h" // for mult-frame functional group interface
+#include "dcmtk/dcmfg/fginterface.h" // for multi-frame functional group interface
#include "dcmtk/dcmfg/fgfracon.h" // for frame content functional group macro
#include "dcmtk/dcmseg/segtypes.h" // for segmentation data types
@@ -53,7 +53,7 @@ class DCMTK_DCMSEG_EXPORT DcmSegmentation
public:
- // -------------------- desctruction -------------------------------
+ // -------------------- destruction -------------------------------
/** Destructor, frees memory
*/
@@ -100,8 +100,8 @@ public:
* added separately.
* @param segmentation The resulting segmentation object if provided data is
* valid. Otherwise NULL is returned.
- * @param rows Number of rows of segmetation frame data
- * @param columns Number of rows of segmetation frame data
+ * @param rows Number of rows of segmentation frame data
+ * @param columns Number of rows of segmentation frame data
* @param equipmentInfo Equipment that is responsible for creating the
* segmentation
* @param contentIdentification Basic content identification information
@@ -118,8 +118,8 @@ public:
* added separately.
* @param segmentation The resulting segmentation object if provided data is
* valid. Otherwise NULL is returned.
- * @param rows Number of rows of segmetation frame data
- * @param columns Number of rows of segmetation frame data
+ * @param rows Number of rows of segmentation frame data
+ * @param columns Number of rows of segmentation frame data
* @param fractType Either probability (SFT_PROBABILITY) or
* occupancy (SFT_OCCUPANCY)
* @param maxFractionalValue The value inside the frame data of this
@@ -141,7 +141,7 @@ public:
* @param derivationImages to image SOP instances
* @param derivationDescription Free text describing how the derivation was
* achieved.
- * @return The created functional group, or NULL if not successfull
+ * @return The created functional group, or NULL if not successful
*/
static FGDerivationImage* createDerivationImageFG(const OFVector<ImageSOPInstanceReferenceMacro>& derivationImages,
const OFString& derivationDescription);
@@ -213,6 +213,11 @@ public:
*/
virtual IODGeneralEquipmentModule& getEquipment();
+ /** Get Segmentation Series Module
+ * @return Segmentation Series Module
+ */
+ virtual IODSegmentationSeriesModule& getSegmentationSeriesModule();
+
/** Get modality (overwrite from DcmIODCommon. We always return "SEG" here)
* @param value Reference to variable in which the value should be stored
* @param pos Index of the value to get. Not evaluated (here for
@@ -283,7 +288,7 @@ public:
* The segment identified by the segmentNumber must already exist.
* @param perFrameInformation The functional groups that identify this frame (i.e.
* which are planned to be not common for all other frames)
- * @return EC_Normal if adding was successul, error otherwise
+ * @return EC_Normal if adding was successful, error otherwise
*/
virtual OFCondition addFrame(Uint8* pixData,
const Uint16 segmentNumber,
@@ -304,10 +309,10 @@ public:
* this function should be called.
* @param ratios Compression ratios (separated by backslash) of the applied
* lossy compression steps. Only one value (and no backslash) if only
- * one step was peformed.
+ * one step was performed.
* @param methods Methods (separated by backslash) of the applied
* lossy compression steps. Only one value (and no backslash) if only
- * one step was peformed.
+ * one step was performed.
* @param checkValues If OFTrue, the data provided is checked for validity
*/
virtual OFCondition setLossyImageCompressionFlag(const OFString& ratios,
@@ -322,13 +327,13 @@ public:
virtual OFCondition setEquipmentInfo(const IODGeneralEquipmentModule::EquipmentInfo& equipmentInfo,
const OFBool checkValue = OFTrue);
- /** Set content identication info for this segmentation object
+ /** Set content identification info for this segmentation object
* @param contentIdentification The content identification of this segmentation
* @param checkValue If OFTrue, the data provided is checked for validity
* (as possible)
*/
virtual OFCondition setContentIdentification(const ContentIdentificationMacro& contentIdentification,
- const OFBool checkValue = OFTrue);
+ const OFBool checkValue = OFTrue);
protected:
@@ -339,13 +344,13 @@ protected:
/** Overwrites DcmIODImage::read()
* @param dataset The dataset to read from
- * @return EC_Normal if reading succeded, error otherwise
+ * @return EC_Normal if reading succeeded, error otherwise
*/
OFCondition read(DcmItem &dataset);
/** Overwrites DcmIODImage::write()
* @param dataset The dataset to write to
- * @return EC_Normal if writing succeded, error otherwise
+ * @return EC_Normal if writing succeeded, error otherwise
*/
OFCondition write(DcmItem &dataset);
@@ -376,7 +381,7 @@ protected:
/** Read segments from given item
* @param item The item to read from
- * @return EC_Normal if reading was succesful, error otherwise
+ * @return EC_Normal if reading was successful, error otherwise
*/
virtual OFCondition readSegments(DcmItem& item);
@@ -483,7 +488,7 @@ protected:
/** Add frame to segmentation object.
* @param pixData Pixel data to be added. Length must be rows*columns bytes.
* Pixel data is copied so it must be freed by the caller.
- * @return EC_Normal if adding was successul, error otherwise
+ * @return EC_Normal if adding was successful, error otherwise
*/
virtual OFCondition addFrame(Uint8* pixData);
@@ -500,7 +505,7 @@ private:
// Modules supported:
//
// Patient Module (through DcmIODImage)
- // Patietn Study Module (through DcmIODImage)
+ // Patient Study Module (through DcmIODImage)
// General Study Module (through DcmIODImage)
// General Series Module (through DcmIODImage)
// Segmentation Series Module
diff --git a/dcmseg/include/dcmtk/dcmseg/segment.h b/dcmseg/include/dcmtk/dcmseg/segment.h
index 58d6b8c..74af90f 100644
--- a/dcmseg/include/dcmtk/dcmseg/segment.h
+++ b/dcmseg/include/dcmtk/dcmseg/segment.h
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2016, Open Connections GmbH
+ * Copyright (C) 2015-2016, Open Connections GmbH
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation are maintained by
@@ -38,11 +38,11 @@ class DCMTK_DCMSEG_EXPORT DcmSegment
public:
- // -------------- constructors/destructors--------------------
+ // -------------- constructors/destructors --------------------
// constructor is protected
- /** Desctructor, frees memory
+ /** Destructor, frees memory
*/
virtual ~DcmSegment();
@@ -86,7 +86,7 @@ public:
/** Read segment from given item
* @param item The item to read from (must be item as found in the
- * Segment Identification Sequence
+ * Segment Identification Sequence)
* @param clearOldData If true, old data is deleted first
* @return EC_Normal if reading was successful, error otherwise
*/
@@ -121,6 +121,14 @@ public:
*/
virtual DcmSegTypes::E_SegmentAlgoType getSegmentAlgorithmType();
+ /** Get the Segment Algorithm Name
+ * @param value Reference to variable in which the value should be stored
+ * @param pos Index of the value to get (0..vm-1), -1 for all components
+ * @return EC_Normal if successful, an error code otherwise
+ */
+ virtual OFCondition getSegmentAlgorithmName(OFString& value,
+ const signed long pos = 0);
+
/** Get General Anatomy Code
* @return Reference to the General Anatomy Macro, may be unset
*/
diff --git a/dcmseg/include/dcmtk/dcmseg/segtypes.h b/dcmseg/include/dcmtk/dcmseg/segtypes.h
index b332c9c..a29e6e6 100644
--- a/dcmseg/include/dcmtk/dcmseg/segtypes.h
+++ b/dcmseg/include/dcmtk/dcmseg/segtypes.h
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2016, Open Connections GmbH
+ * Copyright (C) 2015-2016, Open Connections GmbH
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation are maintained by
@@ -111,7 +111,7 @@ class DCMTK_DCMSEG_EXPORT DcmSegTypes
{
/// Unknown (e.g.\ not initialized)
SFT_UNKNOWN,
- /// For fractional segmentations, a value defines probablity that pixel belongs to segment
+ /// For fractional segmentations, a value defines probability that pixel belongs to segment
SFT_PROBABILITY,
/// For fractional segmentations, a value defines how much of the pixel is covered by the segment
SFT_OCCUPANCY
@@ -140,6 +140,12 @@ class DCMTK_DCMSEG_EXPORT DcmSegTypes
*/
static DcmSegTypes::E_SegmentationType OFString2Segtype( const OFString& value );
+ /** Return string representation from segmentation enum type
+ * @param value The segmentation type as enum value
+ * @return The segmentation type as a string
+ */
+ static OFString segtype2OFString( const DcmSegTypes::E_SegmentationType& value );
+
/** Return enum representation of fractional type string as found in
* segmentation objects
* @param value The fractional type as a string
@@ -180,7 +186,7 @@ public:
/** Read data from given item
* @param item The item to read from
- * @param clearOldData If OFtrue, old data is cleared before reading
+ * @param clearOldData If OFTrue, old data is cleared before reading
* @return EC_Normal if reading was successful, error otherwise
*/
virtual OFCondition read(DcmItem& item,
diff --git a/dcmseg/include/dcmtk/dcmseg/segutils.h b/dcmseg/include/dcmtk/dcmseg/segutils.h
index 05f30ee..74bf3d7 100644
--- a/dcmseg/include/dcmtk/dcmseg/segutils.h
+++ b/dcmseg/include/dcmtk/dcmseg/segutils.h
@@ -38,13 +38,13 @@ public:
* @param pixelData Pixel data in unpacked format
* @param rows Number of rows in the pixel data
* @param columns The number of columns in the pixel data
- * @return The frame data if successfull, NULL if an error occurs
+ * @return The frame data if successful, NULL if an error occurs
*/
static DcmIODTypes::Frame* packBinaryFrame(Uint8* pixelData,
const Uint16 rows,
const Uint16 columns);
- /** Compute the number of bytes requried for a binary pixel data frame,
+ /** Compute the number of bytes required for a binary pixel data frame,
* given the number of pixels
* @param numPixels The total number of pixels
* @return The number of bytes required to pack the data into a binary
diff --git a/dcmseg/libsrc/Makefile.dep b/dcmseg/libsrc/Makefile.dep
index 0ce0c2b..a9ee8fb 100644
--- a/dcmseg/libsrc/Makefile.dep
+++ b/dcmseg/libsrc/Makefile.dep
@@ -51,6 +51,7 @@ segdoc.o: segdoc.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/oflimits.h \
../../config/include/dcmtk/config/arith.h \
../../dcmiod/include/dcmtk/dcmiod/ioddef.h \
+ ../../dcmiod/include/dcmtk/dcmiod/cielabutil.h \
../../dcmiod/include/dcmtk/dcmiod/modpatient.h \
../../ofstd/include/dcmtk/ofstd/ofmem.h \
../../dcmdata/include/dcmtk/dcmdata/dctk.h \
@@ -130,6 +131,7 @@ segdoc.o: segdoc.cc ../../config/include/dcmtk/config/osconfig.h \
../../dcmiod/include/dcmtk/dcmiod/modfor.h \
../../dcmiod/include/dcmtk/dcmiod/modsopcommon.h \
../../dcmiod/include/dcmtk/dcmiod/modcommoninstanceref.h \
+ ../../dcmiod/include/dcmtk/dcmiod/iodreferences.h \
../../dcmiod/include/dcmtk/dcmiod/modgeneralimage.h \
../../dcmiod/include/dcmtk/dcmiod/modimagepixel.h \
../../dcmiod/include/dcmtk/dcmiod/modsegmentationseries.h \
@@ -216,6 +218,7 @@ segment.o: segment.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofutil.h \
../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
../../dcmiod/include/dcmtk/dcmiod/iodtypes.h \
+ ../../dcmiod/include/dcmtk/dcmiod/cielabutil.h \
../include/dcmtk/dcmseg/segment.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \
../../dcmiod/include/dcmtk/dcmiod/iodmacro.h \
@@ -287,6 +290,7 @@ segment.o: segment.cc ../../config/include/dcmtk/config/osconfig.h \
../../dcmiod/include/dcmtk/dcmiod/modfor.h \
../../dcmiod/include/dcmtk/dcmiod/modsopcommon.h \
../../dcmiod/include/dcmtk/dcmiod/modcommoninstanceref.h \
+ ../../dcmiod/include/dcmtk/dcmiod/iodreferences.h \
../../dcmiod/include/dcmtk/dcmiod/modgeneralimage.h \
../../dcmiod/include/dcmtk/dcmiod/modimagepixel.h \
../../dcmiod/include/dcmtk/dcmiod/modsegmentationseries.h \
@@ -364,6 +368,7 @@ segtypes.o: segtypes.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofutil.h \
../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
../../dcmiod/include/dcmtk/dcmiod/iodtypes.h \
+ ../../dcmiod/include/dcmtk/dcmiod/cielabutil.h \
../../dcmiod/include/dcmtk/dcmiod/iodmacro.h \
../../dcmdata/include/dcmtk/dcmdata/dctk.h \
../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
@@ -540,5 +545,6 @@ segutils.o: segutils.cc ../../config/include/dcmtk/config/osconfig.h \
../../dcmiod/include/dcmtk/dcmiod/iodrules.h \
../../dcmiod/include/dcmtk/dcmiod/iodtypes.h \
../../dcmiod/include/dcmtk/dcmiod/ioddef.h \
+ ../../dcmiod/include/dcmtk/dcmiod/cielabutil.h \
../../dcmiod/include/dcmtk/dcmiod/modbase.h \
../../ofstd/include/dcmtk/ofstd/ofmem.h
diff --git a/dcmseg/libsrc/segdoc.cc b/dcmseg/libsrc/segdoc.cc
index 89d491d..2261fc9 100644
--- a/dcmseg/libsrc/segdoc.cc
+++ b/dcmseg/libsrc/segdoc.cc
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2015, Open Connections GmbH
+ * Copyright (C) 2015-2016, Open Connections GmbH
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation are maintained by
@@ -39,7 +39,7 @@ DcmSegmentation::DcmSegmentation()
m_FG(DcmIODImage::getData(), DcmIODImage::getRules()),
m_DimensionModule(DcmIODImage::getData(), DcmIODImage::getRules()),
m_Frames(),
- m_ImageType( "DERIVED\\PRIMARY"),
+ m_ImageType("DERIVED\\PRIMARY"),
m_ContentIdentificationMacro(),
m_SegmentationType(DcmSegTypes::ST_BINARY),
m_SegmentationFractionalType(DcmSegTypes::SFT_OCCUPANCY),
@@ -289,7 +289,7 @@ OFCondition DcmSegmentation::write(DcmItem &dataset)
// -- Extra Image level data --
- // Write Multi-Frame Functional Groups Mdule
+ // Write Multi-Frame Functional Groups Module
if (result.good()) result = writeMultiFrameFunctionalGroupsModule(dataset);
// Write Multi-Frame Dimension Module
@@ -365,6 +365,12 @@ IODGeneralEquipmentModule& DcmSegmentation::getEquipment()
}
+IODSegmentationSeriesModule & DcmSegmentation::getSegmentationSeriesModule()
+{
+ return m_SegmentationSeries;
+}
+
+
OFCondition DcmSegmentation::addSegment(DcmSegment* seg,
Uint16& segmentNumber)
{
@@ -716,7 +722,7 @@ OFCondition DcmSegmentation::readFrames(DcmItem& dataset)
pixelRep = 2; // invalid value for this attribute
OFString colorModel;
- /* check the typcial image pixel attributes and get correct(ed) values */
+ /* check the typical image pixel attributes and get correct(ed) values */
result = getAndCheckImagePixelAttributes(dataset, allocated, stored, high, spp, pixelRep, rows, cols, numberOfFrames, colorModel);
if (result.bad())
return result;
@@ -818,32 +824,32 @@ OFCondition DcmSegmentation::getAndCheckImagePixelAttributes(DcmItem& dataset,
if (allocated != depth)
{
- DCMSEG_WARN("Bits Allocated is not set correctly (" << allocated << ", ignored), assuming value " << depth << " as required for binary segmentations");
+ DCMSEG_WARN("Bits Allocated is not set correctly (" << allocated << ", ignored), assuming value " << depth << " as required for " << DcmSegTypes::segtype2OFString(m_SegmentationType) << " segmentation objects");
allocated = depth;
}
if (stored != depth)
{
- DCMSEG_WARN("Bits Stored is not set correctly (" << stored << ", ignored), assuming value " << depth << " as required for binary segmentations");
+ DCMSEG_WARN("Bits Stored is not set correctly (" << stored << ", ignored), assuming value " << depth << " as required for " << DcmSegTypes::segtype2OFString(m_SegmentationType) << " segmentation objects");
stored = depth;
}
if (high != depth-1)
{
- DCMSEG_WARN("Bits Stored is not set correctly (" << high << ", ignored), assuming value " << depth-1 << " as required for binary segmentations");
+ DCMSEG_WARN("High Bit is not set correctly (" << high << ", ignored), assuming value " << depth-1 << " as required for " << DcmSegTypes::segtype2OFString(m_SegmentationType) << " segmentation objects");
high = depth -1;
}
if (spp != 1)
{
- DCMSEG_WARN("Samples Per Pixel is not set correctly (" << spp << ", ignored), assuming value 1 as required for binary segmentations");
+ DCMSEG_WARN("Samples per Pixel is not set correctly (" << spp << ", ignored), assuming value 1 as required for segmentation objects");
spp = 1;
}
if (pixelRep != 0)
{
- DCMSEG_WARN("Pixel Representation is not set (" << spp << ", ignored), assuming value 0 as required for segmentations");
+ DCMSEG_WARN("Pixel Representation is not set correctly (" << pixelRep << ", ignored), assuming value 0 as required for segmentation objects");
pixelRep = 0;
}
if (colorModel != "MONOCHROME2")
{
- DCMSEG_WARN("Photometric Interpretation is not set correctly (ignored), assuming value MONOCHROME2 as required for segmentations");
+ DCMSEG_WARN("Photometric Interpretation is not set correctly (ignored), assuming value MONOCHROME2 as required for segmentation objects");
colorModel = "MONOCHROME2";
}
if (rows == 0)
@@ -1239,7 +1245,7 @@ OFCondition DcmSegmentation::decompress(DcmDataset& dset)
// If the original transfer is encapsulated and we do not already have an uncompressed version, decompress or reject the file
else if (xfer.isEncapsulated())
{
- // RLE compression is fine (truely lossless). Deflated is handled internally by DCMTK.
+ // RLE compression is fine (truly lossless). Deflated is handled internally by DCMTK.
if (xfer.getXfer() == EXS_RLELossless)
{
DCMSEG_DEBUG("DICOM file is RLE-compressed, converting to uncompressed transfer syntax first");
@@ -1319,7 +1325,7 @@ void DcmSegmentation::concatFrames(OFVector< DcmIODTypes::Frame* > frames,
OFVector<DcmIODTypes::Frame*>::iterator frame = frames.begin();
Uint8 freeBits = 0;
Uint8 firstByte = 0;
- // Iterate over frames and copy each to pixdata memory
+ // Iterate over frames and copy each to pixData memory
for (size_t f = 0; frame != frames.end(); f++)
{
DCMSEG_DEBUG("Packing segmentation frame #" << f+1 << "/" << frames.size());
@@ -1352,7 +1358,7 @@ void DcmSegmentation::concatFrames(OFVector< DcmIODTypes::Frame* > frames,
frame++;
}
// Through shifting we can have non-zero bits within the unused bits of the
- // last byte. Fill them with zeroes (though not required by the standard).
+ // last byte. Fill them with zeros (though not required by the standard).
if (freeBits > 0)
{
*writePos = (*writePos >> freeBits) << freeBits;
diff --git a/dcmseg/libsrc/segment.cc b/dcmseg/libsrc/segment.cc
index df1ef2d..81baeac 100644
--- a/dcmseg/libsrc/segment.cc
+++ b/dcmseg/libsrc/segment.cc
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2016, Open Connections GmbH
+ * Copyright (C) 2015-2016, Open Connections GmbH
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation are maintained by
@@ -197,6 +197,12 @@ DcmSegTypes::E_SegmentAlgoType DcmSegment::getSegmentAlgorithmType()
return m_SegmentDescription.getSegmentAlgorithmType();
}
+OFCondition DcmSegment::getSegmentAlgorithmName(OFString& value,
+ const signed long pos)
+{
+ return DcmIODUtil::getStringValueFromElement(m_SegmentAlgorithmName, value, pos);
+}
+
GeneralAnatomyMacro& DcmSegment::getGeneralAnatomyCode()
{
diff --git a/dcmseg/libsrc/segtypes.cc b/dcmseg/libsrc/segtypes.cc
index 58b10ef..43dbf19 100644
--- a/dcmseg/libsrc/segtypes.cc
+++ b/dcmseg/libsrc/segtypes.cc
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2016, Open Connections GmbH
+ * Copyright (C) 2015-2016, Open Connections GmbH
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation are maintained by
@@ -11,7 +11,7 @@
* D-26121 Oldenburg, Germany
*
*
- * Module: dcmdata
+ * Module: dcmseg
*
* Author: Michael Onken
*
@@ -50,6 +50,18 @@ DcmSegTypes::E_SegmentationType DcmSegTypes::OFString2Segtype(const OFString& va
}
+OFString DcmSegTypes::segtype2OFString(const DcmSegTypes::E_SegmentationType& value)
+{
+ switch(value)
+ {
+ case DcmSegTypes::ST_BINARY: return "BINARY";
+ case DcmSegTypes::ST_FRACTIONAL: return "FRACTIONAL";
+ case DcmSegTypes::ST_UNKNOWN: return "UNKNOWN";
+ default: return "Invalid segmentation type (internal error)";
+ }
+}
+
+
DcmSegTypes::E_SegmentationFractionalType DcmSegTypes::OFString2FractionalType(const OFString& value)
{
if (value == "PROBABILITY")
diff --git a/dcmseg/libsrc/segutils.cc b/dcmseg/libsrc/segutils.cc
index 918778e..be9e91c 100644
--- a/dcmseg/libsrc/segutils.cc
+++ b/dcmseg/libsrc/segutils.cc
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2015, Open Connections GmbH
+ * Copyright (C) 2015-2016, Open Connections GmbH
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation are maintained by
@@ -11,7 +11,7 @@
* D-26121 Oldenburg, Germany
*
*
- * Module: dcmdata
+ * Module: dcmseg
*
* Author: Michael Onken
*
diff --git a/dcmseg/tests/Makefile.dep b/dcmseg/tests/Makefile.dep
index d3504b4..b01f53c 100644
--- a/dcmseg/tests/Makefile.dep
+++ b/dcmseg/tests/Makefile.dep
@@ -162,5 +162,6 @@ tutils.o: tutils.cc ../../config/include/dcmtk/config/osconfig.h \
../../dcmiod/include/dcmtk/dcmiod/iodrules.h \
../../dcmiod/include/dcmtk/dcmiod/iodtypes.h \
../../dcmiod/include/dcmtk/dcmiod/ioddef.h \
+ ../../dcmiod/include/dcmtk/dcmiod/cielabutil.h \
../../dcmiod/include/dcmtk/dcmiod/modbase.h \
../../ofstd/include/dcmtk/ofstd/ofmem.h
diff --git a/dcmsr/apps/Makefile.dep b/dcmsr/apps/Makefile.dep
index 39a91ba..7eef227 100644
--- a/dcmsr/apps/Makefile.dep
+++ b/dcmsr/apps/Makefile.dep
@@ -1,24 +1,31 @@
dsr2html.o: dsr2html.cc ../../config/include/dcmtk/config/osconfig.h \
../include/dcmtk/dcmsr/dsrdoc.h ../include/dcmtk/dcmsr/dsrdoctr.h \
../include/dcmtk/dcmsr/dsrdocst.h ../include/dcmtk/dcmsr/dsrtree.h \
- ../include/dcmtk/dcmsr/dsrtypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctk.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
- ../../oflog/include/dcmtk/oflog/oflog.h \
- ../../oflog/include/dcmtk/oflog/logger.h \
- ../../oflog/include/dcmtk/oflog/config.h \
+ ../include/dcmtk/dcmsr/dsrtypes.h ../include/dcmtk/dcmsr/dsdefine.h \
../../ofstd/include/dcmtk/ofstd/ofdefine.h \
../../ofstd/include/dcmtk/ofstd/ofcast.h \
../../ofstd/include/dcmtk/ofstd/ofexport.h \
../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
+ ../../ofstd/include/dcmtk/ofstd/ofthread.h \
+ ../../ofstd/include/dcmtk/ofstd/oftypes.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstream.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstring.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcond.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
+ ../../oflog/include/dcmtk/oflog/oflog.h \
+ ../../oflog/include/dcmtk/oflog/logger.h \
+ ../../oflog/include/dcmtk/oflog/config.h \
../../oflog/include/dcmtk/oflog/config/defines.h \
../../oflog/include/dcmtk/oflog/helpers/threadcf.h \
../../oflog/include/dcmtk/oflog/loglevel.h \
../../ofstd/include/dcmtk/ofstd/ofvector.h \
- ../../ofstd/include/dcmtk/ofstd/oftypes.h \
- ../../ofstd/include/dcmtk/ofstd/ofstream.h \
../../oflog/include/dcmtk/oflog/tstring.h \
- ../../ofstd/include/dcmtk/ofstd/ofstring.h \
../../oflog/include/dcmtk/oflog/tchar.h \
../../oflog/include/dcmtk/oflog/spi/apndatch.h \
../../oflog/include/dcmtk/oflog/appender.h \
@@ -37,66 +44,79 @@ dsr2html.o: dsr2html.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofcmdln.h \
../../ofstd/include/dcmtk/ofstd/oflist.h \
../../ofstd/include/dcmtk/ofstd/ofconsol.h \
- ../../ofstd/include/dcmtk/ofstd/ofthread.h \
../../ofstd/include/dcmtk/ofstd/offile.h \
../../ofstd/include/dcmtk/ofstd/ofstd.h \
../../ofstd/include/dcmtk/ofstd/oftraits.h \
- ../../ofstd/include/dcmtk/ofstd/ofcond.h \
../../ofstd/include/dcmtk/ofstd/oflimits.h \
../../config/include/dcmtk/config/arith.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
- ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
+ ../include/dcmtk/dcmsr/dsrtncsr.h ../include/dcmtk/dcmsr/dsrposcn.h \
+ ../include/dcmtk/dcmsr/dsrtnant.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstack.h \
+ ../../ofstd/include/dcmtk/ofstd/ofutil.h \
+ ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
+ ../include/dcmtk/dcmsr/dsrdoctn.h ../include/dcmtk/dcmsr/dsrcodvl.h \
+ ../../ofstd/include/dcmtk/ofstd/ofexbl.h \
+ ../include/dcmtk/dcmsr/dsrdncsr.h ../include/dcmtk/dcmsr/dsrcitem.h \
+ ../include/dcmtk/dcmsr/dsrnumvl.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
+ ../include/dcmtk/dcmsr/dsrscovl.h ../include/dcmtk/dcmsr/dsrscogr.h \
+ ../include/dcmtk/dcmsr/dsrtlist.h ../include/dcmtk/dcmsr/dsrsc3vl.h \
+ ../include/dcmtk/dcmsr/dsrsc3gr.h ../include/dcmtk/dcmsr/dsrtcovl.h \
+ ../include/dcmtk/dcmsr/dsrtcodt.h ../include/dcmtk/dcmsr/dsrtcosp.h \
+ ../include/dcmtk/dcmsr/dsrtcoto.h ../include/dcmtk/dcmsr/dsrcomvl.h \
+ ../include/dcmtk/dcmsr/dsrimgvl.h ../include/dcmtk/dcmsr/dsrimgfr.h \
+ ../include/dcmtk/dcmsr/dsrimgse.h ../include/dcmtk/dcmsr/dsrwavvl.h \
+ ../include/dcmtk/dcmsr/dsrwavch.h \
+ ../../ofstd/include/dcmtk/ofstd/ofmem.h ../include/dcmtk/dcmsr/dsrrtpl.h \
+ ../include/dcmtk/dcmsr/dsrctpl.h ../include/dcmtk/dcmsr/dsrsoprf.h \
+ ../include/dcmtk/dcmsr/dsrrefin.h ../include/dcmtk/dcmsr/dsrcsidl.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
+ ../../ofstd/include/dcmtk/ofstd/ofdate.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
+ ../../ofstd/include/dcmtk/ofstd/oftime.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \
../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctag.h \
../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \
../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \
../../dcmdata/include/dcmtk/dcmdata/dcdict.h \
../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
- ../../dcmdata/include/dcmtk/dcmdata/dclist.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
../../dcmdata/include/dcmtk/dcmdata/dcmetinf.h \
../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \
../../dcmdata/include/dcmtk/dcmdata/dcdicdir.h \
../../ofstd/include/dcmtk/ofstd/ofmap.h \
- ../../ofstd/include/dcmtk/ofstd/ofutil.h \
- ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
../../dcmdata/include/dcmtk/dcmdata/dcdirrec.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrulup.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
../../dcmdata/include/dcmtk/dcmdata/dcpixseq.h \
../../dcmdata/include/dcmtk/dcmdata/dcofsetl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrae.h \
../../dcmdata/include/dcmtk/dcmdata/dcvras.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
- ../../ofstd/include/dcmtk/ofstd/ofdate.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrds.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrdt.h \
../../ofstd/include/dcmtk/ofstd/ofdatime.h \
- ../../ofstd/include/dcmtk/ofstd/oftime.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrur.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrlt.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrst.h \
../../dcmdata/include/dcmtk/dcmdata/dcvruc.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrut.h \
@@ -107,52 +127,40 @@ dsr2html.o: dsr2html.cc ../../config/include/dcmtk/config/osconfig.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
- ../include/dcmtk/dcmsr/dsdefine.h ../include/dcmtk/dcmsr/dsrtncsr.h \
- ../../ofstd/include/dcmtk/ofstd/ofstack.h \
- ../include/dcmtk/dcmsr/dsrposcn.h ../include/dcmtk/dcmsr/dsrtnant.h \
- ../include/dcmtk/dcmsr/dsrdoctn.h ../include/dcmtk/dcmsr/dsrcodvl.h \
- ../../ofstd/include/dcmtk/ofstd/ofexbl.h \
- ../include/dcmtk/dcmsr/dsrcitem.h ../include/dcmtk/dcmsr/dsrnumvl.h \
- ../include/dcmtk/dcmsr/dsrscovl.h ../include/dcmtk/dcmsr/dsrscogr.h \
- ../include/dcmtk/dcmsr/dsrtlist.h ../include/dcmtk/dcmsr/dsrsc3vl.h \
- ../include/dcmtk/dcmsr/dsrsc3gr.h ../include/dcmtk/dcmsr/dsrtcovl.h \
- ../include/dcmtk/dcmsr/dsrtcodt.h ../include/dcmtk/dcmsr/dsrtcosp.h \
- ../include/dcmtk/dcmsr/dsrtcoto.h ../include/dcmtk/dcmsr/dsrcomvl.h \
- ../include/dcmtk/dcmsr/dsrimgvl.h ../include/dcmtk/dcmsr/dsrimgfr.h \
- ../include/dcmtk/dcmsr/dsrimgse.h ../include/dcmtk/dcmsr/dsrwavvl.h \
- ../include/dcmtk/dcmsr/dsrwavch.h \
- ../../ofstd/include/dcmtk/ofstd/ofmem.h ../include/dcmtk/dcmsr/dsrrtpl.h \
- ../include/dcmtk/dcmsr/dsrctpl.h ../include/dcmtk/dcmsr/dsrsoprf.h \
- ../include/dcmtk/dcmsr/dsrrefin.h ../include/dcmtk/dcmsr/dsrcsidl.h \
../../ofstd/include/dcmtk/ofstd/ofchrenc.h
dsr2xml.o: dsr2xml.cc ../../config/include/dcmtk/config/osconfig.h \
../include/dcmtk/dcmsr/dsrdoc.h ../include/dcmtk/dcmsr/dsrdoctr.h \
../include/dcmtk/dcmsr/dsrdocst.h ../include/dcmtk/dcmsr/dsrtree.h \
- ../include/dcmtk/dcmsr/dsrtypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctk.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
- ../../oflog/include/dcmtk/oflog/oflog.h \
- ../../oflog/include/dcmtk/oflog/logger.h \
- ../../oflog/include/dcmtk/oflog/config.h \
+ ../include/dcmtk/dcmsr/dsrtypes.h ../include/dcmtk/dcmsr/dsdefine.h \
../../ofstd/include/dcmtk/ofstd/ofdefine.h \
../../ofstd/include/dcmtk/ofstd/ofcast.h \
../../ofstd/include/dcmtk/ofstd/ofexport.h \
../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
+ ../../ofstd/include/dcmtk/ofstd/ofthread.h \
+ ../../ofstd/include/dcmtk/ofstd/oftypes.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstream.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstring.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcond.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
+ ../../oflog/include/dcmtk/oflog/oflog.h \
+ ../../oflog/include/dcmtk/oflog/logger.h \
+ ../../oflog/include/dcmtk/oflog/config.h \
../../oflog/include/dcmtk/oflog/config/defines.h \
../../oflog/include/dcmtk/oflog/helpers/threadcf.h \
../../oflog/include/dcmtk/oflog/loglevel.h \
../../ofstd/include/dcmtk/ofstd/ofvector.h \
- ../../ofstd/include/dcmtk/ofstd/oftypes.h \
- ../../ofstd/include/dcmtk/ofstd/ofstream.h \
../../oflog/include/dcmtk/oflog/tstring.h \
- ../../ofstd/include/dcmtk/ofstd/ofstring.h \
../../oflog/include/dcmtk/oflog/tchar.h \
../../oflog/include/dcmtk/oflog/spi/apndatch.h \
../../oflog/include/dcmtk/oflog/appender.h \
@@ -171,66 +179,79 @@ dsr2xml.o: dsr2xml.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofcmdln.h \
../../ofstd/include/dcmtk/ofstd/oflist.h \
../../ofstd/include/dcmtk/ofstd/ofconsol.h \
- ../../ofstd/include/dcmtk/ofstd/ofthread.h \
../../ofstd/include/dcmtk/ofstd/offile.h \
../../ofstd/include/dcmtk/ofstd/ofstd.h \
../../ofstd/include/dcmtk/ofstd/oftraits.h \
- ../../ofstd/include/dcmtk/ofstd/ofcond.h \
../../ofstd/include/dcmtk/ofstd/oflimits.h \
../../config/include/dcmtk/config/arith.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
- ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
+ ../include/dcmtk/dcmsr/dsrtncsr.h ../include/dcmtk/dcmsr/dsrposcn.h \
+ ../include/dcmtk/dcmsr/dsrtnant.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstack.h \
+ ../../ofstd/include/dcmtk/ofstd/ofutil.h \
+ ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
+ ../include/dcmtk/dcmsr/dsrdoctn.h ../include/dcmtk/dcmsr/dsrcodvl.h \
+ ../../ofstd/include/dcmtk/ofstd/ofexbl.h \
+ ../include/dcmtk/dcmsr/dsrdncsr.h ../include/dcmtk/dcmsr/dsrcitem.h \
+ ../include/dcmtk/dcmsr/dsrnumvl.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
+ ../include/dcmtk/dcmsr/dsrscovl.h ../include/dcmtk/dcmsr/dsrscogr.h \
+ ../include/dcmtk/dcmsr/dsrtlist.h ../include/dcmtk/dcmsr/dsrsc3vl.h \
+ ../include/dcmtk/dcmsr/dsrsc3gr.h ../include/dcmtk/dcmsr/dsrtcovl.h \
+ ../include/dcmtk/dcmsr/dsrtcodt.h ../include/dcmtk/dcmsr/dsrtcosp.h \
+ ../include/dcmtk/dcmsr/dsrtcoto.h ../include/dcmtk/dcmsr/dsrcomvl.h \
+ ../include/dcmtk/dcmsr/dsrimgvl.h ../include/dcmtk/dcmsr/dsrimgfr.h \
+ ../include/dcmtk/dcmsr/dsrimgse.h ../include/dcmtk/dcmsr/dsrwavvl.h \
+ ../include/dcmtk/dcmsr/dsrwavch.h \
+ ../../ofstd/include/dcmtk/ofstd/ofmem.h ../include/dcmtk/dcmsr/dsrrtpl.h \
+ ../include/dcmtk/dcmsr/dsrctpl.h ../include/dcmtk/dcmsr/dsrsoprf.h \
+ ../include/dcmtk/dcmsr/dsrrefin.h ../include/dcmtk/dcmsr/dsrcsidl.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
+ ../../ofstd/include/dcmtk/ofstd/ofdate.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
+ ../../ofstd/include/dcmtk/ofstd/oftime.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \
../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctag.h \
../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \
../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \
../../dcmdata/include/dcmtk/dcmdata/dcdict.h \
../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
- ../../dcmdata/include/dcmtk/dcmdata/dclist.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
../../dcmdata/include/dcmtk/dcmdata/dcmetinf.h \
../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \
../../dcmdata/include/dcmtk/dcmdata/dcdicdir.h \
../../ofstd/include/dcmtk/ofstd/ofmap.h \
- ../../ofstd/include/dcmtk/ofstd/ofutil.h \
- ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
../../dcmdata/include/dcmtk/dcmdata/dcdirrec.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrulup.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
../../dcmdata/include/dcmtk/dcmdata/dcpixseq.h \
../../dcmdata/include/dcmtk/dcmdata/dcofsetl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrae.h \
../../dcmdata/include/dcmtk/dcmdata/dcvras.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
- ../../ofstd/include/dcmtk/ofstd/ofdate.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrds.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrdt.h \
../../ofstd/include/dcmtk/ofstd/ofdatime.h \
- ../../ofstd/include/dcmtk/ofstd/oftime.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrur.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrlt.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrst.h \
../../dcmdata/include/dcmtk/dcmdata/dcvruc.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrut.h \
@@ -241,52 +262,40 @@ dsr2xml.o: dsr2xml.cc ../../config/include/dcmtk/config/osconfig.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
- ../include/dcmtk/dcmsr/dsdefine.h ../include/dcmtk/dcmsr/dsrtncsr.h \
- ../../ofstd/include/dcmtk/ofstd/ofstack.h \
- ../include/dcmtk/dcmsr/dsrposcn.h ../include/dcmtk/dcmsr/dsrtnant.h \
- ../include/dcmtk/dcmsr/dsrdoctn.h ../include/dcmtk/dcmsr/dsrcodvl.h \
- ../../ofstd/include/dcmtk/ofstd/ofexbl.h \
- ../include/dcmtk/dcmsr/dsrcitem.h ../include/dcmtk/dcmsr/dsrnumvl.h \
- ../include/dcmtk/dcmsr/dsrscovl.h ../include/dcmtk/dcmsr/dsrscogr.h \
- ../include/dcmtk/dcmsr/dsrtlist.h ../include/dcmtk/dcmsr/dsrsc3vl.h \
- ../include/dcmtk/dcmsr/dsrsc3gr.h ../include/dcmtk/dcmsr/dsrtcovl.h \
- ../include/dcmtk/dcmsr/dsrtcodt.h ../include/dcmtk/dcmsr/dsrtcosp.h \
- ../include/dcmtk/dcmsr/dsrtcoto.h ../include/dcmtk/dcmsr/dsrcomvl.h \
- ../include/dcmtk/dcmsr/dsrimgvl.h ../include/dcmtk/dcmsr/dsrimgfr.h \
- ../include/dcmtk/dcmsr/dsrimgse.h ../include/dcmtk/dcmsr/dsrwavvl.h \
- ../include/dcmtk/dcmsr/dsrwavch.h \
- ../../ofstd/include/dcmtk/ofstd/ofmem.h ../include/dcmtk/dcmsr/dsrrtpl.h \
- ../include/dcmtk/dcmsr/dsrctpl.h ../include/dcmtk/dcmsr/dsrsoprf.h \
- ../include/dcmtk/dcmsr/dsrrefin.h ../include/dcmtk/dcmsr/dsrcsidl.h \
../../ofstd/include/dcmtk/ofstd/ofchrenc.h
dsrdump.o: dsrdump.cc ../../config/include/dcmtk/config/osconfig.h \
../include/dcmtk/dcmsr/dsrdoc.h ../include/dcmtk/dcmsr/dsrdoctr.h \
../include/dcmtk/dcmsr/dsrdocst.h ../include/dcmtk/dcmsr/dsrtree.h \
- ../include/dcmtk/dcmsr/dsrtypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctk.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
- ../../oflog/include/dcmtk/oflog/oflog.h \
- ../../oflog/include/dcmtk/oflog/logger.h \
- ../../oflog/include/dcmtk/oflog/config.h \
+ ../include/dcmtk/dcmsr/dsrtypes.h ../include/dcmtk/dcmsr/dsdefine.h \
../../ofstd/include/dcmtk/ofstd/ofdefine.h \
../../ofstd/include/dcmtk/ofstd/ofcast.h \
../../ofstd/include/dcmtk/ofstd/ofexport.h \
../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
+ ../../ofstd/include/dcmtk/ofstd/ofthread.h \
+ ../../ofstd/include/dcmtk/ofstd/oftypes.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstream.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstring.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcond.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
+ ../../oflog/include/dcmtk/oflog/oflog.h \
+ ../../oflog/include/dcmtk/oflog/logger.h \
+ ../../oflog/include/dcmtk/oflog/config.h \
../../oflog/include/dcmtk/oflog/config/defines.h \
../../oflog/include/dcmtk/oflog/helpers/threadcf.h \
../../oflog/include/dcmtk/oflog/loglevel.h \
../../ofstd/include/dcmtk/ofstd/ofvector.h \
- ../../ofstd/include/dcmtk/ofstd/oftypes.h \
- ../../ofstd/include/dcmtk/ofstd/ofstream.h \
../../oflog/include/dcmtk/oflog/tstring.h \
- ../../ofstd/include/dcmtk/ofstd/ofstring.h \
../../oflog/include/dcmtk/oflog/tchar.h \
../../oflog/include/dcmtk/oflog/spi/apndatch.h \
../../oflog/include/dcmtk/oflog/appender.h \
@@ -305,66 +314,79 @@ dsrdump.o: dsrdump.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofcmdln.h \
../../ofstd/include/dcmtk/ofstd/oflist.h \
../../ofstd/include/dcmtk/ofstd/ofconsol.h \
- ../../ofstd/include/dcmtk/ofstd/ofthread.h \
../../ofstd/include/dcmtk/ofstd/offile.h \
../../ofstd/include/dcmtk/ofstd/ofstd.h \
../../ofstd/include/dcmtk/ofstd/oftraits.h \
- ../../ofstd/include/dcmtk/ofstd/ofcond.h \
../../ofstd/include/dcmtk/ofstd/oflimits.h \
../../config/include/dcmtk/config/arith.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
- ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
+ ../include/dcmtk/dcmsr/dsrtncsr.h ../include/dcmtk/dcmsr/dsrposcn.h \
+ ../include/dcmtk/dcmsr/dsrtnant.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstack.h \
+ ../../ofstd/include/dcmtk/ofstd/ofutil.h \
+ ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
+ ../include/dcmtk/dcmsr/dsrdoctn.h ../include/dcmtk/dcmsr/dsrcodvl.h \
+ ../../ofstd/include/dcmtk/ofstd/ofexbl.h \
+ ../include/dcmtk/dcmsr/dsrdncsr.h ../include/dcmtk/dcmsr/dsrcitem.h \
+ ../include/dcmtk/dcmsr/dsrnumvl.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
+ ../include/dcmtk/dcmsr/dsrscovl.h ../include/dcmtk/dcmsr/dsrscogr.h \
+ ../include/dcmtk/dcmsr/dsrtlist.h ../include/dcmtk/dcmsr/dsrsc3vl.h \
+ ../include/dcmtk/dcmsr/dsrsc3gr.h ../include/dcmtk/dcmsr/dsrtcovl.h \
+ ../include/dcmtk/dcmsr/dsrtcodt.h ../include/dcmtk/dcmsr/dsrtcosp.h \
+ ../include/dcmtk/dcmsr/dsrtcoto.h ../include/dcmtk/dcmsr/dsrcomvl.h \
+ ../include/dcmtk/dcmsr/dsrimgvl.h ../include/dcmtk/dcmsr/dsrimgfr.h \
+ ../include/dcmtk/dcmsr/dsrimgse.h ../include/dcmtk/dcmsr/dsrwavvl.h \
+ ../include/dcmtk/dcmsr/dsrwavch.h \
+ ../../ofstd/include/dcmtk/ofstd/ofmem.h ../include/dcmtk/dcmsr/dsrrtpl.h \
+ ../include/dcmtk/dcmsr/dsrctpl.h ../include/dcmtk/dcmsr/dsrsoprf.h \
+ ../include/dcmtk/dcmsr/dsrrefin.h ../include/dcmtk/dcmsr/dsrcsidl.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
+ ../../ofstd/include/dcmtk/ofstd/ofdate.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
+ ../../ofstd/include/dcmtk/ofstd/oftime.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \
../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctag.h \
../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \
../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \
../../dcmdata/include/dcmtk/dcmdata/dcdict.h \
../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
- ../../dcmdata/include/dcmtk/dcmdata/dclist.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
../../dcmdata/include/dcmtk/dcmdata/dcmetinf.h \
../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \
../../dcmdata/include/dcmtk/dcmdata/dcdicdir.h \
../../ofstd/include/dcmtk/ofstd/ofmap.h \
- ../../ofstd/include/dcmtk/ofstd/ofutil.h \
- ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
../../dcmdata/include/dcmtk/dcmdata/dcdirrec.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrulup.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
../../dcmdata/include/dcmtk/dcmdata/dcpixseq.h \
../../dcmdata/include/dcmtk/dcmdata/dcofsetl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrae.h \
../../dcmdata/include/dcmtk/dcmdata/dcvras.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
- ../../ofstd/include/dcmtk/ofstd/ofdate.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrds.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrdt.h \
../../ofstd/include/dcmtk/ofstd/ofdatime.h \
- ../../ofstd/include/dcmtk/ofstd/oftime.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrur.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrlt.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrst.h \
../../dcmdata/include/dcmtk/dcmdata/dcvruc.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrut.h \
@@ -375,52 +397,40 @@ dsrdump.o: dsrdump.cc ../../config/include/dcmtk/config/osconfig.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
- ../include/dcmtk/dcmsr/dsdefine.h ../include/dcmtk/dcmsr/dsrtncsr.h \
- ../../ofstd/include/dcmtk/ofstd/ofstack.h \
- ../include/dcmtk/dcmsr/dsrposcn.h ../include/dcmtk/dcmsr/dsrtnant.h \
- ../include/dcmtk/dcmsr/dsrdoctn.h ../include/dcmtk/dcmsr/dsrcodvl.h \
- ../../ofstd/include/dcmtk/ofstd/ofexbl.h \
- ../include/dcmtk/dcmsr/dsrcitem.h ../include/dcmtk/dcmsr/dsrnumvl.h \
- ../include/dcmtk/dcmsr/dsrscovl.h ../include/dcmtk/dcmsr/dsrscogr.h \
- ../include/dcmtk/dcmsr/dsrtlist.h ../include/dcmtk/dcmsr/dsrsc3vl.h \
- ../include/dcmtk/dcmsr/dsrsc3gr.h ../include/dcmtk/dcmsr/dsrtcovl.h \
- ../include/dcmtk/dcmsr/dsrtcodt.h ../include/dcmtk/dcmsr/dsrtcosp.h \
- ../include/dcmtk/dcmsr/dsrtcoto.h ../include/dcmtk/dcmsr/dsrcomvl.h \
- ../include/dcmtk/dcmsr/dsrimgvl.h ../include/dcmtk/dcmsr/dsrimgfr.h \
- ../include/dcmtk/dcmsr/dsrimgse.h ../include/dcmtk/dcmsr/dsrwavvl.h \
- ../include/dcmtk/dcmsr/dsrwavch.h \
- ../../ofstd/include/dcmtk/ofstd/ofmem.h ../include/dcmtk/dcmsr/dsrrtpl.h \
- ../include/dcmtk/dcmsr/dsrctpl.h ../include/dcmtk/dcmsr/dsrsoprf.h \
- ../include/dcmtk/dcmsr/dsrrefin.h ../include/dcmtk/dcmsr/dsrcsidl.h \
../../ofstd/include/dcmtk/ofstd/ofchrenc.h
xml2dsr.o: xml2dsr.cc ../../config/include/dcmtk/config/osconfig.h \
../include/dcmtk/dcmsr/dsrdoc.h ../include/dcmtk/dcmsr/dsrdoctr.h \
../include/dcmtk/dcmsr/dsrdocst.h ../include/dcmtk/dcmsr/dsrtree.h \
- ../include/dcmtk/dcmsr/dsrtypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctk.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
- ../../oflog/include/dcmtk/oflog/oflog.h \
- ../../oflog/include/dcmtk/oflog/logger.h \
- ../../oflog/include/dcmtk/oflog/config.h \
+ ../include/dcmtk/dcmsr/dsrtypes.h ../include/dcmtk/dcmsr/dsdefine.h \
../../ofstd/include/dcmtk/ofstd/ofdefine.h \
../../ofstd/include/dcmtk/ofstd/ofcast.h \
../../ofstd/include/dcmtk/ofstd/ofexport.h \
../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
+ ../../ofstd/include/dcmtk/ofstd/ofthread.h \
+ ../../ofstd/include/dcmtk/ofstd/oftypes.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstream.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstring.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcond.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
+ ../../oflog/include/dcmtk/oflog/oflog.h \
+ ../../oflog/include/dcmtk/oflog/logger.h \
+ ../../oflog/include/dcmtk/oflog/config.h \
../../oflog/include/dcmtk/oflog/config/defines.h \
../../oflog/include/dcmtk/oflog/helpers/threadcf.h \
../../oflog/include/dcmtk/oflog/loglevel.h \
../../ofstd/include/dcmtk/ofstd/ofvector.h \
- ../../ofstd/include/dcmtk/ofstd/oftypes.h \
- ../../ofstd/include/dcmtk/ofstd/ofstream.h \
../../oflog/include/dcmtk/oflog/tstring.h \
- ../../ofstd/include/dcmtk/ofstd/ofstring.h \
../../oflog/include/dcmtk/oflog/tchar.h \
../../oflog/include/dcmtk/oflog/spi/apndatch.h \
../../oflog/include/dcmtk/oflog/appender.h \
@@ -439,66 +449,79 @@ xml2dsr.o: xml2dsr.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofcmdln.h \
../../ofstd/include/dcmtk/ofstd/oflist.h \
../../ofstd/include/dcmtk/ofstd/ofconsol.h \
- ../../ofstd/include/dcmtk/ofstd/ofthread.h \
../../ofstd/include/dcmtk/ofstd/offile.h \
../../ofstd/include/dcmtk/ofstd/ofstd.h \
../../ofstd/include/dcmtk/ofstd/oftraits.h \
- ../../ofstd/include/dcmtk/ofstd/ofcond.h \
../../ofstd/include/dcmtk/ofstd/oflimits.h \
../../config/include/dcmtk/config/arith.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
- ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
+ ../include/dcmtk/dcmsr/dsrtncsr.h ../include/dcmtk/dcmsr/dsrposcn.h \
+ ../include/dcmtk/dcmsr/dsrtnant.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstack.h \
+ ../../ofstd/include/dcmtk/ofstd/ofutil.h \
+ ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
+ ../include/dcmtk/dcmsr/dsrdoctn.h ../include/dcmtk/dcmsr/dsrcodvl.h \
+ ../../ofstd/include/dcmtk/ofstd/ofexbl.h \
+ ../include/dcmtk/dcmsr/dsrdncsr.h ../include/dcmtk/dcmsr/dsrcitem.h \
+ ../include/dcmtk/dcmsr/dsrnumvl.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
+ ../include/dcmtk/dcmsr/dsrscovl.h ../include/dcmtk/dcmsr/dsrscogr.h \
+ ../include/dcmtk/dcmsr/dsrtlist.h ../include/dcmtk/dcmsr/dsrsc3vl.h \
+ ../include/dcmtk/dcmsr/dsrsc3gr.h ../include/dcmtk/dcmsr/dsrtcovl.h \
+ ../include/dcmtk/dcmsr/dsrtcodt.h ../include/dcmtk/dcmsr/dsrtcosp.h \
+ ../include/dcmtk/dcmsr/dsrtcoto.h ../include/dcmtk/dcmsr/dsrcomvl.h \
+ ../include/dcmtk/dcmsr/dsrimgvl.h ../include/dcmtk/dcmsr/dsrimgfr.h \
+ ../include/dcmtk/dcmsr/dsrimgse.h ../include/dcmtk/dcmsr/dsrwavvl.h \
+ ../include/dcmtk/dcmsr/dsrwavch.h \
+ ../../ofstd/include/dcmtk/ofstd/ofmem.h ../include/dcmtk/dcmsr/dsrrtpl.h \
+ ../include/dcmtk/dcmsr/dsrctpl.h ../include/dcmtk/dcmsr/dsrsoprf.h \
+ ../include/dcmtk/dcmsr/dsrrefin.h ../include/dcmtk/dcmsr/dsrcsidl.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
+ ../../ofstd/include/dcmtk/ofstd/ofdate.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
+ ../../ofstd/include/dcmtk/ofstd/oftime.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \
../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctag.h \
../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \
../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \
../../dcmdata/include/dcmtk/dcmdata/dcdict.h \
../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
- ../../dcmdata/include/dcmtk/dcmdata/dclist.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
../../dcmdata/include/dcmtk/dcmdata/dcmetinf.h \
../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \
../../dcmdata/include/dcmtk/dcmdata/dcdicdir.h \
../../ofstd/include/dcmtk/ofstd/ofmap.h \
- ../../ofstd/include/dcmtk/ofstd/ofutil.h \
- ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
../../dcmdata/include/dcmtk/dcmdata/dcdirrec.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrulup.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
../../dcmdata/include/dcmtk/dcmdata/dcpixseq.h \
../../dcmdata/include/dcmtk/dcmdata/dcofsetl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrae.h \
../../dcmdata/include/dcmtk/dcmdata/dcvras.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
- ../../ofstd/include/dcmtk/ofstd/ofdate.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrds.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrdt.h \
../../ofstd/include/dcmtk/ofstd/ofdatime.h \
- ../../ofstd/include/dcmtk/ofstd/oftime.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrur.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrlt.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrst.h \
../../dcmdata/include/dcmtk/dcmdata/dcvruc.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrut.h \
@@ -509,28 +532,9 @@ xml2dsr.o: xml2dsr.cc ../../config/include/dcmtk/config/osconfig.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
- ../include/dcmtk/dcmsr/dsdefine.h ../include/dcmtk/dcmsr/dsrtncsr.h \
- ../../ofstd/include/dcmtk/ofstd/ofstack.h \
- ../include/dcmtk/dcmsr/dsrposcn.h ../include/dcmtk/dcmsr/dsrtnant.h \
- ../include/dcmtk/dcmsr/dsrdoctn.h ../include/dcmtk/dcmsr/dsrcodvl.h \
- ../../ofstd/include/dcmtk/ofstd/ofexbl.h \
- ../include/dcmtk/dcmsr/dsrcitem.h ../include/dcmtk/dcmsr/dsrnumvl.h \
- ../include/dcmtk/dcmsr/dsrscovl.h ../include/dcmtk/dcmsr/dsrscogr.h \
- ../include/dcmtk/dcmsr/dsrtlist.h ../include/dcmtk/dcmsr/dsrsc3vl.h \
- ../include/dcmtk/dcmsr/dsrsc3gr.h ../include/dcmtk/dcmsr/dsrtcovl.h \
- ../include/dcmtk/dcmsr/dsrtcodt.h ../include/dcmtk/dcmsr/dsrtcosp.h \
- ../include/dcmtk/dcmsr/dsrtcoto.h ../include/dcmtk/dcmsr/dsrcomvl.h \
- ../include/dcmtk/dcmsr/dsrimgvl.h ../include/dcmtk/dcmsr/dsrimgfr.h \
- ../include/dcmtk/dcmsr/dsrimgse.h ../include/dcmtk/dcmsr/dsrwavvl.h \
- ../include/dcmtk/dcmsr/dsrwavch.h \
- ../../ofstd/include/dcmtk/ofstd/ofmem.h ../include/dcmtk/dcmsr/dsrrtpl.h \
- ../include/dcmtk/dcmsr/dsrctpl.h ../include/dcmtk/dcmsr/dsrsoprf.h \
- ../include/dcmtk/dcmsr/dsrrefin.h ../include/dcmtk/dcmsr/dsrcsidl.h \
../../dcmdata/include/dcmtk/dcmdata/dcostrmz.h
diff --git a/dcmsr/apps/dsr2html.cc b/dcmsr/apps/dsr2html.cc
index 89250a0..4a7f77e 100644
--- a/dcmsr/apps/dsr2html.cc
+++ b/dcmsr/apps/dsr2html.cc
@@ -23,11 +23,12 @@
#include "dcmtk/config/osconfig.h" /* make sure OS specific configuration is included first */
-#include "dcmtk/dcmsr/dsrdoc.h"
-#include "dcmtk/dcmdata/cmdlnarg.h"
+#include "dcmtk/dcmsr/dsrdoc.h" /* for main interface class DSRDocument */
+
+#include "dcmtk/dcmdata/dctk.h" /* for typical set of "dcmdata" headers */
+
#include "dcmtk/ofstd/ofstream.h"
#include "dcmtk/ofstd/ofconapp.h"
-#include "dcmtk/dcmdata/dcuid.h" /* for dcmtk version name */
#ifdef WITH_ZLIB
#include <zlib.h> /* for zlibVersion() */
diff --git a/dcmsr/apps/dsr2xml.cc b/dcmsr/apps/dsr2xml.cc
index 71e8e22..fa8137e 100644
--- a/dcmsr/apps/dsr2xml.cc
+++ b/dcmsr/apps/dsr2xml.cc
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2000-2015, OFFIS e.V.
+ * Copyright (C) 2000-2016, OFFIS e.V.
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation were developed by
@@ -23,11 +23,12 @@
#include "dcmtk/config/osconfig.h" /* make sure OS specific configuration is included first */
-#include "dcmtk/dcmsr/dsrdoc.h"
-#include "dcmtk/dcmdata/cmdlnarg.h"
+#include "dcmtk/dcmsr/dsrdoc.h" /* for main interface class DSRDocument */
+
+#include "dcmtk/dcmdata/dctk.h" /* for typical set of "dcmdata" headers */
+
#include "dcmtk/ofstd/ofstream.h"
#include "dcmtk/ofstd/ofconapp.h"
-#include "dcmtk/dcmdata/dcuid.h" /* for dcmtk version name */
#ifdef WITH_ZLIB
#include <zlib.h> /* for zlibVersion() */
diff --git a/dcmsr/apps/dsrdump.cc b/dcmsr/apps/dsrdump.cc
index 0188cc7..8bdad9e 100644
--- a/dcmsr/apps/dsrdump.cc
+++ b/dcmsr/apps/dsrdump.cc
@@ -23,11 +23,12 @@
#include "dcmtk/config/osconfig.h" /* make sure OS specific configuration is included first */
-#include "dcmtk/dcmsr/dsrdoc.h"
-#include "dcmtk/dcmdata/cmdlnarg.h"
+#include "dcmtk/dcmsr/dsrdoc.h" /* for main interface class DSRDocument */
+
+#include "dcmtk/dcmdata/dctk.h" /* for typical set of "dcmdata" headers */
+
#include "dcmtk/ofstd/ofstream.h"
#include "dcmtk/ofstd/ofconapp.h"
-#include "dcmtk/dcmdata/dcuid.h" /* for dcmtk version name */
#ifdef WITH_ZLIB
#include <zlib.h> /* for zlibVersion() */
diff --git a/dcmsr/apps/xml2dsr.cc b/dcmsr/apps/xml2dsr.cc
index 80b6b3e..9937499 100644
--- a/dcmsr/apps/xml2dsr.cc
+++ b/dcmsr/apps/xml2dsr.cc
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2003-2014, OFFIS e.V.
+ * Copyright (C) 2003-2016, OFFIS e.V.
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation were developed by
@@ -23,12 +23,13 @@
#include "dcmtk/config/osconfig.h" /* make sure OS specific configuration is included first */
-#include "dcmtk/dcmsr/dsrdoc.h"
-#include "dcmtk/dcmdata/cmdlnarg.h"
+#include "dcmtk/dcmsr/dsrdoc.h" /* for main interface class DSRDocument */
+
+#include "dcmtk/dcmdata/dctk.h" /* for typical set of "dcmdata" headers */
+#include "dcmtk/dcmdata/dcostrmz.h" /* for dcmZlibCompressionLevel */
+
#include "dcmtk/ofstd/ofstream.h"
#include "dcmtk/ofstd/ofconapp.h"
-#include "dcmtk/dcmdata/dcuid.h" /* for dcmtk version name */
-#include "dcmtk/dcmdata/dcostrmz.h" /* for dcmZlibCompressionLevel */
#ifdef WITH_ZLIB
#include <zlib.h> /* for zlibVersion() */
diff --git a/dcmsr/include/dcmtk/dcmsr/cmr/cid100.h b/dcmsr/include/dcmtk/dcmsr/cmr/cid100.h
index 29078f4..a57f915 100644
--- a/dcmsr/include/dcmtk/dcmsr/cmr/cid100.h
+++ b/dcmsr/include/dcmtk/dcmsr/cmr/cid100.h
@@ -5,8 +5,8 @@
*
* Header file for class CID100_QuantitativeDiagnosticImagingProcedures
*
- * Generated automatically from DICOM PS 3.16-2015c
- * File created on 2016-01-16 12:26:31 by J. Riesmeier
+ * Generated automatically from DICOM PS 3.16-2016b
+ * File created on 2016-04-06 16:26:37 by J. Riesmeier
*
*/
@@ -19,6 +19,8 @@
#include "dcmtk/dcmsr/dsrctxgr.h"
#include "dcmtk/dcmsr/cmr/define.h"
+#include "dcmtk/ofstd/ofmap.h"
+
/*---------------------*
* class declaration *
@@ -56,12 +58,12 @@ class DCMTK_CMR_EXPORT CID100_QuantitativeDiagnosticImagingProcedures
PETCT_FDGImagingOfWholeBody,
/// (P5-08118,SRT,"PET/CT MET imaging of whole body")
PETCT_METImagingOfWholeBody,
- /// (RPID96,RADLEX,"CT HEAD PERFUSION WITH IV CONTRAST")
- CT_HEAD_PERFUSION_WITH_IV_CONTRAST,
- /// (RPID5258,RADLEX,"NM HEAD PERFUSION BRAIN SPECT")
- NM_HEAD_PERFUSION_BRAIN_SPECT,
- /// (RPID5427,RADLEX,"NM HEAD PERFUSION BRAIN PET-CT AV-45")
- NM_HEAD_PERFUSION_BRAIN_PET_CT_AV45
+ /// (RPID96,RADLEX,"CT head perfusion with IV contrast")
+ CTHeadPerfusionWithIVContrast,
+ /// (RPID5258,RADLEX,"NM head perfusion brain SPECT")
+ NMHeadPerfusionBrainSPECT,
+ /// (RPID5427,RADLEX,"NM head perfusion brain PET-CT AV-45")
+ NMHeadPerfusionBrainPET_CT_AV45
};
/** (default) constructor
diff --git a/dcmsr/include/dcmtk/dcmsr/cmr/cid10013.h b/dcmsr/include/dcmtk/dcmsr/cmr/cid10013.h
index c0e4257..8f143fa 100644
--- a/dcmsr/include/dcmtk/dcmsr/cmr/cid10013.h
+++ b/dcmsr/include/dcmtk/dcmsr/cmr/cid10013.h
@@ -5,8 +5,8 @@
*
* Header file for class CID10013_CTAcquisitionType
*
- * Generated automatically from DICOM PS 3.16-2015c
- * File created on 2016-01-16 12:26:55 by J. Riesmeier
+ * Generated automatically from DICOM PS 3.16-2016b
+ * File created on 2016-04-06 16:27:00 by J. Riesmeier
*
*/
@@ -19,6 +19,8 @@
#include "dcmtk/dcmsr/dsrctxgr.h"
#include "dcmtk/dcmsr/cmr/define.h"
+#include "dcmtk/ofstd/ofmap.h"
+
/*---------------------*
* class declaration *
@@ -26,7 +28,7 @@
/** Implementation of DCMR Context Group:
* CID 10013 - CT Acquisition Type.
- * (type: extensible, version: 20071031)
+ * (type: extensible, version: 20160314)
*/
class DCMTK_CMR_EXPORT CID10013_CTAcquisitionType
: public DSRContextGroup
@@ -47,7 +49,9 @@ class DCMTK_CMR_EXPORT CID10013_CTAcquisitionType
/// (113806,DCM,"Stationary Acquisition")
StationaryAcquisition,
/// (113807,DCM,"Free Acquisition")
- FreeAcquisition
+ FreeAcquisition,
+ /// (R-FB8F1,SRT,"Cone Beam Acquisition")
+ ConeBeamAcquisition
};
/** (default) constructor
diff --git a/dcmsr/include/dcmtk/dcmsr/cmr/cid10033.h b/dcmsr/include/dcmtk/dcmsr/cmr/cid10033.h
index 41db6f9..6402909 100644
--- a/dcmsr/include/dcmtk/dcmsr/cmr/cid10033.h
+++ b/dcmsr/include/dcmtk/dcmsr/cmr/cid10033.h
@@ -5,8 +5,8 @@
*
* Header file for class CID10033_CTReconstructionAlgorithm
*
- * Generated automatically from DICOM PS 3.16-2015c
- * File created on 2016-01-16 12:26:57 by J. Riesmeier
+ * Generated automatically from DICOM PS 3.16-2016b
+ * File created on 2016-04-06 16:27:02 by J. Riesmeier
*
*/
@@ -19,6 +19,8 @@
#include "dcmtk/dcmsr/dsrctxgr.h"
#include "dcmtk/dcmsr/cmr/define.h"
+#include "dcmtk/ofstd/ofmap.h"
+
/*---------------------*
* class declaration *
diff --git a/dcmsr/include/dcmtk/dcmsr/cmr/cid11.h b/dcmsr/include/dcmtk/dcmsr/cmr/cid11.h
index 79bea97..f32990e 100644
--- a/dcmsr/include/dcmtk/dcmsr/cmr/cid11.h
+++ b/dcmsr/include/dcmtk/dcmsr/cmr/cid11.h
@@ -5,8 +5,8 @@
*
* Header file for class CID11_RouteOfAdministration
*
- * Generated automatically from DICOM PS 3.16-2015c
- * File created on 2016-01-16 12:26:26 by J. Riesmeier
+ * Generated automatically from DICOM PS 3.16-2016b
+ * File created on 2016-04-06 16:26:32 by J. Riesmeier
*
*/
@@ -19,6 +19,8 @@
#include "dcmtk/dcmsr/dsrctxgr.h"
#include "dcmtk/dcmsr/cmr/define.h"
+#include "dcmtk/ofstd/ofmap.h"
+
/*---------------------*
* class declaration *
@@ -26,7 +28,7 @@
/** Implementation of DCMR Context Group:
* CID 11 - Route of Administration.
- * (type: extensible, version: 20100608)
+ * (type: extensible, version: 20160314)
*/
class DCMTK_CMR_EXPORT CID11_RouteOfAdministration
: public DSRContextGroup
@@ -46,7 +48,7 @@ class DCMTK_CMR_EXPORT CID11_RouteOfAdministration
IntramuscularRoute,
/// (G-D104,SRT,"Subcutaneous route")
SubcutaneousRoute,
- /// (G-D105,SRT,"Intracutaneous route")
+ /// (G-D17D,SRT,"Intracutaneous route")
IntracutaneousRoute,
/// (G-D106,SRT,"Intraperitoneal route")
IntraperitonealRoute,
@@ -56,19 +58,19 @@ class DCMTK_CMR_EXPORT CID11_RouteOfAdministration
IntrathecalRoute,
/// (G-D109,SRT,"Intra-articular route")
IntraArticularRoute,
- /// (G-D111,SRT,"Intraepithelial route")
+ /// (C38244,NCIt,"Intraepithelial route")
IntraepithelialRoute,
/// (G-D112,SRT,"Topical route")
TopicalRoute,
/// (G-D140,SRT,"Oral route")
OralRoute,
- /// (G-D142,SRT,"Transluminal route")
+ /// (C38306,NCIt,"Transluminal route")
TransluminalRoute,
/// (G-D144,SRT,"Intraluminal route")
IntraluminalRoute,
- /// (G-D146,SRT,"Extraluminal route")
+ /// (C38213,NCIt,"Extraluminal route")
ExtraluminalRoute,
- /// (G-D150,SRT,"By inhalation")
+ /// (R-40B32,SRT,"By inhalation")
ByInhalation,
/// (G-D160,SRT,"Per rectum")
PerRectum,
@@ -79,7 +81,15 @@ class DCMTK_CMR_EXPORT CID11_RouteOfAdministration
/// (G-D173,SRT,"Intracardiac route")
IntracardiacRoute,
/// (R-F2C86,SRT,"Intraventricular route - cardiac")
- IntraventricularRouteCardiac
+ IntraventricularRouteCardiac,
+ /// (127070,DCM,"Retro-orbital route")
+ RetroOrbitalRoute,
+ /// (G-D172,SRT,"Nasal route")
+ NasalRoute,
+ /// (G-D17D,SRT,"Intradermal route")
+ IntradermalRoute,
+ /// (R-F2CD4,SRT,"Intratumor route")
+ IntratumorRoute
};
/** (default) constructor
diff --git a/dcmsr/include/dcmtk/dcmsr/cmr/cid244.h b/dcmsr/include/dcmtk/dcmsr/cmr/cid244.h
index d09c4b9..d7a2c45 100644
--- a/dcmsr/include/dcmtk/dcmsr/cmr/cid244.h
+++ b/dcmsr/include/dcmtk/dcmsr/cmr/cid244.h
@@ -5,8 +5,8 @@
*
* Header file for class CID244_Laterality
*
- * Generated automatically from DICOM PS 3.16-2015c
- * File created on 2016-01-16 12:26:33 by J. Riesmeier
+ * Generated automatically from DICOM PS 3.16-2016b
+ * File created on 2016-04-06 16:26:38 by J. Riesmeier
*
*/
@@ -19,6 +19,8 @@
#include "dcmtk/dcmsr/dsrctxgr.h"
#include "dcmtk/dcmsr/cmr/define.h"
+#include "dcmtk/ofstd/ofmap.h"
+
/*---------------------*
* class declaration *
diff --git a/dcmsr/include/dcmtk/dcmsr/cmr/cid29.h b/dcmsr/include/dcmtk/dcmsr/cmr/cid29.h
index 537e277..dc9f383 100644
--- a/dcmsr/include/dcmtk/dcmsr/cmr/cid29.h
+++ b/dcmsr/include/dcmtk/dcmsr/cmr/cid29.h
@@ -5,8 +5,8 @@
*
* Header file for class CID29_AcquisitionModality
*
- * Generated automatically from DICOM PS 3.16-2015c
- * File created on 2016-01-16 12:26:28 by J. Riesmeier
+ * Generated automatically from DICOM PS 3.16-2016b
+ * File created on 2016-04-06 16:26:33 by J. Riesmeier
*
*/
@@ -19,6 +19,8 @@
#include "dcmtk/dcmsr/dsrctxgr.h"
#include "dcmtk/dcmsr/cmr/define.h"
+#include "dcmtk/ofstd/ofmap.h"
+
/*---------------------*
* class declaration *
diff --git a/dcmsr/include/dcmtk/dcmsr/cmr/cid4020.h b/dcmsr/include/dcmtk/dcmsr/cmr/cid4020.h
index 8dbe771..bf39d92 100644
--- a/dcmsr/include/dcmtk/dcmsr/cmr/cid4020.h
+++ b/dcmsr/include/dcmtk/dcmsr/cmr/cid4020.h
@@ -5,8 +5,8 @@
*
* Header file for class CID4020_PETRadionuclide
*
- * Generated automatically from DICOM PS 3.16-2015c
- * File created on 2016-01-16 12:26:35 by J. Riesmeier
+ * Generated automatically from DICOM PS 3.16-2016b
+ * File created on 2016-04-06 16:26:40 by J. Riesmeier
*
*/
@@ -19,6 +19,8 @@
#include "dcmtk/dcmsr/dsrctxgr.h"
#include "dcmtk/dcmsr/cmr/define.h"
+#include "dcmtk/ofstd/ofmap.h"
+
/*---------------------*
* class declaration *
@@ -26,7 +28,7 @@
/** Implementation of DCMR Context Group:
* CID 4020 - PET Radionuclide.
- * (type: extensible, version: 20141110)
+ * (type: extensible, version: 20160119)
*/
class DCMTK_CMR_EXPORT CID4020_PETRadionuclide
: public DSRContextGroup
@@ -64,6 +66,8 @@ class DCMTK_CMR_EXPORT CID4020_PETRadionuclide
_52_Iron,
/// (C-149A1,SRT,"^52^Manganese")
_52_Manganese,
+ /// (126607,DCM,"^52m^Manganese")
+ _52m_Manganese,
/// (C-127A4,SRT,"^60^Copper")
_60_Copper,
/// (C-127A1,SRT,"^61^Copper")
diff --git a/dcmsr/include/dcmtk/dcmsr/cmr/cid4021.h b/dcmsr/include/dcmtk/dcmsr/cmr/cid4021.h
index 5fe8994..72c4b03 100644
--- a/dcmsr/include/dcmtk/dcmsr/cmr/cid4021.h
+++ b/dcmsr/include/dcmtk/dcmsr/cmr/cid4021.h
@@ -5,8 +5,8 @@
*
* Header file for class CID4021_PETRadiopharmaceutical
*
- * Generated automatically from DICOM PS 3.16-2015c
- * File created on 2016-01-16 12:26:36 by J. Riesmeier
+ * Generated automatically from DICOM PS 3.16-2016b
+ * File created on 2016-04-06 16:26:42 by J. Riesmeier
*
*/
@@ -19,6 +19,8 @@
#include "dcmtk/dcmsr/dsrctxgr.h"
#include "dcmtk/dcmsr/cmr/define.h"
+#include "dcmtk/ofstd/ofmap.h"
+
/*---------------------*
* class declaration *
@@ -26,7 +28,7 @@
/** Implementation of DCMR Context Group:
* CID 4021 - PET Radiopharmaceutical.
- * (type: extensible, version: 20141110)
+ * (type: extensible, version: 20160119)
*/
class DCMTK_CMR_EXPORT CID4021_PETRadiopharmaceutical
: public DSRContextGroup
@@ -38,12 +40,22 @@ class DCMTK_CMR_EXPORT CID4021_PETRadiopharmaceutical
*/
enum EnumType
{
+ /// (126752,DCM,"28H1 ^89^Zr")
+ _28H1_89Zr,
/// (126713,DCM,"2FA F^18^")
_2FA_F18,
+ /// (126751,DCM,"7D12 ^89^Zr")
+ _7D12_89Zr,
+ /// (126750,DCM,"7E11 ^89^Zr")
+ _7E11_89Zr,
/// (C-B1043,SRT,"Acetate C^11^")
Acetate_C11,
+ /// (126729,DCM,"AGN-150998 ^89^Zr")
+ AGN150998_89Zr,
/// (C-B103C,SRT,"Ammonia N^13^")
Ammonia_N13,
+ /// (126754,DCM,"Anti-B220 ^89^Zr")
+ AntiB220_89Zr,
/// (126700,DCM,"ATSM Cu^60^")
ATSM_Cu60,
/// (126701,DCM,"ATSM Cu^61^")
@@ -52,8 +64,14 @@ class DCMTK_CMR_EXPORT CID4021_PETRadiopharmaceutical
ATSM_Cu62,
/// (C-B07DB,SRT,"ATSM Cu^64^")
ATSM_Cu64,
+ /// (126722,DCM,"Benralizumab ^89^Zr")
+ Benralizumab_89Zr,
/// (126516,DCM,"Bevacizumab ^89^Zr")
Bevacizumab_89Zr,
+ /// (126727,DCM,"Blinatumomab ^89^Zr")
+ Blinatumomab_89Zr,
+ /// (126735,DCM,"Brentuximab ^89^Zr")
+ Brentuximab_89Zr,
/// (C-B07DC,SRT,"Butanol O^15^")
Butanol_O15,
/// (C-B103B,SRT,"Carbon dioxide O^15^")
@@ -66,20 +84,34 @@ class DCMTK_CMR_EXPORT CID4021_PETRadiopharmaceutical
Carfentanil_C11,
/// (126513,DCM,"Cetuximab ^89^Zr")
Cetuximab_89Zr,
- /// (126703,DCM,"Choline C^11^")
- Choline_C11,
/// (126517,DCM,"cG250-F(ab')(2) ^89^Zr")
CG250Fab2_89Zr,
+ /// (126703,DCM,"Choline C^11^")
+ Choline_C11,
/// (126715,DCM,"CLR1404 I^124^")
CLR1404_I124,
/// (126716,DCM,"CLR1404 I^131^")
CLR1404_I131,
+ /// (126746,DCM,"cMAb U36 ^89^Zr")
+ CMAbU36_89Zr,
/// (126515,DCM,"cU36 ^89^Zr")
CU36_89Zr,
+ /// (126762,DCM,"Df-[FK](2) ^89^Zr")
+ DfFK2_89Zr,
+ /// (126763,DCM,"Df-[FK](2)-3PEG(4) ^89^Zr")
+ DfFK23PEG4_89Zr,
/// (126520,DCM,"Df-CD45 ^89^Zr")
DfCD45_89Zr,
+ /// (126760,DCM,"Df-FK ^89^Zr")
+ DfFK_89Zr,
+ /// (126761,DCM,"Df-FK-PEG(3) ^89^Zr")
+ DfFKPEG3_89Zr,
+ /// (126747,DCM,"DN30 ^89^Zr")
+ DN30_89Zr,
/// (126519,DCM,"E4G10 ^89^Zr")
E4G10_89Zr,
+ /// (126732,DCM,"Ecromeximab ^89^Zr")
+ Ecromeximab_89Zr,
/// (C2713594,UMLS,"Edotreotide Ga^68^")
Edotreotide_Ga68,
/// (C-B07DD,SRT,"EDTA Ga^68^")
@@ -90,12 +122,12 @@ class DCMTK_CMR_EXPORT CID4021_PETRadiopharmaceutical
Fallypride_F18,
/// (126706,DCM,"FLB 457 C^11^")
FLB457_C11,
- /// (126503,DCM,"Flubatine F^18^")
- Flubatine_F18_126503,
/// (126501,DCM,"Florbetaben F^18^")
Florbetaben_F18,
/// (C-E0269,SRT,"Florbetapir F^18^")
Florbetapir_F18,
+ /// (126503,DCM,"Flubatine F^18^")
+ Flubatine_F18_126503,
/// (126712,DCM,"Flubatine F^18^")
Flubatine_F18_126712,
/// (C-E0265,SRT,"Fluciclatide F^18^")
@@ -106,34 +138,40 @@ class DCMTK_CMR_EXPORT CID4021_PETRadiopharmaceutical
Flumazenil_C11,
/// (C-B07DF,SRT,"Flumazenil F^18^")
Flumazenil_F18,
- /// (C1831937,UMLS,"Fluoroestradiol (FES) F^18^")
- FluoroestradiolFES_F18,
- /// (C1541539,UMLS,"Fluoroetanidazole F^18^")
- Fluoroetanidazole_F18,
/// (C-B07E0,SRT,"Fluorethyltyrosin F^18^")
Fluorethyltyrosin_F18,
+ /// (C-B07E4,SRT,"Fluorobenzothiazole F^18^")
+ Fluorobenzothiazole_F18,
/// (C-E0273,SRT,"Fluorocholine F^18^")
Fluorocholine_F18,
/// (C-B1031,SRT,"Fluorodeoxyglucose F^18^")
Fluorodeoxyglucose_F18,
- /// (C-B07E1,SRT,"Fluoromisonidazole F^18^")
- Fluoromisonidazole_F18,
+ /// (C1831937,UMLS,"Fluoroestradiol (FES) F^18^")
+ FluoroestradiolFES_F18,
+ /// (C1541539,UMLS,"Fluoroetanidazole F^18^")
+ Fluoroetanidazole_F18,
+ /// (C-B1034,SRT,"Fluoro-L-dopa F^18^")
+ FluoroLDopa_F18,
/// (C-B07E2,SRT,"Fluoromethane F^18^")
Fluoromethane_F18,
+ /// (C-B07E1,SRT,"Fluoromisonidazole F^18^")
+ Fluoromisonidazole_F18,
/// (C2934038,UMLS,"Fluoropropyl-dihydrotetrabenazine (DTBZ) F^18^")
FluoropropylDihydrotetrabenazineDTBZ_F18,
- /// (C-B07E3,SRT,"Fluorouracil F^18^")
- Fluorouracil_F18,
- /// (C-B07E4,SRT,"Fluorobenzothiazole F^18^")
- Fluorobenzothiazole_F18,
- /// (C-B1034,SRT,"Fluoro-L-dopa F^18^")
- FluoroLDopa_F18,
/// (126707,DCM,"Fluorotriopride F^18^")
Fluorotriopride_F18,
+ /// (C-B07E3,SRT,"Fluorouracil F^18^")
+ Fluorouracil_F18,
/// (C-E0267,SRT,"Flutemetamol F^18^")
Flutemetamol_F18,
+ /// (126748,DCM,"Fresolimumab ^89^Zr")
+ Fresolimumab_89Zr,
+ /// (126731,DCM,"GA201 ^89^Zr")
+ GA201_89Zr,
/// (C-B1046,SRT,"Germanium Ge^68^")
Germanium_Ge68,
+ /// (126724,DCM,"Glembatumumab vedotin ^89^Zr")
+ GlembatumumabVedotin_89Zr,
/// (C-B103D,SRT,"Glutamate N^13^")
Glutamate_N13,
/// (126709,DCM,"Glutamine C^11^")
@@ -146,34 +184,66 @@ class DCMTK_CMR_EXPORT CID4021_PETRadiopharmaceutical
ISO1_F18,
/// (126514,DCM,"J591 ^89^Zr")
J591_89Zr,
+ /// (126740,DCM,"Margetuximab ^89^Zr")
+ Margetuximab_89Zr,
+ /// (126730,DCM,"MEDI-551 ^89^Zr")
+ MEDI551_89Zr,
/// (C-B07E5,SRT,"Mespiperone C^11^")
Mespiperone_C11,
/// (C-B103E,SRT,"Methionine C^11^")
Methionine_C11,
- /// (C-B07E6,SRT,"Monoclonal antibody I^124^")
- MonoclonalAntibody_I124,
+ /// (126738,DCM,"Mogamulizumab ^89^Zr")
+ Mogamulizumab_89Zr,
/// (126510,DCM,"Monoclonal Antibody (mAb) ^64^Cu")
MonoclonalAntibodymAb_64Cu,
/// (126511,DCM,"Monoclonal Antibody (mAb) ^89^Zr")
MonoclonalAntibodymAb_89Zr,
+ /// (C-B07E6,SRT,"Monoclonal antibody I^124^")
+ MonoclonalAntibody_I124,
+ /// (126753,DCM,"Nanocolloidal albumin ^89^Zr")
+ NanocolloidalAlbumin_89Zr,
/// (126714,DCM,"Nifene F^18^")
Nifene_F18,
+ /// (126721,DCM,"Obinituzimab ^89^Zr")
+ Obinituzimab_89Zr,
+ /// (126723,DCM,"Ocaratuzumab ^89^Zr")
+ Ocaratuzumab_89Zr,
/// (C-B1038,SRT,"Oxygen O^15^")
Oxygen_O15,
/// (C-B1039,SRT,"Oxygen-water O^15^")
OxygenWater_O15,
/// (C-B1044,SRT,"Palmitate C^11^")
Palmitate_C11,
+ /// (126736,DCM,"Panitumumab ^89^Zr")
+ Panitumumab_89Zr,
+ /// (126728,DCM,"Pegdinetanib ^89^Zr")
+ Pegdinetanib_89Zr,
+ /// (126725,DCM,"Pinatuzumab vedotin ^89^Zr")
+ PinatuzumabVedotin_89Zr,
/// (126500,DCM,"Pittsburgh compound B C^11^")
PittsburghCompoundB_C11,
+ /// (126726,DCM,"Polatuzumab vedotin ^89^Zr")
+ PolatuzumabVedotin_89Zr,
/// (C-B07E7,SRT,"PTSM Cu^62^")
PTSM_Cu62,
/// (126518,DCM,"R1507 ^89^Zr")
R1507_89Zr,
/// (C-B1042,SRT,"Raclopride C^11^")
Raclopride_C11,
+ /// (126742,DCM,"Ranibizumab ^89^Zr")
+ Ranibizumab_89Zr,
+ /// (126737,DCM,"Rituximab ^89^Zr")
+ Rituximab_89Zr,
+ /// (126755,DCM,"RO5323441 ^89^Zr")
+ RO5323441_89Zr,
+ /// (126756,DCM,"RO542908 ^89^Zr")
+ RO542908_89Zr,
+ /// (126733,DCM,"Roledumab ^89^Zr")
+ Roledumab_89Zr,
/// (C-B1037,SRT,"Rubidium chloride Rb^82^")
RubidiumChloride_Rb82,
+ /// (126741,DCM,"SAR3419 ^89^Zr")
+ SAR3419_89Zr,
/// (C-B1032,SRT,"Sodium fluoride F^18^")
SodiumFluoride_F18,
/// (C-B07E8,SRT,"Sodium iodide I^124^")
@@ -188,8 +258,14 @@ class DCMTK_CMR_EXPORT CID4021_PETRadiopharmaceutical
ThymidineFLT_F18,
/// (126512,DCM,"Trastuzumab ^89^Zr")
Trastuzumab_89Zr,
+ /// (126749,DCM,"TRC105 ^89^Zr")
+ TRC105_89Zr,
/// (C1742831,UMLS,"tyrosine-3-octreotate Ga^68^")
- Tyrosine3Octreotate_Ga68
+ Tyrosine3Octreotate_Ga68,
+ /// (126739,DCM,"Ublituximab ^89^Zr")
+ Ublituximab_89Zr,
+ /// (126734,DCM,"XmAb5574 ^89^Zr")
+ XmAb5574_89Zr
};
/** (default) constructor
diff --git a/dcmsr/include/dcmtk/dcmsr/cmr/cid4031.h b/dcmsr/include/dcmtk/dcmsr/cmr/cid4031.h
index 3771100..55b26ac 100644
--- a/dcmsr/include/dcmtk/dcmsr/cmr/cid4031.h
+++ b/dcmsr/include/dcmtk/dcmsr/cmr/cid4031.h
@@ -5,8 +5,8 @@
*
* Header file for class CID4031_CommonAnatomicRegions
*
- * Generated automatically from DICOM PS 3.16-2015c
- * File created on 2016-01-16 12:26:38 by J. Riesmeier
+ * Generated automatically from DICOM PS 3.16-2016b
+ * File created on 2016-04-06 16:26:44 by J. Riesmeier
*
*/
@@ -19,6 +19,8 @@
#include "dcmtk/dcmsr/dsrctxgr.h"
#include "dcmtk/dcmsr/cmr/define.h"
+#include "dcmtk/ofstd/ofmap.h"
+
/*---------------------*
* class declaration *
@@ -26,7 +28,7 @@
/** Implementation of DCMR Context Group:
* CID 4031 - Common Anatomic Regions.
- * (type: extensible, version: 20130617)
+ * (type: extensible, version: 20160314)
*/
class DCMTK_CMR_EXPORT CID4031_CommonAnatomicRegions
: public DSRContextGroup
@@ -208,7 +210,7 @@ class DCMTK_CMR_EXPORT CID4031_CommonAnatomicRegions
Skull,
/// (T-58000,SRT,"Small intestine")
SmallIntestine,
- /// (T-D0146,SRT,"Spine")
+ /// (T-D04FF,SRT,"Spine")
Spine,
/// (T-15610,SRT,"Sternoclavicular joint")
SternoclavicularJoint,
@@ -238,7 +240,7 @@ class DCMTK_CMR_EXPORT CID4031_CommonAnatomicRegions
UpperArm,
/// (T-D8000,SRT,"Upper limb")
UpperLimb,
- /// (T-70010,SRT,"Upper urinary tract")
+ /// (T-7000B,SRT,"Upper urinary tract")
UpperUrinaryTract,
/// (T-73000,SRT,"Ureter")
Ureter,
diff --git a/dcmsr/include/dcmtk/dcmsr/cmr/cid42.h b/dcmsr/include/dcmtk/dcmsr/cmr/cid42.h
index f04d97c..da14b72 100644
--- a/dcmsr/include/dcmtk/dcmsr/cmr/cid42.h
+++ b/dcmsr/include/dcmtk/dcmsr/cmr/cid42.h
@@ -5,8 +5,8 @@
*
* Header file for class CID42_NumericValueQualifier
*
- * Generated automatically from DICOM PS 3.16-2015c
- * File created on 2016-01-16 12:26:30 by J. Riesmeier
+ * Generated automatically from DICOM PS 3.16-2016b
+ * File created on 2016-04-06 16:26:35 by J. Riesmeier
*
*/
@@ -19,6 +19,8 @@
#include "dcmtk/dcmsr/dsrctxgr.h"
#include "dcmtk/dcmsr/cmr/define.h"
+#include "dcmtk/ofstd/ofmap.h"
+
/*---------------------*
* class declaration *
diff --git a/dcmsr/include/dcmtk/dcmsr/cmr/cid5000.h b/dcmsr/include/dcmtk/dcmsr/cmr/cid5000.h
index 2d622fc..66ef949 100644
--- a/dcmsr/include/dcmtk/dcmsr/cmr/cid5000.h
+++ b/dcmsr/include/dcmtk/dcmsr/cmr/cid5000.h
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2015, J. Riesmeier, Oldenburg, Germany
+ * Copyright (C) 2015-2016, J. Riesmeier, Oldenburg, Germany
* All rights reserved. See COPYRIGHT file for details.
*
* Header file for class CID5000_Languages
@@ -18,6 +18,8 @@
#include "dcmtk/dcmsr/dsrctxgr.h"
#include "dcmtk/dcmsr/cmr/define.h"
+#include "dcmtk/ofstd/ofmap.h"
+
/*---------------------*
* class declaration *
diff --git a/dcmsr/include/dcmtk/dcmsr/cmr/cid5001.h b/dcmsr/include/dcmtk/dcmsr/cmr/cid5001.h
index b99ad13..c1f534c 100644
--- a/dcmsr/include/dcmtk/dcmsr/cmr/cid5001.h
+++ b/dcmsr/include/dcmtk/dcmsr/cmr/cid5001.h
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2015, J. Riesmeier, Oldenburg, Germany
+ * Copyright (C) 2015-2016, J. Riesmeier, Oldenburg, Germany
* All rights reserved. See COPYRIGHT file for details.
*
* Header file for class CID5001_Countries
@@ -18,6 +18,8 @@
#include "dcmtk/dcmsr/dsrctxgr.h"
#include "dcmtk/dcmsr/cmr/define.h"
+#include "dcmtk/ofstd/ofmap.h"
+
/*---------------------*
* class declaration *
diff --git a/dcmsr/include/dcmtk/dcmsr/cmr/cid6147.h b/dcmsr/include/dcmtk/dcmsr/cmr/cid6147.h
index 8408a3b..911538b 100644
--- a/dcmsr/include/dcmtk/dcmsr/cmr/cid6147.h
+++ b/dcmsr/include/dcmtk/dcmsr/cmr/cid6147.h
@@ -5,8 +5,8 @@
*
* Header file for class CID6147_ResponseCriteria
*
- * Generated automatically from DICOM PS 3.16-2015c
- * File created on 2016-01-16 12:26:40 by J. Riesmeier
+ * Generated automatically from DICOM PS 3.16-2016b
+ * File created on 2016-04-06 16:26:45 by J. Riesmeier
*
*/
@@ -19,6 +19,8 @@
#include "dcmtk/dcmsr/dsrctxgr.h"
#include "dcmtk/dcmsr/cmr/define.h"
+#include "dcmtk/ofstd/ofmap.h"
+
/*---------------------*
* class declaration *
diff --git a/dcmsr/include/dcmtk/dcmsr/cmr/cid7021.h b/dcmsr/include/dcmtk/dcmsr/cmr/cid7021.h
index 588b500..04867c6 100644
--- a/dcmsr/include/dcmtk/dcmsr/cmr/cid7021.h
+++ b/dcmsr/include/dcmtk/dcmsr/cmr/cid7021.h
@@ -5,8 +5,8 @@
*
* Header file for class CID7021_MeasurementReportDocumentTitles
*
- * Generated automatically from DICOM PS 3.16-2015c
- * File created on 2016-01-16 12:26:42 by J. Riesmeier
+ * Generated automatically from DICOM PS 3.16-2016b
+ * File created on 2016-04-06 16:26:47 by J. Riesmeier
*
*/
@@ -19,6 +19,8 @@
#include "dcmtk/dcmsr/dsrctxgr.h"
#include "dcmtk/dcmsr/cmr/define.h"
+#include "dcmtk/ofstd/ofmap.h"
+
/*---------------------*
* class declaration *
diff --git a/dcmsr/include/dcmtk/dcmsr/cmr/cid7181.h b/dcmsr/include/dcmtk/dcmsr/cmr/cid7181.h
index 1301522..95ffa0c 100644
--- a/dcmsr/include/dcmtk/dcmsr/cmr/cid7181.h
+++ b/dcmsr/include/dcmtk/dcmsr/cmr/cid7181.h
@@ -5,8 +5,8 @@
*
* Header file for class CID7181_AbstractMultiDimensionalImageModelComponentUnits
*
- * Generated automatically from DICOM PS 3.16-2015c
- * File created on 2016-01-16 12:26:44 by J. Riesmeier
+ * Generated automatically from DICOM PS 3.16-2016b
+ * File created on 2016-04-06 16:26:49 by J. Riesmeier
*
*/
@@ -19,6 +19,8 @@
#include "dcmtk/dcmsr/dsrctxgr.h"
#include "dcmtk/dcmsr/cmr/define.h"
+#include "dcmtk/ofstd/ofmap.h"
+
/*---------------------*
* class declaration *
@@ -74,13 +76,15 @@ class DCMTK_CMR_EXPORT CID7181_AbstractMultiDimensionalImageModelComponentUnits
CubicMillimeter,
/// (um3,UCUM,"cubic micrometer"), included from CID 7462
CubicMicrometer,
- /// ({SUVbw}g/ml,UCUM,"Standardized Uptake Value body weight"), included from CID 85
+ /// (g/ml{SUVbw},UCUM,"Standardized Uptake Value body weight"), included from CID 85
StandardizedUptakeValueBodyWeight,
- /// ({SUVlbm}g/ml,UCUM,"Standardized Uptake Value lean body mass"), included from CID 85
- StandardizedUptakeValueLeanBodyMass,
- /// ({SUVbsa}cm2/ml,UCUM,"Standardized Uptake Value body surface area"), included from CID 85
+ /// (g/ml{SUVlbm},UCUM,"Standardized Uptake Value lean body mass (James)"), included from CID 85
+ StandardizedUptakeValueLeanBodyMassJames,
+ /// (g/ml{SUVlbm(Janma)},UCUM,"Standardized Uptake Value lean body mass (Janma)"), included from CID 85
+ StandardizedUptakeValueLeanBodyMassJanma,
+ /// (cm2/ml{SUVbsa},UCUM,"Standardized Uptake Value body surface area"), included from CID 85
StandardizedUptakeValueBodySurfaceArea,
- /// ({SUVibw}g/ml,UCUM,"Standardized Uptake Value ideal body weight"), included from CID 85
+ /// (g/ml{SUVibw},UCUM,"Standardized Uptake Value ideal body weight"), included from CID 85
StandardizedUptakeValueIdealBodyWeight,
/// ({counts},UCUM,"Counts"), included from CID 84
Counts,
diff --git a/dcmsr/include/dcmtk/dcmsr/cmr/cid7445.h b/dcmsr/include/dcmtk/dcmsr/cmr/cid7445.h
index 9af4e7f..6b3e3a5 100644
--- a/dcmsr/include/dcmtk/dcmsr/cmr/cid7445.h
+++ b/dcmsr/include/dcmtk/dcmsr/cmr/cid7445.h
@@ -5,8 +5,8 @@
*
* Header file for class CID7445_DeviceParticipatingRoles
*
- * Generated automatically from DICOM PS 3.16-2015c
- * File created on 2016-01-16 12:26:46 by J. Riesmeier
+ * Generated automatically from DICOM PS 3.16-2016b
+ * File created on 2016-04-06 16:26:51 by J. Riesmeier
*
*/
@@ -19,6 +19,8 @@
#include "dcmtk/dcmsr/dsrctxgr.h"
#include "dcmtk/dcmsr/cmr/define.h"
+#include "dcmtk/ofstd/ofmap.h"
+
/*---------------------*
* class declaration *
diff --git a/dcmsr/include/dcmtk/dcmsr/cmr/cid7452.h b/dcmsr/include/dcmtk/dcmsr/cmr/cid7452.h
index 3e598dc..7e937d0 100644
--- a/dcmsr/include/dcmtk/dcmsr/cmr/cid7452.h
+++ b/dcmsr/include/dcmtk/dcmsr/cmr/cid7452.h
@@ -5,8 +5,8 @@
*
* Header file for class CID7452_OrganizationalRoles
*
- * Generated automatically from DICOM PS 3.16-2015c
- * File created on 2016-01-16 12:26:48 by J. Riesmeier
+ * Generated automatically from DICOM PS 3.16-2016b
+ * File created on 2016-04-06 16:26:53 by J. Riesmeier
*
*/
@@ -19,6 +19,8 @@
#include "dcmtk/dcmsr/dsrctxgr.h"
#include "dcmtk/dcmsr/cmr/define.h"
+#include "dcmtk/ofstd/ofmap.h"
+
/*---------------------*
* class declaration *
diff --git a/dcmsr/include/dcmtk/dcmsr/cmr/cid7453.h b/dcmsr/include/dcmtk/dcmsr/cmr/cid7453.h
index 153fd57..c259b37 100644
--- a/dcmsr/include/dcmtk/dcmsr/cmr/cid7453.h
+++ b/dcmsr/include/dcmtk/dcmsr/cmr/cid7453.h
@@ -5,8 +5,8 @@
*
* Header file for class CID7453_PerformingRoles
*
- * Generated automatically from DICOM PS 3.16-2015c
- * File created on 2016-01-16 12:26:49 by J. Riesmeier
+ * Generated automatically from DICOM PS 3.16-2016b
+ * File created on 2016-04-06 16:26:55 by J. Riesmeier
*
*/
@@ -19,6 +19,8 @@
#include "dcmtk/dcmsr/dsrctxgr.h"
#include "dcmtk/dcmsr/cmr/define.h"
+#include "dcmtk/ofstd/ofmap.h"
+
/*---------------------*
* class declaration *
diff --git a/dcmsr/include/dcmtk/dcmsr/cmr/cid7464.h b/dcmsr/include/dcmtk/dcmsr/cmr/cid7464.h
index eec5b62..df4c815 100644
--- a/dcmsr/include/dcmtk/dcmsr/cmr/cid7464.h
+++ b/dcmsr/include/dcmtk/dcmsr/cmr/cid7464.h
@@ -5,8 +5,8 @@
*
* Header file for class CID7464_GeneralRegionOfInterestMeasurementModifiers
*
- * Generated automatically from DICOM PS 3.16-2015c
- * File created on 2016-01-16 12:26:51 by J. Riesmeier
+ * Generated automatically from DICOM PS 3.16-2016b
+ * File created on 2016-04-06 16:26:57 by J. Riesmeier
*
*/
@@ -19,6 +19,8 @@
#include "dcmtk/dcmsr/dsrctxgr.h"
#include "dcmtk/dcmsr/cmr/define.h"
+#include "dcmtk/ofstd/ofmap.h"
+
/*---------------------*
* class declaration *
diff --git a/dcmsr/include/dcmtk/dcmsr/cmr/cid7469.h b/dcmsr/include/dcmtk/dcmsr/cmr/cid7469.h
index 20f7803..dd60c96 100644
--- a/dcmsr/include/dcmtk/dcmsr/cmr/cid7469.h
+++ b/dcmsr/include/dcmtk/dcmsr/cmr/cid7469.h
@@ -5,8 +5,8 @@
*
* Header file for class CID7469_GenericIntensityAndSizeMeasurements
*
- * Generated automatically from DICOM PS 3.16-2015c
- * File created on 2016-01-16 12:26:53 by J. Riesmeier
+ * Generated automatically from DICOM PS 3.16-2016b
+ * File created on 2016-04-06 16:26:59 by J. Riesmeier
*
*/
@@ -19,6 +19,8 @@
#include "dcmtk/dcmsr/dsrctxgr.h"
#include "dcmtk/dcmsr/cmr/define.h"
+#include "dcmtk/ofstd/ofmap.h"
+
/*---------------------*
* class declaration *
@@ -38,7 +40,7 @@ class DCMTK_CMR_EXPORT CID7469_GenericIntensityAndSizeMeasurements
*/
enum EnumType
{
- /// (F-6175A,SRT,"N-acetylaspartate"), included from CID 4033
+ /// (F-65C50,SRT,"N-acetylaspartate"), included from CID 4033
NAcetylaspartate,
/// (F-61080,SRT,"Citrate"), included from CID 4033
Citrate,
@@ -212,6 +214,8 @@ class DCMTK_CMR_EXPORT CID7469_GenericIntensityAndSizeMeasurements
R1,
/// (126394,DCM,"R2"), included from CID 7180
R2,
+ /// (113098,DCM,"Magnetization Transfer Ratio"), included from CID 7180
+ MagnetizationTransferRatio,
/// (126312,DCM,"Ktrans"), included from CID 4107
Ktrans,
/// (126313,DCM,"kep"), included from CID 4107
@@ -242,6 +246,16 @@ class DCMTK_CMR_EXPORT CID7469_GenericIntensityAndSizeMeasurements
IAUC60,
/// (126322,DCM,"IAUC90"), included from CID 4109
IAUC90,
+ /// (126323,DCM,"IAUC180"), included from CID 4109
+ IAUC180,
+ /// (126324,DCM,"IAUCBN"), included from CID 4109
+ IAUCBN,
+ /// (126325,DCM,"IAUC60BN"), included from CID 4109
+ IAUC60BN,
+ /// (126326,DCM,"IAUC90BN"), included from CID 4109
+ IAUC90BN,
+ /// (126327,DCM,"IAUC180BN"), included from CID 4109
+ IAUC180BN,
/// (126370,DCM,"Time of Peak Concentration"), included from CID 4109
TimeOfPeakConcentration,
/// (126372,DCM,"Time of Leading Half-Peak Concentration"), included from CID 4109
@@ -262,11 +276,13 @@ class DCMTK_CMR_EXPORT CID7469_GenericIntensityAndSizeMeasurements
SUVbw,
/// (126402,DCM,"SUVlbm"), included from CID 7180
SUVlbm,
+ /// (126405,DCM,"SUVlbm(Janma)"), included from CID 7180
+ SUVlbmJanma,
/// (126403,DCM,"SUVbsa"), included from CID 7180
SUVbsa,
/// (126404,DCM,"SUVibw"), included from CID 7180
SUVibw,
- /// (G-A22A,SRT,"Length"), included from CID 7470
+ /// (G-D7FE,SRT,"Length"), included from CID 7470
Length,
/// (121211,DCM,"Path length"), included from CID 7470
PathLength,
diff --git a/dcmsr/include/dcmtk/dcmsr/codes/dcm.h b/dcmsr/include/dcmtk/dcmsr/codes/dcm.h
index 7654c10..960c0df 100644
--- a/dcmsr/include/dcmtk/dcmsr/codes/dcm.h
+++ b/dcmsr/include/dcmtk/dcmsr/codes/dcm.h
@@ -5,9 +5,8 @@
*
* Header file with DICOM Code Definitions (Coding Scheme "DCM", Version "01")
*
- * Generated automatically from DICOM PS 3.16-2015c
- * File created on 2015-08-23 14:58:58 by J. Riesmeier
- * Last modified on 2016-01-25 by Riesmeier
+ * Generated automatically from DICOM PS 3.16-2016c
+ * File created on 2016-06-13 09:53:55 by J. Riesmeier
*
*/
@@ -34,7 +33,7 @@
* code definitions *
*--------------------*/
-// total number of codes: 3156
+// total number of codes: 3400
// - retired: 143
// - no name: 27
// - not unique: 14
@@ -158,7 +157,7 @@
#define CODE_DCM_RadioFrequencyAblation_power DSRBasicCodedEntry("109010", "DCM", "Radio frequency ablation, power")
#define CODE_DCM_VoltageMeasurementByBasketCatheter DSRBasicCodedEntry("109011", "DCM", "Voltage measurement by basket catheter")
#define CODE_DCM_VoltageMeasurementByMappingCatheter DSRBasicCodedEntry("109012", "DCM", "Voltage measurement by mapping catheter")
-#define CODE_DCM_VoltageMeasurement_NOS DSRBasicCodedEntry("109013", "DCM", "Voltage measurement, NOS")
+#define CODE_DCM_VoltageMeasurement DSRBasicCodedEntry("109013", "DCM", "Voltage measurement")
#define CODE_DCM_35PercentOfThermalCO DSRBasicCodedEntry("109014", "DCM", "35% of thermal CO")
#define CODE_DCM_70PercentOfThermalCO DSRBasicCodedEntry("109015", "DCM", "70% of thermal CO")
#define CODE_DCM_AWavePeakPressure DSRBasicCodedEntry("109016", "DCM", "A wave peak pressure")
@@ -442,6 +441,7 @@
#define CODE_DCM_Query DSRBasicCodedEntry("110112", "DCM", "Query")
#define CODE_DCM_SecurityAlert DSRBasicCodedEntry("110113", "DCM", "Security Alert")
#define CODE_DCM_UserAuthentication DSRBasicCodedEntry("110114", "DCM", "User Authentication")
+#define CODE_DCM_StationAETitle DSRBasicCodedEntry("110119", "DCM", "Station AE Title")
#define CODE_DCM_ApplicationStart DSRBasicCodedEntry("110120", "DCM", "Application Start")
#define CODE_DCM_ApplicationStop DSRBasicCodedEntry("110121", "DCM", "Application Stop")
#define CODE_DCM_Login DSRBasicCodedEntry("110122", "DCM", "Login")
@@ -502,6 +502,7 @@
#define CODE_DCM_ResourceInadequate DSRBasicCodedEntry("110527", "DCM", "Resource inadequate")
#define CODE_DCM_DiscontinuedProcedureStepRescheduled DSRBasicCodedEntry("110528", "DCM", "Discontinued Procedure Step rescheduled")
#define CODE_DCM_DiscontinuedProcedureStepReschedulingRecommended DSRBasicCodedEntry("110529", "DCM", "Discontinued Procedure Step rescheduling recommended")
+#define CODE_DCM_WorkitemAssignmentRejectedByAssignedResource DSRBasicCodedEntry("110530", "DCM", "Workitem assignment rejected by assigned resource")
#define CODE_DCM_VentralDiencephalon DSRBasicCodedEntry("110700", "DCM", "Ventral Diencephalon")
#define CODE_DCM_WhiteMatterT1Hypointensity DSRBasicCodedEntry("110701", "DCM", "White Matter T1 Hypointensity")
#define CODE_DCM_WhiteMatterT2Hyperintensity DSRBasicCodedEntry("110702", "DCM", "White Matter T2 Hyperintensity")
@@ -1664,6 +1665,7 @@
#define CODE_DCM_ForPrinting DSRBasicCodedEntry("113018", "DCM", "For Printing")
#define CODE_DCM_ForReportAttachment DSRBasicCodedEntry("113020", "DCM", "For Report Attachment")
#define CODE_DCM_ForLitigation DSRBasicCodedEntry("113021", "DCM", "For Litigation")
+#define CODE_DCM_CollectionOfPresentationStates DSRBasicCodedEntry("113022", "DCM", "Collection of Presentation States")
#define CODE_DCM_DoubleExposure DSRBasicCodedEntry("113026", "DCM", "Double exposure")
#define CODE_DCM_Manifest DSRBasicCodedEntry("113030", "DCM", "Manifest")
#define CODE_DCM_SignedManifest DSRBasicCodedEntry("113031", "DCM", "Signed Manifest")
@@ -1732,6 +1734,7 @@
#define CODE_DCM_LipidAndLactate DSRBasicCodedEntry("113095", "DCM", "Lipid and Lactate")
#define CODE_DCM_CreatinePlusCholineCitrateRatio DSRBasicCodedEntry("113096", "DCM", "Creatine+Choline/ Citrate Ratio")
#define CODE_DCM_MultiEnergyProportionalWeighting DSRBasicCodedEntry("113097", "DCM", "Multi-energy proportional weighting")
+#define CODE_DCM_MagnetizationTransferRatio DSRBasicCodedEntry("113098", "DCM", "Magnetization Transfer Ratio")
#define CODE_DCM_BasicApplicationConfidentialityProfile DSRBasicCodedEntry("113100", "DCM", "Basic Application Confidentiality Profile")
#define CODE_DCM_CleanPixelDataOption DSRBasicCodedEntry("113101", "DCM", "Clean Pixel Data Option")
#define CODE_DCM_CleanRecognizableVisualFeaturesOption DSRBasicCodedEntry("113102", "DCM", "Clean Recognizable Visual Features Option")
@@ -1744,6 +1747,42 @@
#define CODE_DCM_RetainDeviceIdentityOption DSRBasicCodedEntry("113109", "DCM", "Retain Device Identity Option")
#define CODE_DCM_RetainUIDsOption DSRBasicCodedEntry("113110", "DCM", "Retain UIDs Option")
#define CODE_DCM_RetainSafePrivateOption DSRBasicCodedEntry("113111", "DCM", "Retain Safe Private Option")
+#define CODE_DCM_PredecessorContainingGroupOfImagingSubjects DSRBasicCodedEntry("113130", "DCM", "Predecessor containing group of imaging subjects")
+#define CODE_DCM_ExtractionOfIndividualSubjectFromGroup DSRBasicCodedEntry("113131", "DCM", "Extraction of individual subject from group")
+#define CODE_DCM_SingleSubjectSelectedFromGroup DSRBasicCodedEntry("113132", "DCM", "Single subject selected from group")
+#define CODE_DCM_Trace DSRBasicCodedEntry("113201", "DCM", "Trace")
+#define CODE_DCM_MeanDiffusivity DSRBasicCodedEntry("113202", "DCM", "Mean Diffusivity")
+#define CODE_DCM_RadialDiffusivity DSRBasicCodedEntry("113203", "DCM", "Radial Diffusivity")
+#define CODE_DCM_AxialDiffusivity DSRBasicCodedEntry("113204", "DCM", "Axial Diffusivity")
+#define CODE_DCM_MeanKurtosis DSRBasicCodedEntry("113205", "DCM", "Mean Kurtosis")
+#define CODE_DCM_ApparentKurtosisCoefficient DSRBasicCodedEntry("113206", "DCM", "Apparent Kurtosis Coefficient")
+#define CODE_DCM_RadialKurtosis DSRBasicCodedEntry("113207", "DCM", "Radial Kurtosis")
+#define CODE_DCM_AxialKurtosis DSRBasicCodedEntry("113208", "DCM", "Axial Kurtosis")
+#define CODE_DCM_FractionalKurtosisAnisotropy DSRBasicCodedEntry("113209", "DCM", "Fractional Kurtosis Anisotropy")
+#define CODE_DCM_DeterministicTrackingAlgorithm DSRBasicCodedEntry("113211", "DCM", "Deterministic Tracking Algorithm")
+#define CODE_DCM_ProbabilisticTrackingAlgorithm DSRBasicCodedEntry("113212", "DCM", "Probabilistic Tracking Algorithm")
+#define CODE_DCM_GlobalTrackingAlgorithm DSRBasicCodedEntry("113213", "DCM", "Global Tracking Algorithm")
+#define CODE_DCM_FACT DSRBasicCodedEntry("113214", "DCM", "FACT")
+#define CODE_DCM_Streamline DSRBasicCodedEntry("113215", "DCM", "Streamline")
+#define CODE_DCM_TEND DSRBasicCodedEntry("113216", "DCM", "TEND")
+#define CODE_DCM_BootstrapTrackingAlgorithm DSRBasicCodedEntry("113217", "DCM", "Bootstrap Tracking Algorithm")
+#define CODE_DCM_Euler DSRBasicCodedEntry("113218", "DCM", "Euler")
+#define CODE_DCM_RungeKutta DSRBasicCodedEntry("113219", "DCM", "Runge-Kutta")
+#define CODE_DCM_HARDI DSRBasicCodedEntry("113221", "DCM", "HARDI")
+#define CODE_DCM_DKI DSRBasicCodedEntry("113222", "DCM", "DKI")
+#define CODE_DCM_DTI DSRBasicCodedEntry("113223", "DCM", "DTI")
+#define CODE_DCM_DSI DSRBasicCodedEntry("113224", "DCM", "DSI")
+#define CODE_DCM_LSDI DSRBasicCodedEntry("113225", "DCM", "LSDI")
+#define CODE_DCM_SingleShotEPI DSRBasicCodedEntry("113226", "DCM", "Single Shot EPI")
+#define CODE_DCM_MultiShotEPI DSRBasicCodedEntry("113227", "DCM", "Multi Shot EPI")
+#define CODE_DCM_ParallelImaging DSRBasicCodedEntry("113228", "DCM", "Parallel Imaging")
+#define CODE_DCM_SingleTensor DSRBasicCodedEntry("113231", "DCM", "Single Tensor")
+#define CODE_DCM_MultiTensor DSRBasicCodedEntry("113232", "DCM", "Multi Tensor")
+#define CODE_DCM_ModelFree DSRBasicCodedEntry("113233", "DCM", "Model Free")
+#define CODE_DCM_CHARMED DSRBasicCodedEntry("113234", "DCM", "CHARMED")
+#define CODE_DCM_DOT DSRBasicCodedEntry("113236", "DCM", "DOT")
+#define CODE_DCM_PAS DSRBasicCodedEntry("113237", "DCM", "PAS")
+#define CODE_DCM_SphericalDeconvolution DSRBasicCodedEntry("113238", "DCM", "Spherical Deconvolution")
#define CODE_DCM_RadiopharmaceuticalRadiationDoseReport DSRBasicCodedEntry("113500", "DCM", "Radiopharmaceutical Radiation Dose Report")
#define CODE_DCM_RadiopharmaceuticalAdministration DSRBasicCodedEntry("113502", "DCM", "Radiopharmaceutical Administration")
#define CODE_DCM_RadiopharmaceuticalAdministrationEventUID DSRBasicCodedEntry("113503", "DCM", "Radiopharmaceutical Administration Event UID")
@@ -1841,7 +1880,7 @@
#define CODE_DCM_CalibrationProtocol DSRBasicCodedEntry("113720", "DCM", "Calibration Protocol")
#define CODE_DCM_IrradiationEventType DSRBasicCodedEntry("113721", "DCM", "Irradiation Event Type")
#define CODE_DCM_DoseAreaProductTotal DSRBasicCodedEntry("113722", "DCM", "Dose Area Product Total")
-#define CODE_DCM_CalibrationDate DSRBasicCodedEntry("113723", "DCM", "Calibration Date")
+#define CODE_DCM_CalibrationDateTime DSRBasicCodedEntry("113723", "DCM", "Calibration DateTime")
#define CODE_DCM_CalibrationResponsibleParty DSRBasicCodedEntry("113724", "DCM", "Calibration Responsible Party")
#define CODE_DCM_Dose_RP_Total DSRBasicCodedEntry("113725", "DCM", "Dose (RP) Total")
#define CODE_DCM_FluoroDoseAreaProductTotal DSRBasicCodedEntry("113726", "DCM", "Fluoro Dose Area Product Total")
@@ -2028,6 +2067,14 @@
#define CODE_DCM_FilteredBackProjection DSRBasicCodedEntry("113962", "DCM", "Filtered Back Projection")
#define CODE_DCM_IterativeReconstruction DSRBasicCodedEntry("113963", "DCM", "Iterative Reconstruction")
#define CODE_DCM_ProcedureStepToThisPoint DSRBasicCodedEntry("113970", "DCM", "Procedure Step To This Point")
+#define CODE_DCM_WaterEquivalentDiameter DSRBasicCodedEntry("113980", "DCM", "Water Equivalent Diameter")
+#define CODE_DCM_WaterEquivalentDiameterRepresentativeValue DSRBasicCodedEntry("113981", "DCM", "Water Equivalent Diameter Representative Value")
+#define CODE_DCM_WaterEquivalentDiameterIntegratedAcrossScanRange DSRBasicCodedEntry("113982", "DCM", "Water Equivalent Diameter Integrated Across Scan Range")
+#define CODE_DCM_WaterEquivalentDiameterFromRawData DSRBasicCodedEntry("113983", "DCM", "Water Equivalent Diameter From Raw Data")
+#define CODE_DCM_WaterEquivalentDiameterFromLocalizer DSRBasicCodedEntry("113984", "DCM", "Water Equivalent Diameter From Localizer")
+#define CODE_DCM_SeriesOrInstanceUsedForWaterEquivalentDiameterEstimation DSRBasicCodedEntry("113985", "DCM", "Series or Instance used for Water Equivalent Diameter estimation")
+#define CODE_DCM_ZValueOfLocationOfWaterEquivalentDiameterEstimation DSRBasicCodedEntry("113986", "DCM", "Z value of location of Water Equivalent Diameter estimation")
+#define CODE_DCM_AAPM220 DSRBasicCodedEntry("113987", "DCM", "AAPM 220")
#define CODE_DCM_NotANumber DSRBasicCodedEntry("114000", "DCM", "Not a number")
#define CODE_DCM_NegativeInfinity DSRBasicCodedEntry("114001", "DCM", "Negative Infinity")
#define CODE_DCM_PositiveInfinity DSRBasicCodedEntry("114002", "DCM", "Positive Infinity")
@@ -2261,6 +2308,7 @@
#define CODE_DCM_SimultaneousRespiratoryWaveform DSRBasicCodedEntry("121305", "DCM", "Simultaneous Respiratory Waveform")
#define CODE_DCM_SimultaneousArterialPulseWaveform DSRBasicCodedEntry("121306", "DCM", "Simultaneous Arterial Pulse Waveform")
#define CODE_DCM_SimultaneousPhonocardiographicWaveform DSRBasicCodedEntry("121307", "DCM", "Simultaneous Phonocardiographic Waveform")
+#define CODE_DCM_RTTreatmentPlanForThePositionBeingVerified DSRBasicCodedEntry("121310", "DCM", "RT treatment plan for the position being verified")
#define CODE_DCM_Localizer DSRBasicCodedEntry("121311", "DCM", "Localizer")
#define CODE_DCM_BiopsyLocalizer DSRBasicCodedEntry("121312", "DCM", "Biopsy localizer")
#define CODE_DCM_OtherPartialViews DSRBasicCodedEntry("121313", "DCM", "Other partial views")
@@ -2307,6 +2355,10 @@
#define CODE_DCM_ComposedFromPriorDoses DSRBasicCodedEntry("121370", "DCM", "Composed from prior doses")
#define CODE_DCM_ComposedFromPriorDosesAndCurrentPlan DSRBasicCodedEntry("121371", "DCM", "Composed from prior doses and current plan")
#define CODE_DCM_SourceDoseForComposingCurrentDose DSRBasicCodedEntry("121372", "DCM", "Source dose for composing current dose")
+#define CODE_DCM_RTPreTreatmentDoseCheck DSRBasicCodedEntry("121373", "DCM", "RT Pre-Treatment Dose Check")
+#define CODE_DCM_RTPreTreatmentConsistencyCheck DSRBasicCodedEntry("121374", "DCM", "RT Pre-Treatment Consistency Check")
+#define CODE_DCM_AssessmentByComparison DSRBasicCodedEntry("121375", "DCM", "Assessment By Comparison")
+#define CODE_DCM_AssessmentByRules DSRBasicCodedEntry("121376", "DCM", "Assessment By Rules")
#define CODE_DCM_ActiveIngredientUndilutedConcentration DSRBasicCodedEntry("121380", "DCM", "Active Ingredient Undiluted Concentration")
#define CODE_DCM_ContrastBolusIngredientOpaque DSRBasicCodedEntry("121381", "DCM", "Contrast/Bolus Ingredient Opaque")
#define CODE_DCM_QuantityAdministered DSRBasicCodedEntry("121382", "DCM", "Quantity administered")
@@ -2378,6 +2430,7 @@
#define CODE_DCM_RTTreatmentQAByRTPlanDifferenceCheck DSRBasicCodedEntry("121732", "DCM", "RT Treatment QA by RT Plan Difference Check")
#define CODE_DCM_RTTreatmentQAByRTIonPlanDoseCheck DSRBasicCodedEntry("121733", "DCM", "RT Treatment QA by RT Ion Plan Dose Check")
#define CODE_DCM_RTTreatmentQAWithRTIonPlanDifferenceCheck DSRBasicCodedEntry("121734", "DCM", "RT Treatment QA with RT Ion Plan Difference Check")
+#define CODE_DCM_RTBrachyTreatment DSRBasicCodedEntry("121735", "DCM", "RT Brachy Treatment")
#define CODE_DCM_TreatmentDeliveryType DSRBasicCodedEntry("121740", "DCM", "Treatment Delivery Type")
#define CODE_DCM_PatientCalledToProcedureRoom DSRBasicCodedEntry("122001", "DCM", "Patient called to procedure room")
#define CODE_DCM_PatientAdmittedToProcedureRoom DSRBasicCodedEntry("122002", "DCM", "Patient admitted to procedure room")
@@ -2511,7 +2564,7 @@
#define CODE_DCM_SystemicFlow DSRBasicCodedEntry("122162", "DCM", "Systemic Flow")
#define CODE_DCM_DischargeDateTime DSRBasicCodedEntry("122163", "DCM", "Discharge DateTime")
#define CODE_DCM_CoronaryArteryBypassDuringThisAdmission DSRBasicCodedEntry("122164", "DCM", "Coronary Artery Bypass During This Admission")
-#define CODE_DCM_DateOfDeath DSRBasicCodedEntry("122165", "DCM", "Date of Death")
+#define CODE_DCM_DateTimeOfDeath DSRBasicCodedEntry("122165", "DCM", "DateTime of Death")
#define CODE_DCM_DeathDuringThisAdmission DSRBasicCodedEntry("122166", "DCM", "Death During This Admission")
#define CODE_DCM_DeathDuringCatheterization DSRBasicCodedEntry("122167", "DCM", "Death During Catheterization")
#define CODE_DCM_TypeOfMyocardialInfarction DSRBasicCodedEntry("122170", "DCM", "Type of Myocardial Infarction")
@@ -2867,7 +2920,7 @@
#define CODE_DCM_ActivityWorkload DSRBasicCodedEntry("122709", "DCM", "Activity workload")
#define CODE_DCM_TimeSinceStartOfStage DSRBasicCodedEntry("122710", "DCM", "Time since start of stage")
#define CODE_DCM_ExerciseDurationAfterStressAgentInjection DSRBasicCodedEntry("122711", "DCM", "Exercise duration after stress agent injection")
-#define CODE_DCM_ImagingStartTime DSRBasicCodedEntry("122712", "DCM", "Imaging Start Time")
+#define CODE_DCM_ImagingStartDateTime DSRBasicCodedEntry("122712", "DCM", "Imaging Start DateTime")
#define CODE_DCM_AttenuationCorrectionMethod DSRBasicCodedEntry("122713", "DCM", "Attenuation correction method")
#define CODE_DCM_PharmacologicalStressAgentDose DSRBasicCodedEntry("122715", "DCM", "Pharmacological Stress Agent Dose")
#define CODE_DCM_MaximumPowerOutputAchieved DSRBasicCodedEntry("122716", "DCM", "Maximum Power Output Achieved")
@@ -2926,8 +2979,8 @@
#define CODE_DCM_PETMyocardialViability_RestAndStress DSRBasicCodedEntry("122797", "DCM", "PET Myocardial Viability, Rest and Stress")
#define CODE_DCM_AnginalEquivalent DSRBasicCodedEntry("122799", "DCM", "Anginal Equivalent")
#define CODE_DCM_RETIRED_Radiopharmaceutical DSRBasicCodedEntry("123001", "DCM", "Radiopharmaceutical")
-#define CODE_DCM_RadiopharmaceuticalStartTime DSRBasicCodedEntry("123003", "DCM", "Radiopharmaceutical Start Time")
-#define CODE_DCM_RadiopharmaceuticalStopTime DSRBasicCodedEntry("123004", "DCM", "Radiopharmaceutical Stop Time")
+#define CODE_DCM_RadiopharmaceuticalStartDateTime DSRBasicCodedEntry("123003", "DCM", "Radiopharmaceutical Start DateTime")
+#define CODE_DCM_RadiopharmaceuticalStopDateTime DSRBasicCodedEntry("123004", "DCM", "Radiopharmaceutical Stop DateTime")
#define CODE_DCM_RadiopharmaceuticalVolume DSRBasicCodedEntry("123005", "DCM", "Radiopharmaceutical Volume")
#define CODE_DCM_RadionuclideTotalDose DSRBasicCodedEntry("123006", "DCM", "Radionuclide Total Dose")
#define CODE_DCM_RadiopharmaceuticalSpecificActivity DSRBasicCodedEntry("123007", "DCM", "Radiopharmaceutical Specific Activity")
@@ -3115,13 +3168,21 @@
#define CODE_DCM_IAUC DSRBasicCodedEntry("126320", "DCM", "IAUC")
#define CODE_DCM_IAUC60 DSRBasicCodedEntry("126321", "DCM", "IAUC60")
#define CODE_DCM_IAUC90 DSRBasicCodedEntry("126322", "DCM", "IAUC90")
+#define CODE_DCM_IAUC180 DSRBasicCodedEntry("126323", "DCM", "IAUC180")
+#define CODE_DCM_IAUCBN DSRBasicCodedEntry("126324", "DCM", "IAUCBN")
+#define CODE_DCM_IAUCBN60 DSRBasicCodedEntry("126325", "DCM", "IAUCBN60")
+#define CODE_DCM_IAUCBN90 DSRBasicCodedEntry("126326", "DCM", "IAUCBN90")
+#define CODE_DCM_AUCBN180 DSRBasicCodedEntry("126327", "DCM", "AUCBN180")
#define CODE_DCM_Tau_m DSRBasicCodedEntry("126330", "DCM", "tau_m")
#define CODE_DCM_Vp DSRBasicCodedEntry("126331", "DCM", "vp")
#define CODE_DCM_StandardToftsModel DSRBasicCodedEntry("126340", "DCM", "Standard Tofts Model")
#define CODE_DCM_ExtendedToftsModel DSRBasicCodedEntry("126341", "DCM", "Extended Tofts Model")
#define CODE_DCM_ModelFreeConcentrationTimeQuantitification DSRBasicCodedEntry("126342", "DCM", "Model-free concentration-time quantitification")
-#define CODE_DCM_FirstPassLeakageProfile_FPLP DSRBasicCodedEntry("126343", "DCM", "First Pass Leakage Profile (FPLP)")
+#define CODE_DCM_FirstPassLeakageProfile_FPLP_Model DSRBasicCodedEntry("126343", "DCM", "First Pass Leakage Profile (FPLP) Model")
#define CODE_DCM_ShutterSpeedModel_SSM DSRBasicCodedEntry("126344", "DCM", "Shutter-Speed Model (SSM)")
+#define CODE_DCM_GammaCapillaryTransitTime_GCCT_Model DSRBasicCodedEntry("126345", "DCM", "Gamma Capillary Transit Time (GCCT) Model")
+#define CODE_DCM_AdiabaticTissueHomogeneity_ATH_Model DSRBasicCodedEntry("126346", "DCM", "Adiabatic Tissue Homogeneity (ATH) Model")
+#define CODE_DCM_TwoCompartmentExchange_2CX_Model DSRBasicCodedEntry("126347", "DCM", "Two Compartment Exchange (2CX) Model")
#define CODE_DCM_T1ByMultipleFlipAngles DSRBasicCodedEntry("126350", "DCM", "T1 by Multiple Flip Angles")
#define CODE_DCM_T1ByInversionRecovery DSRBasicCodedEntry("126351", "DCM", "T1 by Inversion Recovery")
#define CODE_DCM_T1ByFixedValue DSRBasicCodedEntry("126352", "DCM", "T1 by Fixed Value")
@@ -3150,10 +3211,12 @@
#define CODE_DCM_SUVlbm DSRBasicCodedEntry("126402", "DCM", "SUVlbm")
#define CODE_DCM_SUVbsa DSRBasicCodedEntry("126403", "DCM", "SUVbsa")
#define CODE_DCM_SUVibw DSRBasicCodedEntry("126404", "DCM", "SUVibw")
+#define CODE_DCM_SUVlbmJanma DSRBasicCodedEntry("126405", "DCM", "SUVlbm(Janma)")
#define CODE_DCM_SUVBodyWeightCalculationMethod DSRBasicCodedEntry("126410", "DCM", "SUV body weight calculation method")
#define CODE_DCM_SUVLeanBodyMassCalculationMethod DSRBasicCodedEntry("126411", "DCM", "SUV lean body mass calculation method")
#define CODE_DCM_SUVBodySurfaceAreaCalculationMethod DSRBasicCodedEntry("126412", "DCM", "SUV body surface area calculation method")
#define CODE_DCM_SUVIdealBodyWeightCalculationMethod DSRBasicCodedEntry("126413", "DCM", "SUV ideal body weight calculation method")
+#define CODE_DCM_SUVLeanBodyMassCalculationJanmahasatianMethod DSRBasicCodedEntry("126414", "DCM", "SUV lean body mass calculation Janmahasatian method")
#define CODE_DCM_PittsburghCompoundB_C11 DSRBasicCodedEntry("126500", "DCM", "Pittsburgh compound B C^11^")
#define CODE_DCM_Florbetaben_F18 DSRBasicCodedEntry("126501", "DCM", "Florbetaben F^18^")
#define CODE_DCM_T807_F18 DSRBasicCodedEntry("126502", "DCM", "T807 F^18^")
@@ -3176,6 +3239,7 @@
#define CODE_DCM_191mIridium DSRBasicCodedEntry("126604", "DCM", "^191m^Iridium")
#define CODE_DCM_43Scandium DSRBasicCodedEntry("126605", "DCM", "^43^Scandium")
#define CODE_DCM_152Terbium DSRBasicCodedEntry("126606", "DCM", "^152^Terbium")
+#define CODE_DCM_52mManganese DSRBasicCodedEntry("126607", "DCM", "^52m^Manganese")
#define CODE_DCM_ATSM_Cu60 DSRBasicCodedEntry("126700", "DCM", "ATSM Cu^60^")
#define CODE_DCM_ATSM_Cu61 DSRBasicCodedEntry("126701", "DCM", "ATSM Cu^61^")
#define CODE_DCM_ATSM_Cu62 DSRBasicCodedEntry("126702", "DCM", "ATSM Cu^62^")
@@ -3193,6 +3257,43 @@
#define CODE_DCM_Nifene_F18 DSRBasicCodedEntry("126714", "DCM", "Nifene F^18^")
#define CODE_DCM_CLR1404_I124 DSRBasicCodedEntry("126715", "DCM", "CLR1404 I^124^")
#define CODE_DCM_CLR1404_I131 DSRBasicCodedEntry("126716", "DCM", "CLR1404 I^131^")
+#define CODE_DCM_Obinituzimab_89Zr DSRBasicCodedEntry("126721", "DCM", "Obinituzimab ^89^Zr")
+#define CODE_DCM_Benralizumab_89Zr DSRBasicCodedEntry("126722", "DCM", "Benralizumab ^89^Zr")
+#define CODE_DCM_Ocaratuzumab_89Zr DSRBasicCodedEntry("126723", "DCM", "Ocaratuzumab ^89^Zr")
+#define CODE_DCM_GlembatumumabVedotin_89Zr DSRBasicCodedEntry("126724", "DCM", "Glembatumumab vedotin ^89^Zr")
+#define CODE_DCM_PinatuzumabVedotin_89Zr DSRBasicCodedEntry("126725", "DCM", "Pinatuzumab vedotin ^89^Zr")
+#define CODE_DCM_PolatuzumabVedotin_89Zr DSRBasicCodedEntry("126726", "DCM", "Polatuzumab vedotin ^89^Zr")
+#define CODE_DCM_Blinatumomab_89Zr DSRBasicCodedEntry("126727", "DCM", "Blinatumomab ^89^Zr")
+#define CODE_DCM_Pegdinetanib_89Zr DSRBasicCodedEntry("126728", "DCM", "Pegdinetanib ^89^Zr")
+#define CODE_DCM_AGN150998_89Zr DSRBasicCodedEntry("126729", "DCM", "AGN-150998 ^89^Zr")
+#define CODE_DCM_MEDI551_89Zr DSRBasicCodedEntry("126730", "DCM", "MEDI-551 ^89^Zr")
+#define CODE_DCM_GA201_89Zr DSRBasicCodedEntry("126731", "DCM", "GA201 ^89^Zr")
+#define CODE_DCM_Ecromeximab_89Zr DSRBasicCodedEntry("126732", "DCM", "Ecromeximab ^89^Zr")
+#define CODE_DCM_Roledumab_89Zr DSRBasicCodedEntry("126733", "DCM", "Roledumab ^89^Zr")
+#define CODE_DCM_XmAb5574_89Zr DSRBasicCodedEntry("126734", "DCM", "XmAb5574 ^89^Zr")
+#define CODE_DCM_Brentuximab_89Zr DSRBasicCodedEntry("126735", "DCM", "Brentuximab ^89^Zr")
+#define CODE_DCM_Panitumumab_89Zr DSRBasicCodedEntry("126736", "DCM", "Panitumumab ^89^Zr")
+#define CODE_DCM_Rituximab_89Zr DSRBasicCodedEntry("126737", "DCM", "Rituximab ^89^Zr")
+#define CODE_DCM_Mogamulizumab_89Zr DSRBasicCodedEntry("126738", "DCM", "Mogamulizumab ^89^Zr")
+#define CODE_DCM_Ublituximab_89Zr DSRBasicCodedEntry("126739", "DCM", "Ublituximab ^89^Zr")
+#define CODE_DCM_Margetuximab_89Zr DSRBasicCodedEntry("126740", "DCM", "Margetuximab ^89^Zr")
+#define CODE_DCM_SAR3419_89Zr DSRBasicCodedEntry("126741", "DCM", "SAR3419 ^89^Zr")
+#define CODE_DCM_Ranibizumab_89Zr DSRBasicCodedEntry("126742", "DCM", "Ranibizumab ^89^Zr")
+#define CODE_DCM_CMAbU36_89Zr DSRBasicCodedEntry("126746", "DCM", "cMAb U36 ^89^Zr")
+#define CODE_DCM_DN30_89Zr DSRBasicCodedEntry("126747", "DCM", "DN30 ^89^Zr")
+#define CODE_DCM_Fresolimumab_89Zr DSRBasicCodedEntry("126748", "DCM", "Fresolimumab ^89^Zr")
+#define CODE_DCM_TRC105_89Zr DSRBasicCodedEntry("126749", "DCM", "TRC105 ^89^Zr")
+#define CODE_DCM_7E11_89Zr DSRBasicCodedEntry("126750", "DCM", "7E11 ^89^Zr")
+#define CODE_DCM_7D12_89Zr DSRBasicCodedEntry("126751", "DCM", "7D12 ^89^Zr")
+#define CODE_DCM_28H1_89Zr DSRBasicCodedEntry("126752", "DCM", "28H1 ^89^Zr")
+#define CODE_DCM_NanocolloidalAlbumin_89Zr DSRBasicCodedEntry("126753", "DCM", "Nanocolloidal albumin ^89^Zr")
+#define CODE_DCM_AntiB220_89Zr DSRBasicCodedEntry("126754", "DCM", "Anti-B220 ^89^Zr")
+#define CODE_DCM_RO5323441_89Zr DSRBasicCodedEntry("126755", "DCM", "RO5323441 ^89^Zr")
+#define CODE_DCM_RO542908_89Zr DSRBasicCodedEntry("126756", "DCM", "RO542908 ^89^Zr")
+#define CODE_DCM_DfFK_89Zr DSRBasicCodedEntry("126760", "DCM", "Df-FK ^89^Zr")
+#define CODE_DCM_DfFKPEG3_89Zr DSRBasicCodedEntry("126761", "DCM", "Df-FK-PEG(3) ^89^Zr")
+#define CODE_DCM_DfFK2_89Zr DSRBasicCodedEntry("126762", "DCM", "Df-[FK](2) ^89^Zr")
+#define CODE_DCM_DfFK23PEG4_89Zr DSRBasicCodedEntry("126763", "DCM", "Df-[FK](2)-3PEG(4) ^89^Zr")
#define CODE_DCM_IEC61217PatientSupportContinuousAngle DSRBasicCodedEntry("126801", "DCM", "IEC61217 Patient Support Continuous Angle")
#define CODE_DCM_IEC61217TableTopContinuousPitchAngle DSRBasicCodedEntry("126802", "DCM", "IEC61217 Table Top Continuous Pitch Angle")
#define CODE_DCM_IEC61217TableTopContinuousRollAngle DSRBasicCodedEntry("126803", "DCM", "IEC61217 Table Top Continuous Roll Angle")
@@ -3204,10 +3305,147 @@
#define CODE_DCM_IEC61217GantryContinuousRollAngle DSRBasicCodedEntry("126809", "DCM", "IEC61217 Gantry Continuous Roll Angle")
#define CODE_DCM_IEC61217GantryContinuousPitchAngle DSRBasicCodedEntry("126810", "DCM", "IEC61217 Gantry Continuous Pitch Angle")
#define CODE_DCM_IEC61217GantryContinuousYawAngle DSRBasicCodedEntry("126811", "DCM", "IEC61217 Gantry Continuous Yaw Angle")
-
-// recently approved correction items
-
-#define CODE_DCM_StationAETitle DSRBasicCodedEntry("110119", "DCM", "Station AE Title") // added from CP-1516
-
+#define CODE_DCM_LeftFirst DSRBasicCodedEntry("126830", "DCM", "left first")
+#define CODE_DCM_RightFirst DSRBasicCodedEntry("126831", "DCM", "right first")
+#define CODE_DCM_PosteriorFirst DSRBasicCodedEntry("126832", "DCM", "posterior first")
+#define CODE_DCM_AnteriorFirst DSRBasicCodedEntry("126833", "DCM", "anterior first")
+#define CODE_DCM_ILCR DSRBasicCodedEntry("126850", "DCM", "ILCR")
+#define CODE_DCM_PreclinicalSmallAnimalImagingAcquisitionContext DSRBasicCodedEntry("127001", "DCM", "Preclinical Small Animal Imaging Acquisition Context")
+#define CODE_DCM_AnimalHandlingDuringSpecifiedPhase DSRBasicCodedEntry("127005", "DCM", "Animal handling during specified phase")
+#define CODE_DCM_PhaseOfAnimalHandling DSRBasicCodedEntry("127006", "DCM", "Phase of animal handling")
+#define CODE_DCM_BiosafetyConditions DSRBasicCodedEntry("127010", "DCM", "Biosafety conditions")
+#define CODE_DCM_ReasonForBiosafetyControls DSRBasicCodedEntry("127011", "DCM", "Reason for biosafety controls")
+#define CODE_DCM_HeatingConditions DSRBasicCodedEntry("127040", "DCM", "Heating conditions")
+#define CODE_DCM_CircadianEffects DSRBasicCodedEntry("127050", "DCM", "Circadian effects")
+#define CODE_DCM_NoseCone DSRBasicCodedEntry("127060", "DCM", "Nose cone")
+#define CODE_DCM_NasalCannula DSRBasicCodedEntry("127061", "DCM", "Nasal cannula")
+#define CODE_DCM_RetroOrbitalRoute DSRBasicCodedEntry("127070", "DCM", "Retro-orbital route")
+#define CODE_DCM_InHomeCage DSRBasicCodedEntry("127101", "DCM", "In home cage")
+#define CODE_DCM_DuringTransport DSRBasicCodedEntry("127102", "DCM", "During transport")
+#define CODE_DCM_StagingPriorToImaging DSRBasicCodedEntry("127103", "DCM", "Staging prior to imaging")
+#define CODE_DCM_PreparationForImaging DSRBasicCodedEntry("127104", "DCM", "Preparation for imaging")
+#define CODE_DCM_HousingRole DSRBasicCodedEntry("127110", "DCM", "Housing role")
+#define CODE_DCM_AnimalHousing DSRBasicCodedEntry("127120", "DCM", "Animal housing")
+#define CODE_DCM_AnimalRoomType DSRBasicCodedEntry("127121", "DCM", "Animal room type")
+#define CODE_DCM_AnimalRoomIdentifier DSRBasicCodedEntry("127122", "DCM", "Animal room identifier")
+#define CODE_DCM_HousingManufacturer DSRBasicCodedEntry("127125", "DCM", "Housing manufacturer")
+#define CODE_DCM_HousingRackProductName DSRBasicCodedEntry("127126", "DCM", "Housing rack product name")
+#define CODE_DCM_HousingRackProductCode DSRBasicCodedEntry("127127", "DCM", "Housing rack product code")
+#define CODE_DCM_HousingUnitProductName DSRBasicCodedEntry("127128", "DCM", "Housing unit product name")
+#define CODE_DCM_HousingUnitProductCode DSRBasicCodedEntry("127129", "DCM", "Housing unit product code")
+#define CODE_DCM_HousingUnitLidProductName DSRBasicCodedEntry("127130", "DCM", "Housing unit lid product name")
+#define CODE_DCM_HousingUnitLidProductCode DSRBasicCodedEntry("127131", "DCM", "Housing unit lid product code")
+#define CODE_DCM_NumberOfRacksPerRoom DSRBasicCodedEntry("127140", "DCM", "Number of racks per room")
+#define CODE_DCM_NumberOfHousingUnitsPerRack DSRBasicCodedEntry("127141", "DCM", "Number of housing units per rack")
+#define CODE_DCM_HousingUnitLocationInRack DSRBasicCodedEntry("127142", "DCM", "Housing unit location in rack")
+#define CODE_DCM_NumberOfAnimalsWithinSameHousingUnit DSRBasicCodedEntry("127143", "DCM", "Number of animals within same housing unit")
+#define CODE_DCM_SexOfAnimalsWithinSameHousingUnit DSRBasicCodedEntry("127144", "DCM", "Sex of animals within same housing unit")
+#define CODE_DCM_SexOfHandler DSRBasicCodedEntry("127145", "DCM", "Sex of handler")
+#define CODE_DCM_MixedSex DSRBasicCodedEntry("127146", "DCM", "Mixed sex")
+#define CODE_DCM_TotalDurationInHousing DSRBasicCodedEntry("127150", "DCM", "Total duration in housing")
+#define CODE_DCM_HousingChangeInterval DSRBasicCodedEntry("127151", "DCM", "Housing change interval")
+#define CODE_DCM_ManualHandlingInterval DSRBasicCodedEntry("127152", "DCM", "Manual handling interval")
+#define CODE_DCM_HousingUnitMovement DSRBasicCodedEntry("127153", "DCM", "Housing unit movement")
+#define CODE_DCM_HousingUnitWidth DSRBasicCodedEntry("127160", "DCM", "Housing unit width")
+#define CODE_DCM_HousingUnitHeight DSRBasicCodedEntry("127161", "DCM", "Housing unit height")
+#define CODE_DCM_HousingUnitLength DSRBasicCodedEntry("127162", "DCM", "Housing unit length")
+#define CODE_DCM_HousingIndividuallyVentilated DSRBasicCodedEntry("127170", "DCM", "Housing individually ventilated")
+#define CODE_DCM_AirChanges DSRBasicCodedEntry("127172", "DCM", "Air changes")
+#define CODE_DCM_HousingUnitReuse DSRBasicCodedEntry("127175", "DCM", "Housing unit reuse")
+#define CODE_DCM_Unused DSRBasicCodedEntry("127177", "DCM", "Unused")
+#define CODE_DCM_Reused DSRBasicCodedEntry("127178", "DCM", "Reused")
+#define CODE_DCM_BeddingManufacturer DSRBasicCodedEntry("127180", "DCM", "Bedding manufacturer")
+#define CODE_DCM_BeddingProductName DSRBasicCodedEntry("127181", "DCM", "Bedding product name")
+#define CODE_DCM_BeddingProductCode DSRBasicCodedEntry("127182", "DCM", "Bedding product code")
+#define CODE_DCM_BeddingVolume DSRBasicCodedEntry("127183", "DCM", "Bedding volume")
+#define CODE_DCM_BeddingMass DSRBasicCodedEntry("127184", "DCM", "Bedding mass")
+#define CODE_DCM_BeddingDepth DSRBasicCodedEntry("127185", "DCM", "Bedding depth")
+#define CODE_DCM_EnrichmentMaterial DSRBasicCodedEntry("127190", "DCM", "Enrichment material")
+#define CODE_DCM_EnrichmentManufacturer DSRBasicCodedEntry("127191", "DCM", "Enrichment manufacturer")
+#define CODE_DCM_EnrichmentMaterialPresent DSRBasicCodedEntry("127192", "DCM", "Enrichment material present")
+#define CODE_DCM_ExerciserDevicePresent DSRBasicCodedEntry("127193", "DCM", "Exerciser device present")
+#define CODE_DCM_ShelterType DSRBasicCodedEntry("127195", "DCM", "Shelter type")
+#define CODE_DCM_ShelterManufacturer DSRBasicCodedEntry("127196", "DCM", "Shelter manufacturer")
+#define CODE_DCM_ShelterProductName DSRBasicCodedEntry("127197", "DCM", "Shelter product name")
+#define CODE_DCM_ShelterProductCode DSRBasicCodedEntry("127198", "DCM", "Shelter product code")
+#define CODE_DCM_FeedManufacturer DSRBasicCodedEntry("127200", "DCM", "Feed manufacturer")
+#define CODE_DCM_FeedProductName DSRBasicCodedEntry("127201", "DCM", "Feed product name")
+#define CODE_DCM_FeedProductCode DSRBasicCodedEntry("127202", "DCM", "Feed product code")
+#define CODE_DCM_FeedSource DSRBasicCodedEntry("127205", "DCM", "Feed source")
+#define CODE_DCM_FeedbackTemperatureRegulation DSRBasicCodedEntry("127210", "DCM", "Feedback temperature regulation")
+#define CODE_DCM_TotalDurationOfLightDarkCycle DSRBasicCodedEntry("127214", "DCM", "Total duration of light-dark cycle")
+#define CODE_DCM_LightsonTimeOfDay DSRBasicCodedEntry("127215", "DCM", "Lights on time of day")
+#define CODE_DCM_Igloo DSRBasicCodedEntry("127220", "DCM", "Igloo")
+#define CODE_DCM_RedTranslucentIgloo DSRBasicCodedEntry("127221", "DCM", "Red translucent igloo")
+#define CODE_DCM_AspenChipBedding DSRBasicCodedEntry("127230", "DCM", "Aspen chip bedding")
+#define CODE_DCM_AspenShavingBedding DSRBasicCodedEntry("127231", "DCM", "Aspen shaving bedding")
+#define CODE_DCM_CornCobBedding DSRBasicCodedEntry("127232", "DCM", "Corn cob bedding")
+#define CODE_DCM_PaperBasedBedding DSRBasicCodedEntry("127233", "DCM", "Paper-based bedding")
+#define CODE_DCM_PineChipBedding DSRBasicCodedEntry("127234", "DCM", "Pine chip bedding")
+#define CODE_DCM_PineShavingBedding DSRBasicCodedEntry("127235", "DCM", "Pine shaving bedding")
+#define CODE_DCM_CarrierTemperatureSensor DSRBasicCodedEntry("127240", "DCM", "Carrier temperature sensor")
+#define CODE_DCM_ForcedAirHeater DSRBasicCodedEntry("127250", "DCM", "Forced air heater")
+#define CODE_DCM_HeatedImagingDevice DSRBasicCodedEntry("127251", "DCM", "Heated imaging device")
+#define CODE_DCM_HeatedPatientSupport DSRBasicCodedEntry("127252", "DCM", "Heated patient support")
+#define CODE_DCM_HeatedWaterBlanket DSRBasicCodedEntry("127253", "DCM", "Heated water blanket")
+#define CODE_DCM_PreHeatedPad DSRBasicCodedEntry("127254", "DCM", "Pre-heated pad")
+#define CODE_DCM_Unheated DSRBasicCodedEntry("127255", "DCM", "Unheated")
+#define CODE_DCM_NIH31 DSRBasicCodedEntry("127270", "DCM", "NIH31")
+#define CODE_DCM_NIH07 DSRBasicCodedEntry("127271", "DCM", "NIH07")
+#define CODE_DCM_AIN76 DSRBasicCodedEntry("127272", "DCM", "AIN76")
+#define CODE_DCM_AIN93G DSRBasicCodedEntry("127273", "DCM", "AIN93G")
+#define CODE_DCM_AIN93M DSRBasicCodedEntry("127274", "DCM", "AIN93M")
+#define CODE_DCM_ReverseOsmosisPurifiedWater DSRBasicCodedEntry("127290", "DCM", "Reverse osmosis purified water")
+#define CODE_DCM_ReverseOsmosisPurified_HClAcidifiedWater DSRBasicCodedEntry("127291", "DCM", "Reverse osmosis purified, HCl acidified water")
+#define CODE_DCM_AnesthesiaMethodSet DSRBasicCodedEntry("127300", "DCM", "Anesthesia Method Set")
+#define CODE_DCM_AnesthesiaMethod DSRBasicCodedEntry("127301", "DCM", "Anesthesia Method")
+#define CODE_DCM_AnesthesiaCategory DSRBasicCodedEntry("127302", "DCM", "Anesthesia Category")
+#define CODE_DCM_AnesthesiaSubCategory DSRBasicCodedEntry("127303", "DCM", "Anesthesia SubCategory")
+#define CODE_DCM_AirwayManagementSet DSRBasicCodedEntry("127310", "DCM", "Airway Management Set")
+#define CODE_DCM_AirwayManagementMethod DSRBasicCodedEntry("127312", "DCM", "Airway Management Method")
+#define CODE_DCM_AirwaySubManagementMethod DSRBasicCodedEntry("127313", "DCM", "Airway Sub-Management Method")
+#define CODE_DCM_MedicationsSet DSRBasicCodedEntry("127320", "DCM", "Medications Set")
+#define CODE_DCM_CarrierGas DSRBasicCodedEntry("127330", "DCM", "Carrier gas")
+#define CODE_DCM_AnimalHousingRoom DSRBasicCodedEntry("127370", "DCM", "Animal housing room")
+#define CODE_DCM_PreparationRoom DSRBasicCodedEntry("127371", "DCM", "Preparation room")
+#define CODE_DCM_ImagingProcedureRoom DSRBasicCodedEntry("127372", "DCM", "Imaging procedure room")
+#define CODE_DCM_LocallyManufacturedProduct DSRBasicCodedEntry("127390", "DCM", "Locally manufactured product")
+#define CODE_DCM_FoodTreat DSRBasicCodedEntry("127391", "DCM", "Food treat")
+#define CODE_DCM_ExogenousSubstance DSRBasicCodedEntry("127400", "DCM", "Exogenous substance")
+#define CODE_DCM_TissueOfOrigin DSRBasicCodedEntry("127401", "DCM", "Tissue of origin")
+#define CODE_DCM_TaxonomicRankOfOrigin DSRBasicCodedEntry("127402", "DCM", "Taxonomic rank of origin")
+#define CODE_DCM_StereotacticCoordinates DSRBasicCodedEntry("127450", "DCM", "Stereotactic coordinates")
+#define CODE_DCM_PositionReferenceIndicator DSRBasicCodedEntry("127451", "DCM", "Position reference indicator")
+#define CODE_DCM_TumorGraft DSRBasicCodedEntry("127460", "DCM", "Tumor graft")
+#define CODE_DCM_EmbryonicKidney DSRBasicCodedEntry("127801", "DCM", "Embryonic Kidney")
+#define CODE_DCM_HumanAlphaSynucleinPreformedFibrils DSRBasicCodedEntry("127851", "DCM", "Human alpha synuclein preformed fibrils")
+#define CODE_DCM_MouseAlphaSynucleinPreformedFibrils DSRBasicCodedEntry("127852", "DCM", "Mouse alpha synuclein preformed fibrils")
+#define CODE_DCM_HumanTauPreformedFibrils DSRBasicCodedEntry("127853", "DCM", "Human Tau preformed fibrils")
+#define CODE_DCM_MouseTauPreformedFibrils DSRBasicCodedEntry("127854", "DCM", "Mouse Tau preformed fibrils")
+#define CODE_DCM_NonIonicIodinatedContrastAgent DSRBasicCodedEntry("127855", "DCM", "Non-ionic iodinated contrast agent")
+#define CODE_DCM_HeartValveFlail DSRBasicCodedEntry("127856", "DCM", "Heart valve flail")
+#define CODE_DCM_GlucoseMeasurementDate DSRBasicCodedEntry("127857", "DCM", "Glucose Measurement Date")
+#define CODE_DCM_GlucoseMeasurementTime DSRBasicCodedEntry("127858", "DCM", "Glucose Measurement Time")
+#define CODE_DCM_SPECTOfWholeBody DSRBasicCodedEntry("127901", "DCM", "SPECT of whole body")
+#define CODE_DCM_SPECTCTOfWholeBody DSRBasicCodedEntry("127902", "DCM", "SPECT CT of whole body")
+#define CODE_DCM_AddAddendumToReport DSRBasicCodedEntry("128001", "DCM", "Add Addendum to Report")
+#define CODE_DCM_ModalityToRead DSRBasicCodedEntry("128002", "DCM", "Modality to Read")
+#define CODE_DCM_ReaderSpecialty DSRBasicCodedEntry("128003", "DCM", "Reader Specialty")
+#define CODE_DCM_ReportRequested DSRBasicCodedEntry("128004", "DCM", "Report Requested")
+#define CODE_DCM_FinalReport DSRBasicCodedEntry("128005", "DCM", "Final Report")
+#define CODE_DCM_AbdominalImagingSpecialty DSRBasicCodedEntry("128006", "DCM", "Abdominal Imaging Specialty")
+#define CODE_DCM_CardiacImagingSpecialty DSRBasicCodedEntry("128007", "DCM", "Cardiac Imaging Specialty")
+#define CODE_DCM_HeadAndNeckImagingSpecialty DSRBasicCodedEntry("128008", "DCM", "Head and Neck Imaging Specialty")
+#define CODE_DCM_MusculoskeletalImagingSpecialty DSRBasicCodedEntry("128009", "DCM", "Musculoskeletal Imaging Specialty")
+#define CODE_DCM_NeurologySpecialty DSRBasicCodedEntry("128010", "DCM", "Neurology Specialty")
+#define CODE_DCM_NeuroradiologicImagingSpecialty DSRBasicCodedEntry("128011", "DCM", "Neuroradiologic Imaging Specialty")
+#define CODE_DCM_OBGynImagingSpecialty DSRBasicCodedEntry("128012", "DCM", "OB/Gyn Imaging Specialty")
+#define CODE_DCM_OncologicImagingSpecialty DSRBasicCodedEntry("128013", "DCM", "Oncologic Imaging Specialty")
+#define CODE_DCM_OncologySpecialty DSRBasicCodedEntry("128014", "DCM", "Oncology Specialty")
+#define CODE_DCM_ThoracicImagingSpecialty DSRBasicCodedEntry("128015", "DCM", "Thoracic Imaging Specialty")
+#define CODE_DCM_PediatricImagingSpecialty DSRBasicCodedEntry("128016", "DCM", "Pediatric Imaging Specialty")
+#define CODE_DCM_VascularImagingSpecialty DSRBasicCodedEntry("128017", "DCM", "Vascular Imaging Specialty")
+#define CODE_DCM_FWPByGA_Campbell_1991 DSRBasicCodedEntry("128040", "DCM", "FWP by GA, Campbell, 1991")
+#define CODE_DCM_FWPByGA_Hadlock_1991 DSRBasicCodedEntry("128041", "DCM", "FWP by GA, Hadlock, 1991")
#endif
diff --git a/dcmsr/include/dcmtk/dcmsr/codes/ncit.h b/dcmsr/include/dcmtk/dcmsr/codes/ncit.h
index 40ea784..c917a16 100644
--- a/dcmsr/include/dcmtk/dcmsr/codes/ncit.h
+++ b/dcmsr/include/dcmtk/dcmsr/codes/ncit.h
@@ -5,8 +5,8 @@
*
* Header file with NCIt Code Definitions (Coding Scheme "NCIt")
*
- * Generated semi-automatically from DICOM PS 3.16-2015c
- * File created on 2016-01-12 18:02:09 by J. Riesmeier
+ * Generated automatically from DICOM PS 3.16-2016b
+ * File created on 2016-04-06 16:08:01 by J. Riesmeier
*
*/
@@ -33,7 +33,7 @@
* code definitions *
*--------------------*/
-// total number of codes: 2
+// total number of codes: 16
// - retired: 0
// - no name: 0
// - not unique: 0
@@ -47,7 +47,21 @@
// The "cleaned camel-case version of the code meaning" is an attempt to map the free text
// description of the code meaning to a compiler-friendly but still human-readable representation.
-#define CODE_NCIt_RANO DSRBasicCodedEntry("C114879", "NCIt", "RANO")
-#define CODE_NCIt_ActivitySession DSRBasicCodedEntry("C67447", "NCIt", "Activity Session") // added from CP-1466
+#define CODE_NCIt_RANO DSRBasicCodedEntry("C114879", "NCIt", "RANO")
+#define CODE_NCIt_BronchioloalveolarAdenocarcinoma DSRBasicCodedEntry("C2923", "NCIt", "Bronchioloalveolar adenocarcinoma")
+#define CODE_NCIt_ExtraluminalRoute DSRBasicCodedEntry("C38213", "NCIt", "Extraluminal route")
+#define CODE_NCIt_IntraepithelialRoute DSRBasicCodedEntry("C38244", "NCIt", "Intraepithelial route")
+#define CODE_NCIt_TransluminalRoute DSRBasicCodedEntry("C38306", "NCIt", "Transluminal route")
+#define CODE_NCIt_TemperatureSensorDeviceComponent DSRBasicCodedEntry("C50304", "NCIt", "Temperature sensor device component")
+#define CODE_NCIt_AdLibitum DSRBasicCodedEntry("C64636", "NCIt", "ad libitum")
+#define CODE_NCIt_ActivitySession DSRBasicCodedEntry("C67447", "NCIt", "Activity Session")
+#define CODE_NCIt_Erect DSRBasicCodedEntry("C86043", "NCIt", "erect")
+#define CODE_NCIt_BeddingChange DSRBasicCodedEntry("C90365", "NCIt", "Bedding change")
+#define CODE_NCIt_BeddingMaterial DSRBasicCodedEntry("C90366", "NCIt", "Bedding material")
+#define CODE_NCIt_EnvironmentalTemperature DSRBasicCodedEntry("C90380", "NCIt", "Environmental temperature")
+#define CODE_NCIt_HousingHumidity DSRBasicCodedEntry("C90395", "NCIt", "Housing humidity")
+#define CODE_NCIt_LightCycle DSRBasicCodedEntry("C90419", "NCIt", "Light cycle")
+#define CODE_NCIt_WaterDelivery DSRBasicCodedEntry("C90486", "NCIt", "Water delivery")
+#define CODE_NCIt_ReferenceRegion DSRBasicCodedEntry("C94970", "NCIt", "Reference Region")
#endif
diff --git a/dcmsr/include/dcmtk/dcmsr/codes/srt.h b/dcmsr/include/dcmtk/dcmsr/codes/srt.h
index 081764f..2b96239 100644
--- a/dcmsr/include/dcmtk/dcmsr/codes/srt.h
+++ b/dcmsr/include/dcmtk/dcmsr/codes/srt.h
@@ -1,12 +1,17 @@
/*
*
* Copyright (C) 2015-2016, J. Riesmeier, Oldenburg, Germany
+ * All rights reserved. See COPYRIGHT file for details.
*
* Header file with SNOMED-RT Code Definitions (Coding Scheme "SRT")
*
* Generated semi-automatically from DICOM PS 3.16-2015c
* File created on 2015-08-24 by J. Riesmeier
- * Last modified on 2016-01-23 by Riesmeier
+ * Last modified on 2016-02-22 by Riesmeier
+ *
+ * NB: This file does not yet contain all codes defined in PS 3.16 since the
+ * mapping of the code meaning to a compiler-friendly representation is
+ * much more complex than for other coding schemes.
*
*/
diff --git a/dcmsr/include/dcmtk/dcmsr/codes/ucum.h b/dcmsr/include/dcmtk/dcmsr/codes/ucum.h
index d057e64..4a770fb 100644
--- a/dcmsr/include/dcmtk/dcmsr/codes/ucum.h
+++ b/dcmsr/include/dcmtk/dcmsr/codes/ucum.h
@@ -1,12 +1,17 @@
/*
*
* Copyright (C) 2015-2016, J. Riesmeier, Oldenburg, Germany
+ * All rights reserved. See COPYRIGHT file for details.
*
* Header file with UCUM Code Definitions (Coding Scheme "UCUM")
*
* Generated semi-automatically from DICOM PS 3.16-2015c
* File created on 2015-08-24 by J. Riesmeier
- * Last modified on 2016-01-23 by Riesmeier
+ * Last modified on 2016-02-22 by Riesmeier
+ *
+ * NB: This file does not yet contain all codes defined in PS 3.16 since the
+ * mapping of the code meaning to a compiler-friendly representation is
+ * much more complex than for other coding schemes.
*
*/
@@ -46,6 +51,7 @@
#define CODE_UCUM_Degrees DSRBasicCodedEntry("deg", "UCUM", "deg")
#define CODE_UCUM_Minus1To1 DSRBasicCodedEntry("{-1:1}", "UCUM", "{-1:1}")
#define CODE_UCUM_Millimeter DSRBasicCodedEntry("mm", "UCUM", "millimeter")
+#define CODE_UCUM_Centimeter DSRBasicCodedEntry("cm", "UCUM", "centimeter")
#define CODE_UCUM_cm3 DSRBasicCodedEntry("cm3", "UCUM", "cm3")
#define CODE_UCUM_ml DSRBasicCodedEntry("ml", "UCUM", "ml")
#define CODE_UCUM_s DSRBasicCodedEntry("s", "UCUM", "s")
diff --git a/dcmsr/include/dcmtk/dcmsr/codes/umls.h b/dcmsr/include/dcmtk/dcmsr/codes/umls.h
index 047bc51..b7ef28e 100644
--- a/dcmsr/include/dcmtk/dcmsr/codes/umls.h
+++ b/dcmsr/include/dcmtk/dcmsr/codes/umls.h
@@ -1,11 +1,12 @@
/*
*
* Copyright (C) 2015-2016, J. Riesmeier, Oldenburg, Germany
+ * All rights reserved. See COPYRIGHT file for details.
*
* Header file with UMLS Code Definitions (Coding Scheme "UMLS")
*
- * Generated automatically from DICOM PS 3.16-2015c
- * File created on 2015-08-23 14:59:04 by J. Riesmeier
+ * Generated automatically from DICOM PS 3.16-2016b
+ * File created on 2016-04-06 16:08:00 by J. Riesmeier
*
*/
@@ -32,7 +33,7 @@
* code definitions *
*--------------------*/
-// total number of codes: 22
+// total number of codes: 39
// - retired: 0
// - no name: 0
// - not unique: 0
@@ -46,27 +47,44 @@
// The "cleaned camel-case version of the code meaning" is an attempt to map the free text
// description of the code meaning to a compiler-friendly but still human-readable representation.
-#define CODE_UMLS_QualitativeEvaluations DSRBasicCodedEntry("C0034375", "UMLS", "Qualitative Evaluations")
-#define CODE_UMLS_UnknownPrimaryNeoplasiaSite DSRBasicCodedEntry("C0221297", "UMLS", "unknown primary neoplasia site")
-#define CODE_UMLS_CoefficientOfVariance DSRBasicCodedEntry("C0681921", "UMLS", "Coefficient of Variance")
-#define CODE_UMLS_Intern DSRBasicCodedEntry("C1144859", "UMLS", "Intern")
-#define CODE_UMLS_ConsultingPhysician DSRBasicCodedEntry("C1441532", "UMLS", "Consulting Physician")
-#define CODE_UMLS_Baseline DSRBasicCodedEntry("C1442488", "UMLS", "Baseline")
-#define CODE_UMLS_Fluoroetanidazole_F18 DSRBasicCodedEntry("C1541539", "UMLS", "Fluoroetanidazole F^18^")
-#define CODE_UMLS_Unscheduled DSRBasicCodedEntry("C1699701", "UMLS", "Unscheduled")
-#define CODE_UMLS_Nadir DSRBasicCodedEntry("C1708760", "UMLS", "Nadir")
-#define CODE_UMLS_MedicalPhysicist DSRBasicCodedEntry("C1708969", "UMLS", "Medical Physicist")
-#define CODE_UMLS_Referring DSRBasicCodedEntry("C1709880", "UMLS", "Referring")
-#define CODE_UMLS_Variance DSRBasicCodedEntry("C1711260", "UMLS", "Variance")
-#define CODE_UMLS_Tyrosine3Octreotate_Ga68 DSRBasicCodedEntry("C1742831", "UMLS", "tyrosine-3-octreotate Ga^68^")
-#define CODE_UMLS_Fluoroestradiol_FES_F18 DSRBasicCodedEntry("C1831937", "UMLS", "Fluoroestradiol (FES) F^18^")
-#define CODE_UMLS_Sonographer DSRBasicCodedEntry("C1954848", "UMLS", "Sonographer")
-#define CODE_UMLS_RootMeanSquare DSRBasicCodedEntry("C2347976", "UMLS", "Root Mean Square")
-#define CODE_UMLS_TimePoint DSRBasicCodedEntry("C2348792", "UMLS", "Time Point")
-#define CODE_UMLS_Edotreotide_Ga68 DSRBasicCodedEntry("C2713594", "UMLS", "Edotreotide Ga^68^")
-#define CODE_UMLS_FluoropropylDihydrotetrabenazine_DTBZ_F18 DSRBasicCodedEntry("C2934038", "UMLS", "Fluoropropyl-dihydrotetrabenazine (DTBZ) F^18^")
-#define CODE_UMLS_ISO1_F18 DSRBasicCodedEntry("C2981788", "UMLS", "ISO-1 F^18^")
-#define CODE_UMLS_RadiationPhysicist DSRBasicCodedEntry("C2985483", "UMLS", "Radiation Physicist")
-#define CODE_UMLS_Pretreatment DSRBasicCodedEntry("C3539075", "UMLS", "Pretreatment")
+#define CODE_UMLS_AnesthesiaRecoveryPeriod DSRBasicCodedEntry("C0002908", "UMLS", "Anesthesia recovery period")
+#define CODE_UMLS_TransgenicAnimal DSRBasicCodedEntry("C0003069", "UMLS", "Transgenic animal")
+#define CODE_UMLS_FeedingMethod DSRBasicCodedEntry("C0015746", "UMLS", "Feeding method")
+#define CODE_UMLS_Heating DSRBasicCodedEntry("C0018851", "UMLS", "Heating")
+#define CODE_UMLS_H2Antagonist DSRBasicCodedEntry("C0019593", "UMLS", "H2 antagonist")
+#define CODE_UMLS_EthidiumBromide DSRBasicCodedEntry("C0019873", "UMLS", "Ethidium Bromide")
+#define CODE_UMLS_Mastectomy DSRBasicCodedEntry("C0024881", "UMLS", "Mastectomy")
+#define CODE_UMLS_Metomidate DSRBasicCodedEntry("C0025856", "UMLS", "Metomidate")
+#define CODE_UMLS_NarcoticAnalgesic DSRBasicCodedEntry("C0027409", "UMLS", "Narcotic analgesic")
+#define CODE_UMLS_QualitativeEvaluations DSRBasicCodedEntry("C0034375", "UMLS", "Qualitative Evaluations")
+#define CODE_UMLS_Thermography DSRBasicCodedEntry("C0039810", "UMLS", "Thermography")
+#define CODE_UMLS_Alphaxalone DSRBasicCodedEntry("C0051482", "UMLS", "Alphaxalone")
+#define CODE_UMLS_Fluanisone DSRBasicCodedEntry("C0060473", "UMLS", "Fluanisone")
+#define CODE_UMLS_HeatLamp DSRBasicCodedEntry("C0181514", "UMLS", "Heat lamp")
+#define CODE_UMLS_UnknownPrimaryNeoplasiaSite DSRBasicCodedEntry("C0221297", "UMLS", "unknown primary neoplasia site")
+#define CODE_UMLS_CoefficientOfVariance DSRBasicCodedEntry("C0681921", "UMLS", "Coefficient of Variance")
+#define CODE_UMLS_Intern DSRBasicCodedEntry("C1144859", "UMLS", "Intern")
+#define CODE_UMLS_ConsultingPhysician DSRBasicCodedEntry("C1441532", "UMLS", "Consulting Physician")
+#define CODE_UMLS_Baseline DSRBasicCodedEntry("C1442488", "UMLS", "Baseline")
+#define CODE_UMLS_Fluoroetanidazole_F18 DSRBasicCodedEntry("C1541539", "UMLS", "Fluoroetanidazole F^18^")
+#define CODE_UMLS_CommercialProduct DSRBasicCodedEntry("C1547887", "UMLS", "Commercial product")
+#define CODE_UMLS_Antihypoglycemic DSRBasicCodedEntry("C1579431", "UMLS", "Antihypoglycemic")
+#define CODE_UMLS_Unscheduled DSRBasicCodedEntry("C1699701", "UMLS", "Unscheduled")
+#define CODE_UMLS_Nadir DSRBasicCodedEntry("C1708760", "UMLS", "Nadir")
+#define CODE_UMLS_MedicalPhysicist DSRBasicCodedEntry("C1708969", "UMLS", "Medical Physicist")
+#define CODE_UMLS_Referring DSRBasicCodedEntry("C1709880", "UMLS", "Referring")
+#define CODE_UMLS_Variance DSRBasicCodedEntry("C1711260", "UMLS", "Variance")
+#define CODE_UMLS_Tyrosine3Octreotate_Ga68 DSRBasicCodedEntry("C1742831", "UMLS", "tyrosine-3-octreotate Ga^68^")
+#define CODE_UMLS_Fluoroestradiol_FES_F18 DSRBasicCodedEntry("C1831937", "UMLS", "Fluoroestradiol (FES) F^18^")
+#define CODE_UMLS_Sonographer DSRBasicCodedEntry("C1954848", "UMLS", "Sonographer")
+#define CODE_UMLS_InverseRatioVentilation DSRBasicCodedEntry("C2223982", "UMLS", "Inverse ratio ventilation")
+#define CODE_UMLS_RootMeanSquare DSRBasicCodedEntry("C2347976", "UMLS", "Root Mean Square")
+#define CODE_UMLS_TimePoint DSRBasicCodedEntry("C2348792", "UMLS", "Time Point")
+#define CODE_UMLS_Edotreotide_Ga68 DSRBasicCodedEntry("C2713594", "UMLS", "Edotreotide Ga^68^")
+#define CODE_UMLS_FluoropropylDihydrotetrabenazine_DTBZ_F18 DSRBasicCodedEntry("C2934038", "UMLS", "Fluoropropyl-dihydrotetrabenazine (DTBZ) F^18^")
+#define CODE_UMLS_ISO1_F18 DSRBasicCodedEntry("C2981788", "UMLS", "ISO-1 F^18^")
+#define CODE_UMLS_RadiationPhysicist DSRBasicCodedEntry("C2985483", "UMLS", "Radiation Physicist")
+#define CODE_UMLS_Pretreatment DSRBasicCodedEntry("C3539075", "UMLS", "Pretreatment")
+#define CODE_UMLS_RoomAir DSRBasicCodedEntry("C3846005", "UMLS", "Room air")
#endif
diff --git a/dcmsr/include/dcmtk/dcmsr/dsrcitem.h b/dcmsr/include/dcmtk/dcmsr/dsrcitem.h
index 5959b51..1fa6dad 100644
--- a/dcmsr/include/dcmtk/dcmsr/dsrcitem.h
+++ b/dcmsr/include/dcmtk/dcmsr/dsrcitem.h
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2000-2015, OFFIS e.V.
+ * Copyright (C) 2000-2016, OFFIS e.V.
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation were developed by
@@ -37,8 +37,6 @@
#include "dcmtk/dcmsr/dsrimgvl.h"
#include "dcmtk/dcmsr/dsrwavvl.h"
-#include "dcmtk/ofstd/ofstring.h"
-
/*---------------------*
* class declaration *
@@ -99,7 +97,7 @@ class DCMTK_DCMSR_EXPORT DSRContentItem
E_RelationshipType getRelationshipType() const;
/** get ID of the referenced node.
- * Applicable to: byReference relationships
+ * Applicable to: by-reference relationships
** @return ID of the referenced node if valid, 0 otherwise
*/
size_t getReferencedNodeID() const;
diff --git a/dcmsr/include/dcmtk/dcmsr/dsrcodvl.h b/dcmsr/include/dcmtk/dcmsr/dsrcodvl.h
index 0a61c88..467dd38 100644
--- a/dcmsr/include/dcmtk/dcmsr/dsrcodvl.h
+++ b/dcmsr/include/dcmtk/dcmsr/dsrcodvl.h
@@ -28,7 +28,6 @@
#include "dcmtk/dcmsr/dsrtypes.h"
-#include "dcmtk/ofstd/ofstring.h"
#include "dcmtk/ofstd/ofexbl.h"
diff --git a/dcmsr/include/dcmtk/dcmsr/dsrcomvl.h b/dcmsr/include/dcmtk/dcmsr/dsrcomvl.h
index 896c7c1..e1d9483 100644
--- a/dcmsr/include/dcmtk/dcmsr/dsrcomvl.h
+++ b/dcmsr/include/dcmtk/dcmsr/dsrcomvl.h
@@ -28,8 +28,6 @@
#include "dcmtk/dcmsr/dsrtypes.h"
-#include "dcmtk/ofstd/ofstring.h"
-
/*---------------------*
* class declaration *
diff --git a/dcmsr/include/dcmtk/dcmsr/dsrcsidl.h b/dcmsr/include/dcmtk/dcmsr/dsrcsidl.h
index 217120e..a2a631e 100644
--- a/dcmsr/include/dcmtk/dcmsr/dsrcsidl.h
+++ b/dcmsr/include/dcmtk/dcmsr/dsrcsidl.h
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2003-2015, OFFIS e.V.
+ * Copyright (C) 2003-2016, OFFIS e.V.
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation were developed by
@@ -100,6 +100,16 @@ class DCMTK_DCMSR_EXPORT DSRCodingSchemeIdentificationList
OFCondition writeXML(STD_NAMESPACE ostream &stream,
const size_t flags) const;
+ /** set specific character set, which is used for checking the affected element values.
+ * Please note that this method does not return an error if the given 'value' is not
+ * defined by the DICOM standard or not supported by this implementation.
+ ** @param value value to be set (single or multiple values) or "" for no value
+ * @param check check 'value' for conformance with VR (CS) and VM (1-n) if enabled
+ ** @return status, EC_Normal if successful, an error code otherwise
+ */
+ OFCondition setSpecificCharacterSet(const OFString &value,
+ const OFBool check = OFTrue);
+
/** add private OFFIS DCMTK coding scheme entry to the list.
* Please note that any information previously stored under the defined coding scheme
* designator "99_OFFIS_DCMTK" is replaced!
@@ -341,6 +351,8 @@ class DCMTK_DCMSR_EXPORT DSRCodingSchemeIdentificationList
OFList<ItemStruct *> ItemList;
/// internal cursor to current (selected) list item
OFListIterator(ItemStruct *) Iterator;
+ /// specific character set used for checking purposes
+ OFString SpecificCharacterSet;
// copy constructor - not implemented!
DSRCodingSchemeIdentificationList(const DSRCodingSchemeIdentificationList &);
diff --git a/dcmsr/include/dcmtk/dcmsr/dsrctpl.h b/dcmsr/include/dcmtk/dcmsr/dsrctpl.h
index 4ab55f4..9b45311 100644
--- a/dcmsr/include/dcmtk/dcmsr/dsrctpl.h
+++ b/dcmsr/include/dcmtk/dcmsr/dsrctpl.h
@@ -28,6 +28,7 @@
#include "dcmtk/dcmsr/dsrtypes.h"
#include "dcmtk/dcmsr/dsrdoctn.h"
+#include "dcmtk/dcmsr/dsrdncsr.h"
/*-----------------------*
diff --git a/dcmsr/include/dcmtk/dcmsr/dsrdncsr.h b/dcmsr/include/dcmtk/dcmsr/dsrdncsr.h
new file mode 100644
index 0000000..5512b9e
--- /dev/null
+++ b/dcmsr/include/dcmtk/dcmsr/dsrdncsr.h
@@ -0,0 +1,65 @@
+/*
+ *
+ * Copyright (C) 2016, J. Riesmeier, Oldenburg, Germany
+ * All rights reserved. See COPYRIGHT file for details.
+ *
+ * This software and supporting documentation are maintained by
+ *
+ * OFFIS e.V.
+ * R&D Division Health
+ * Escherweg 2
+ * D-26121 Oldenburg, Germany
+ *
+ *
+ * Module: dcmsr
+ *
+ * Author: Joerg Riesmeier
+ *
+ * Purpose:
+ * classes: DSRDocumentTreeNodeCursor, DSRIncludedTemplateNodeCursor
+ *
+ */
+
+
+#ifndef DSRDOCSR_H
+#define DSRDOCSR_H
+
+#include "dcmtk/config/osconfig.h" /* make sure OS specific configuration is included first */
+
+#include "dcmtk/dcmsr/dsdefine.h"
+#include "dcmtk/dcmsr/dsrtncsr.h"
+
+
+/*-----------------------*
+ * forward declaration *
+ *-----------------------*/
+
+class DSRDocumentTreeNode;
+
+
+/*--------------------*
+ * type definitions *
+ *--------------------*/
+
+typedef DSRTreeNodeCursor<DSRDocumentTreeNode, OFFalse> DSRDocumentTreeNodeCursor;
+typedef DSRTreeNodeCursor<DSRDocumentTreeNode, OFTrue> DSRIncludedTemplateNodeCursor;
+
+
+/*-------------------------------------------*
+ * declaration of template specializations *
+ *-------------------------------------------*/
+
+DCMTK_EXPLICIT_SPECIALIZATION DCMTK_DCMSR_EXPORT
+const DSRDocumentTreeNode *DSRTreeNodeCursor<DSRDocumentTreeNode, OFTrue>::getChildNode() const;
+
+DCMTK_EXPLICIT_SPECIALIZATION DCMTK_DCMSR_EXPORT
+size_t DSRTreeNodeCursor<DSRDocumentTreeNode, OFTrue>::countChildNodes(const OFBool searchIntoSub) const;
+
+DCMTK_EXPLICIT_SPECIALIZATION DCMTK_DCMSR_EXPORT
+size_t DSRTreeNodeCursor<DSRDocumentTreeNode, OFTrue>::goDown();
+
+DCMTK_EXPLICIT_SPECIALIZATION DCMTK_DCMSR_EXPORT
+size_t DSRTreeNodeCursor<DSRDocumentTreeNode, OFTrue>::iterate(const OFBool searchIntoSub);
+
+
+#endif
diff --git a/dcmsr/include/dcmtk/dcmsr/dsrdoc.h b/dcmsr/include/dcmtk/dcmsr/dsrdoc.h
index b44d952..3a0df65 100644
--- a/dcmsr/include/dcmtk/dcmsr/dsrdoc.h
+++ b/dcmsr/include/dcmtk/dcmsr/dsrdoc.h
@@ -32,6 +32,15 @@
#include "dcmtk/dcmsr/dsrrefin.h"
#include "dcmtk/dcmsr/dsrcsidl.h"
+#include "dcmtk/dcmdata/dcvrcs.h"
+#include "dcmtk/dcmdata/dcvrda.h"
+#include "dcmtk/dcmdata/dcvris.h"
+#include "dcmtk/dcmdata/dcvrlo.h"
+#include "dcmtk/dcmdata/dcvrpn.h"
+#include "dcmtk/dcmdata/dcvrsh.h"
+#include "dcmtk/dcmdata/dcvrtm.h"
+#include "dcmtk/dcmdata/dcvrui.h"
+
#include "dcmtk/ofstd/ofstream.h"
@@ -246,7 +255,7 @@ class DCMTK_DCMSR_EXPORT DSRDocument
virtual E_CharacterSet getSpecificCharacterSetType() const;
/** set specific character set type.
- * The DICOM defined term (see SpecificCharacterSet) is set accordingly.
+ * The DICOM defined term (see member variable SpecificCharacterSet) is set accordingly.
** @return status, EC_Normal if successful, an error code otherwise
*/
virtual OFCondition setSpecificCharacterSetType(const E_CharacterSet characterSet);
@@ -671,7 +680,7 @@ class DCMTK_DCMSR_EXPORT DSRDocument
* defined by the DICOM standard or not supported by this class, e.g. when no mapping
* to the character set names needed for HTML/XHTML or XML output is defined.
* If needed, check the return value of the method getSpecificCharacterSetType() for
- * DSRTypes::CS_unknown after calling this method.
+ * DSRTypes::CS_invalid or DSRTypes::CS_unknown after calling this method.
** @param value value to be set (single or multiple values) or "" for no value
* @param check check 'value' for conformance with VR (CS) and VM (1-n) if enabled
** @return status, EC_Normal if successful, an error code otherwise
@@ -1169,6 +1178,11 @@ class DCMTK_DCMSR_EXPORT DSRDocument
OFCondition checkDatasetForReading(DcmItem &dataset,
E_DocumentType &documentType);
+ /** get current value of specific character set
+ ** @return pointer to character string (never NULL)
+ */
+ const char *getSpecificCharacterSet() const;
+
/** update various DICOM attributes.
* (e.g. set the modality and SOP class UID, generate a new Study, Series and SOP instance UID
* if required, set date/time values, etc.)
diff --git a/dcmsr/include/dcmtk/dcmsr/dsrdocst.h b/dcmsr/include/dcmtk/dcmsr/dsrdocst.h
index af6f671..14fb69b 100644
--- a/dcmsr/include/dcmtk/dcmsr/dsrdocst.h
+++ b/dcmsr/include/dcmtk/dcmsr/dsrdocst.h
@@ -28,10 +28,10 @@
#include "dcmtk/dcmsr/dsrtree.h"
#include "dcmtk/dcmsr/dsrdoctn.h"
+#include "dcmtk/dcmsr/dsrdncsr.h"
#include "dcmtk/dcmsr/dsrcitem.h"
#include "dcmtk/ofstd/ofmem.h"
-#include "dcmtk/dcmdata/dcitem.h"
/*------------------------*
@@ -158,13 +158,14 @@ class DCMTK_DCMSR_EXPORT DSRDocumentSubTree
/** print current SR document tree to specified output stream
** @param stream output stream
* @param flags optional flag used to customize the output (see DSRTypes::PF_xxx)
- * @param posCounter optional pointer to position counter that should be used
- * for line indentation or numbering of nested content items
+ * @param posCounter optional pointer to position counter that should be used to
+ * initialize the counter for line indentation or numbering of
+ * nested content items
** @return status, EC_Normal if successful, an error code otherwise
*/
virtual OFCondition print(STD_NAMESPACE ostream &stream,
const size_t flags = 0,
- DSRPositionCounter *posCounter = NULL);
+ const DSRPositionCounter *posCounter = NULL);
/** write current SR document tree in XML format
** @param stream output stream to which the XML document is written
@@ -180,6 +181,35 @@ class DCMTK_DCMSR_EXPORT DSRDocumentSubTree
*/
virtual DSRContentItem &getCurrentContentItem();
+ /** get read-only access to current node (content item)
+ ** @return pointer to current node (might be NULL)
+ */
+ virtual const DSRDocumentTreeNode *getCurrentNode() const;
+
+ /** get a cursor to the root node of this document tree.
+ * This cursor can be used to iterate over the nodes of the document tree without
+ * changing the internal cursor. Please note that the cursor might become invalid,
+ * e.g. by pointing to a non-existing node if the content of the document tree is
+ * modified after the cursor has been retrieved.
+ * Included sub-templates are not supported by this type of cursor, i.e. the subtree
+ * that is managed by an instance of DSRIncludedTemplateTreeNode is not iterated.
+ ** @param cursor reference to variable where the cursor is stored
+ ** @return OFTrue is the returned 'cursor' is valid, OFFalse otherwise
+ */
+ virtual OFBool getCursorToRootNode(DSRDocumentTreeNodeCursor &cursor) const;
+
+ /** get a cursor to the root node of this document tree.
+ * This cursor can be used to iterate over the nodes of the document tree without
+ * changing the internal cursor. Please note that the cursor might become invalid,
+ * e.g. by pointing to a non-existing node if the content of the document tree is
+ * modified after the cursor has been retrieved.
+ * This type of cursor also supports included sub-templates, i.e. the subtree that
+ * is managed by an instance of DSRIncludedTemplateTreeNode is also iterated.
+ ** @param cursor reference to variable where the cursor is stored
+ ** @return OFTrue is the returned 'cursor' is valid, OFFalse otherwise
+ */
+ virtual OFBool getCursorToRootNode(DSRIncludedTemplateNodeCursor &cursor) const;
+
/** count number of content items (nodes) in the document tree.
* This method iterates over all nodes that are stored in the document tree.
* By default, included sub-templates are counted as a single node (see options).
@@ -365,10 +395,14 @@ class DCMTK_DCMSR_EXPORT DSRDocumentSubTree
* Internally, this method calls checkByReferenceRelationships() with the 'mode'
* parameter being DSRTypes::CM_updatePositionString. It should be called before
* this subtree is cloned in order to make sure that the by-reference relationships
- * (if any) still work on the cloned subtree.
+ * (if any) still work on the cloned subtree. This method should also be called
+ * before accessing the position string of a referenced content item, see
+ * DSRByReferenceTreeNode::getReferencedContentItem().
+ ** @param updateIncludedTemplates optional flag indicating whether to also update
+ * the subtrees managed by included sub-templates
** @return status, EC_Normal if successful, an error code otherwise
*/
- virtual OFCondition updateByReferenceRelationships();
+ virtual OFCondition updateByReferenceRelationships(const OFBool updateIncludedTemplates = OFFalse);
/** check whether specified subtree can be inserted at the current position, i.e.\ added
* to the current content item. Internally, the method canAddContentItem() is used for
@@ -548,6 +582,12 @@ class DCMTK_DCMSR_EXPORT DSRDocumentSubTree
*/
void swap(DSRDocumentSubTree &tree);
+ /** get pointer to current node.
+ * Hide this inherited method from the public interface.
+ ** @return pointer to current node (might be NULL)
+ */
+ virtual DSRDocumentTreeNode *getNode() const;
+
/** add new node to the current one.
* Please note that no copy of the given node is created. Therefore, the node
* has to be created with new() - do not use a reference to a local variable.
@@ -636,15 +676,19 @@ class DCMTK_DCMSR_EXPORT DSRDocumentSubTree
* identify nodes) can be updated.
* Please note that the checking modes DSRTypes::CM_updatePositionString and
* DSRTypes::CM_updateNodeID are mutually exclusive.
- ** @param mode mode used to customize the checking process (see DSRTypes::CM_xxx)
- * @param flags flag used to customize the reading process (see DSRTypes::RF_xxx)
+ ** @tparam T_Cursor template type used for the cursor iterating the document (sub)tree
+ ** @param mode mode used to customize the checking process (see DSRTypes::CM_xxx)
+ * @param flags flag used to customize the reading (see DSRTypes::RF_xxx) and/or
+ * printing process (see DSRTypes::PF_xxx). Conflicting definitions
+ * are avoided using the appropriate bit mask (see DSRTypes::CB_xxx).
** @return status, EC_Normal if successful, an error code otherwise
*/
- virtual OFCondition checkByReferenceRelationships(const size_t mode = 0,
- const size_t flags = 0);
+ template <typename T_Cursor>
+ OFCondition checkByReferenceRelationships(const size_t mode = 0,
+ const size_t flags = 0);
/** reset flag for all content items whether they are target of a by-reference relationship.
- * This function calls 'setReferenceTarget(OFFalse)' for all content items.
+ * This function calls 'setReferenceTarget(OFFalse)' for all content items in the tree.
*/
virtual void resetReferenceTargetFlag();
diff --git a/dcmsr/include/dcmtk/dcmsr/dsrdoctn.h b/dcmsr/include/dcmtk/dcmsr/dsrdoctn.h
index 7e4f7f6..86ee8cf 100644
--- a/dcmsr/include/dcmtk/dcmsr/dsrdoctn.h
+++ b/dcmsr/include/dcmtk/dcmsr/dsrdoctn.h
@@ -28,7 +28,6 @@
#include "dcmtk/dcmsr/dsrtree.h"
#include "dcmtk/dcmsr/dsrcodvl.h"
-#include "dcmtk/dcmdata/dcitem.h"
/*-----------------------*
@@ -38,13 +37,6 @@
class DSRIODConstraintChecker;
-/*-------------------*
- * type definition *
- *-------------------*/
-
-typedef DSRTreeNodeCursor<DSRDocumentTreeNode> DSRDocumentTreeNodeCursor;
-
-
/*---------------------*
* class declaration *
*---------------------*/
@@ -56,7 +48,8 @@ class DCMTK_DCMSR_EXPORT DSRDocumentTreeNode
{
// allow direct access to protected methods
friend class DSRTree<DSRDocumentTreeNode>;
- friend class DSRTreeNodeCursor<DSRDocumentTreeNode>;
+ friend class DSRTreeNodeCursor<DSRDocumentTreeNode, OFFalse>;
+ friend class DSRTreeNodeCursor<DSRDocumentTreeNode, OFTrue>;
// allow access to getConceptNamePtr()
friend class DSRContentItem;
diff --git a/dcmsr/include/dcmtk/dcmsr/dsrdoctr.h b/dcmsr/include/dcmtk/dcmsr/dsrdoctr.h
index 06798fb..e5b76ae 100644
--- a/dcmsr/include/dcmtk/dcmsr/dsrdoctr.h
+++ b/dcmsr/include/dcmtk/dcmsr/dsrdoctr.h
@@ -28,8 +28,6 @@
#include "dcmtk/dcmsr/dsrdocst.h"
-#include "dcmtk/dcmdata/dcitem.h"
-
/*---------------------*
* class declaration *
diff --git a/dcmsr/include/dcmtk/dcmsr/dsrnumvl.h b/dcmsr/include/dcmtk/dcmsr/dsrnumvl.h
index 7f4d599..a4d9a0d 100644
--- a/dcmsr/include/dcmtk/dcmsr/dsrnumvl.h
+++ b/dcmsr/include/dcmtk/dcmsr/dsrnumvl.h
@@ -28,7 +28,9 @@
#include "dcmtk/dcmsr/dsrcodvl.h"
-#include "dcmtk/ofstd/ofstring.h"
+#include "dcmtk/dcmdata/dcvrfd.h"
+#include "dcmtk/dcmdata/dcvrsl.h"
+#include "dcmtk/dcmdata/dcvrul.h"
/*---------------------*
diff --git a/dcmsr/include/dcmtk/dcmsr/dsrposcn.h b/dcmsr/include/dcmtk/dcmsr/dsrposcn.h
index 0768b9e..a994275 100644
--- a/dcmsr/include/dcmtk/dcmsr/dsrposcn.h
+++ b/dcmsr/include/dcmtk/dcmsr/dsrposcn.h
@@ -26,11 +26,11 @@
#include "dcmtk/config/osconfig.h" /* make sure OS specific configuration is included first */
+#include "dcmtk/dcmsr/dsdefine.h"
+
#include "dcmtk/ofstd/ofstring.h"
#include "dcmtk/ofstd/oflist.h"
-#include "dcmtk/dcmsr/dsdefine.h"
-
/*---------------------*
* class declaration *
@@ -42,9 +42,11 @@ class DCMTK_DCMSR_EXPORT DSRPositionCounter
{
public:
- /** default constructor
+ /** (default) constructor
+ ** @param flags optional flags used to customize the processing of the counter.
+ * These flags are only stored but not evaluated by this class.
*/
- DSRPositionCounter();
+ DSRPositionCounter(const size_t flags = 0);
/** copy constructor
** @param counter object to be copied
@@ -97,8 +99,11 @@ class DCMTK_DCMSR_EXPORT DSRPositionCounter
/** initialize the position counter
** @param valid flag specifying whether the counter should be initialized as
* valid (default) or invalid
+ * @param flags optional flags used to customize the processing of the counter.
+ * These flags are only stored but not evaluated by this class.
*/
- void initialize(const OFBool valid = OFTrue);
+ void initialize(const OFBool valid = OFTrue,
+ const size_t flags = 0);
/** check whether position counter is valid (i.e.\ has been initialized)
** @return OFTrue if valid, OFFalse otherwise
@@ -120,6 +125,14 @@ class DCMTK_DCMSR_EXPORT DSRPositionCounter
*/
OFBool goDown();
+ /** get specified flags that can be used to customize the counter
+ ** @return flags used to customize the counter
+ */
+ inline size_t getFlags() const
+ {
+ return Flags;
+ }
+
/** get current level of the position counter.
* The top most (root) level is 1, the next lower level is 2, etc.
** @return number of the current level if valid, 0 otherwise
@@ -146,6 +159,8 @@ class DCMTK_DCMSR_EXPORT DSRPositionCounter
size_t Position;
/// list of position counters in upper levels
OFList<size_t> PositionList;
+ /// flags used to customize the counter
+ size_t Flags;
};
diff --git a/dcmsr/include/dcmtk/dcmsr/dsrreftn.h b/dcmsr/include/dcmtk/dcmsr/dsrreftn.h
index 60bdf4e..deece1a 100644
--- a/dcmsr/include/dcmtk/dcmsr/dsrreftn.h
+++ b/dcmsr/include/dcmtk/dcmsr/dsrreftn.h
@@ -93,14 +93,15 @@ class DCMTK_DCMSR_EXPORT DSRByReferenceTreeNode
*/
virtual OFBool isValid() const;
- /** check whether the value of the content item, i.e.\ the reference (which has been checked
- * from outside of this class), is valid
+ /** check whether the value of the content item, i.e.\ the reference (which has been
+ * checked from outside of this class), is valid
** @return OFTrue if the value is valid, OFFalse otherwise
*/
virtual OFBool hasValidValue() const;
/** print content item.
- * A typical output looks like this: inferred from 1.2.3
+ * A typical output looks like this: inferred from 1.2.3. If the position string
+ * of the referenced target content item is empty, a "?" (question mark) is printed.
** @param stream output stream to which the content item should be printed
* @param flags flag used to customize the output (see DSRTypes::PF_xxx)
** @return status, EC_Normal if successful, an error code otherwise
diff --git a/dcmsr/include/dcmtk/dcmsr/dsrrtpl.h b/dcmsr/include/dcmtk/dcmsr/dsrrtpl.h
index a38447f..fa88f04 100644
--- a/dcmsr/include/dcmtk/dcmsr/dsrrtpl.h
+++ b/dcmsr/include/dcmtk/dcmsr/dsrrtpl.h
@@ -161,6 +161,7 @@ class DCMTK_DCMSR_EXPORT DSRRootTemplate
using DSRDocumentTree::gotoAnnotatedNode;
using DSRDocumentTree::gotoNextAnnotatedNode;
using DSRDocumentTree::getCurrentContentItem;
+ using DSRDocumentTree::updateByReferenceRelationships;
protected:
diff --git a/dcmsr/include/dcmtk/dcmsr/dsrsoprf.h b/dcmsr/include/dcmtk/dcmsr/dsrsoprf.h
index 92f1cb4..1d4d2f0 100644
--- a/dcmsr/include/dcmtk/dcmsr/dsrsoprf.h
+++ b/dcmsr/include/dcmtk/dcmsr/dsrsoprf.h
@@ -27,13 +27,6 @@
#include "dcmtk/config/osconfig.h" /* make sure OS specific configuration is included first */
-#include "dcmtk/ofstd/oflist.h"
-#include "dcmtk/ofstd/ofstring.h"
-#include "dcmtk/ofstd/ofcond.h"
-
-#include "dcmtk/dcmdata/dcitem.h"
-#include "dcmtk/dcmdata/dctagkey.h"
-
#include "dcmtk/dcmsr/dsrtypes.h"
#include "dcmtk/dcmsr/dsrcodvl.h"
@@ -114,6 +107,16 @@ class DCMTK_DCMSR_EXPORT DSRSOPInstanceReferenceList
OFCondition writeXML(STD_NAMESPACE ostream &stream,
const size_t flags) const;
+ /** set specific character set, which is used for checking the affected element values.
+ * Please note that this method does not return an error if the given 'value' is not
+ * defined by the DICOM standard or not supported by this implementation.
+ ** @param value value to be set (single or multiple values) or "" for no value
+ * @param check check 'value' for conformance with VR (CS) and VM (1-n) if enabled
+ ** @return status, EC_Normal if successful, an error code otherwise
+ */
+ OFCondition setSpecificCharacterSet(const OFString &value,
+ const OFBool check = OFTrue);
+
/** add the specified item to the list of references.
* Before adding the item, the given UID values are usually checked. If one of the
* values is invalid, nothing is done but an error is returned. If successful, the
@@ -621,6 +624,8 @@ class DCMTK_DCMSR_EXPORT DSRSOPInstanceReferenceList
OFList<StudyStruct *> StudyList;
/// internal cursor to current (selected) list item
OFListIterator(StudyStruct *) Iterator;
+ /// specific character set used for checking purposes
+ OFString SpecificCharacterSet;
// default constructor - not implemented!
DSRSOPInstanceReferenceList();
diff --git a/dcmsr/include/dcmtk/dcmsr/dsrstpl.h b/dcmsr/include/dcmtk/dcmsr/dsrstpl.h
index 6897418..954ad58 100644
--- a/dcmsr/include/dcmtk/dcmsr/dsrstpl.h
+++ b/dcmsr/include/dcmtk/dcmsr/dsrstpl.h
@@ -45,6 +45,8 @@ class DCMTK_DCMSR_EXPORT DSRSubTemplate
: protected DSRDocumentSubTree,
public DSRTemplateCommon
{
+ // allow direct access to inherited getRoot() method
+ friend class DSRTreeNodeCursor<DSRDocumentTreeNode, OFTrue>;
public:
@@ -151,6 +153,7 @@ class DCMTK_DCMSR_EXPORT DSRSubTemplate
using DSRDocumentSubTree::gotoAnnotatedNode;
using DSRDocumentSubTree::gotoNextAnnotatedNode;
using DSRDocumentSubTree::getCurrentContentItem;
+ using DSRDocumentSubTree::updateByReferenceRelationships;
protected:
diff --git a/dcmsr/include/dcmtk/dcmsr/dsrstrvl.h b/dcmsr/include/dcmtk/dcmsr/dsrstrvl.h
index ba0223a..857d2a1 100644
--- a/dcmsr/include/dcmtk/dcmsr/dsrstrvl.h
+++ b/dcmsr/include/dcmtk/dcmsr/dsrstrvl.h
@@ -28,8 +28,6 @@
#include "dcmtk/dcmsr/dsrtypes.h"
-#include "dcmtk/ofstd/ofstring.h"
-
/*---------------------*
* class declaration *
diff --git a/dcmsr/include/dcmtk/dcmsr/dsrtcodt.h b/dcmsr/include/dcmtk/dcmsr/dsrtcodt.h
index 6862edf..2565a57 100644
--- a/dcmsr/include/dcmtk/dcmsr/dsrtcodt.h
+++ b/dcmsr/include/dcmtk/dcmsr/dsrtcodt.h
@@ -29,8 +29,6 @@
#include "dcmtk/dcmsr/dsrtypes.h"
#include "dcmtk/dcmsr/dsrtlist.h"
-#include "dcmtk/ofstd/ofstring.h"
-
/*---------------------*
* class declaration *
diff --git a/dcmsr/include/dcmtk/dcmsr/dsrtlist.h b/dcmsr/include/dcmtk/dcmsr/dsrtlist.h
index 836a0d3..ed58b35 100644
--- a/dcmsr/include/dcmtk/dcmsr/dsrtlist.h
+++ b/dcmsr/include/dcmtk/dcmsr/dsrtlist.h
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2000-2014, OFFIS e.V.
+ * Copyright (C) 2000-2016, OFFIS e.V.
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation were developed by
@@ -26,10 +26,10 @@
#include "dcmtk/config/osconfig.h" /* make sure OS specific configuration is included first */
-#include "dcmtk/ofstd/oflist.h"
-
#include "dcmtk/dcmdata/dcerror.h"
+#include "dcmtk/ofstd/oflist.h"
+
/*---------------------*
* class declaration *
diff --git a/dcmsr/include/dcmtk/dcmsr/dsrtnant.h b/dcmsr/include/dcmtk/dcmsr/dsrtnant.h
index 0212083..18bb4ed 100644
--- a/dcmsr/include/dcmtk/dcmsr/dsrtnant.h
+++ b/dcmsr/include/dcmtk/dcmsr/dsrtnant.h
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2015, J. Riesmeier, Oldenburg, Germany
+ * Copyright (C) 2015-2016, J. Riesmeier, Oldenburg, Germany
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation are maintained by
@@ -26,8 +26,6 @@
#include "dcmtk/config/osconfig.h" /* make sure OS specific configuration is included first */
-#include "dcmtk/ofstd/ofstring.h"
-
#include "dcmtk/dcmsr/dsdefine.h"
#include "dcmtk/dcmsr/dsrtypes.h"
diff --git a/dcmsr/include/dcmtk/dcmsr/dsrtncsr.h b/dcmsr/include/dcmtk/dcmsr/dsrtncsr.h
index 4d731df..208764f 100644
--- a/dcmsr/include/dcmtk/dcmsr/dsrtncsr.h
+++ b/dcmsr/include/dcmtk/dcmsr/dsrtncsr.h
@@ -26,13 +26,12 @@
#include "dcmtk/config/osconfig.h" /* make sure OS specific configuration is included first */
-#include "dcmtk/ofstd/ofstack.h"
-
-#include "dcmtk/dcmsr/dsdefine.h"
#include "dcmtk/dcmsr/dsrtypes.h"
#include "dcmtk/dcmsr/dsrposcn.h"
#include "dcmtk/dcmsr/dsrtnant.h"
+#include "dcmtk/ofstd/ofstack.h"
+
/*-----------------------*
* forward declaration *
@@ -45,9 +44,13 @@ class DSRTreeNode;
* class declaration *
*---------------------*/
-/** Class implementing a tree node cursor
+/** Class implementing a tree node cursor.
+ ** @tparam T template type used for the tree node pointers
+ * @tparam B boolean flag that indicates whether to treat certain tree nodes
+ * differently (depends on the particular implementation)
*/
-template<typename T = DSRTreeNode> class DSRTreeNodeCursor
+template<typename T = DSRTreeNode, OFBool B = OFFalse>
+class DSRTreeNodeCursor
{
public:
@@ -59,7 +62,7 @@ template<typename T = DSRTreeNode> class DSRTreeNodeCursor
/** copy constructor
** @param cursor object to be copied
*/
- DSRTreeNodeCursor(const DSRTreeNodeCursor<T> &cursor);
+ DSRTreeNodeCursor(const DSRTreeNodeCursor<T, B> &cursor);
/** constructor.
* See comments on setCursor(T*) method.
@@ -78,14 +81,14 @@ template<typename T = DSRTreeNode> class DSRTreeNodeCursor
** @param cursor object to be copied
** @return reference to modified cursor (this object)
*/
- DSRTreeNodeCursor<T> &operator=(const DSRTreeNodeCursor<T> &cursor);
+ DSRTreeNodeCursor<T, B> &operator=(const DSRTreeNodeCursor<T, B> &cursor);
/** assignment operator.
* See comments on setCursor(T*) method.
** @param node node to which the cursor should be set
** @return reference to modified cursor (this object)
*/
- DSRTreeNodeCursor<T> &operator=(T *node);
+ DSRTreeNodeCursor<T, B> &operator=(T *node);
/** clear all member variables.
* The cursor becomes invalid afterwards (same state as after default construction).
@@ -273,12 +276,12 @@ template<typename T = DSRTreeNode> class DSRTreeNodeCursor
/** get cursor
** @return reference to cursor (this object)
*/
- inline const DSRTreeNodeCursor<T> &getCursor() const;
+ inline const DSRTreeNodeCursor<T, B> &getCursor() const;
/** set cursor to specified object
** @param cursor object to set this cursor to
*/
- inline void setCursor(const DSRTreeNodeCursor<T> &cursor);
+ inline void setCursor(const DSRTreeNodeCursor<T, B> &cursor);
/** set cursor to specified node.
* Clears the internal position counter and sets the position of the current level
@@ -302,8 +305,8 @@ template<typename T = DSRTreeNode> class DSRTreeNodeCursor
* implementation *
*------------------*/
-template<typename T>
-DSRTreeNodeCursor<T>::DSRTreeNodeCursor()
+template<typename T, OFBool B>
+DSRTreeNodeCursor<T, B>::DSRTreeNodeCursor()
: NodeCursor(NULL),
NodeCursorStack(),
Position()
@@ -311,8 +314,8 @@ DSRTreeNodeCursor<T>::DSRTreeNodeCursor()
}
-template<typename T>
-DSRTreeNodeCursor<T>::DSRTreeNodeCursor(const DSRTreeNodeCursor<T> &cursor)
+template<typename T, OFBool B>
+DSRTreeNodeCursor<T, B>::DSRTreeNodeCursor(const DSRTreeNodeCursor<T, B> &cursor)
: NodeCursor(cursor.NodeCursor),
NodeCursorStack(cursor.NodeCursorStack),
Position(cursor.Position)
@@ -320,45 +323,49 @@ DSRTreeNodeCursor<T>::DSRTreeNodeCursor(const DSRTreeNodeCursor<T> &cursor)
}
-template<typename T>
-DSRTreeNodeCursor<T>::DSRTreeNodeCursor(T *node,
- const DSRPositionCounter *position)
+template<typename T, OFBool B>
+DSRTreeNodeCursor<T, B>::DSRTreeNodeCursor(T *node,
+ const DSRPositionCounter *position)
: NodeCursor(node),
NodeCursorStack(),
Position()
{
/* check whether a valid position counter is given */
- if ((position != NULL) && position->isValid())
- Position = *position;
- else
+ if (position != NULL)
+ {
+ if (position->isValid())
+ Position = *position;
+ else
+ Position.initialize(NodeCursor != NULL, position->getFlags());
+ } else
Position.initialize(NodeCursor != NULL);
}
-template<typename T>
-DSRTreeNodeCursor<T>::~DSRTreeNodeCursor()
+template<typename T, OFBool B>
+DSRTreeNodeCursor<T, B>::~DSRTreeNodeCursor()
{
}
-template<typename T>
-DSRTreeNodeCursor<T> &DSRTreeNodeCursor<T>::operator=(const DSRTreeNodeCursor<T> &cursor)
+template<typename T, OFBool B>
+DSRTreeNodeCursor<T, B> &DSRTreeNodeCursor<T, B>::operator=(const DSRTreeNodeCursor<T, B> &cursor)
{
setCursor(cursor);
return *this;
}
-template<typename T>
-DSRTreeNodeCursor<T> &DSRTreeNodeCursor<T>::operator=(T *node)
+template<typename T, OFBool B>
+DSRTreeNodeCursor<T, B> &DSRTreeNodeCursor<T, B>::operator=(T *node)
{
setCursor(node);
return *this;
}
-template<typename T>
-void DSRTreeNodeCursor<T>::clear()
+template<typename T, OFBool B>
+void DSRTreeNodeCursor<T, B>::clear()
{
NodeCursor = NULL;
clearNodeCursorStack();
@@ -366,29 +373,29 @@ void DSRTreeNodeCursor<T>::clear()
}
-template<typename T>
-OFBool DSRTreeNodeCursor<T>::isValid() const
+template<typename T, OFBool B>
+OFBool DSRTreeNodeCursor<T, B>::isValid() const
{
return (NodeCursor != NULL);
}
-template<typename T>
-void DSRTreeNodeCursor<T>::clearNodeCursorStack()
+template<typename T, OFBool B>
+void DSRTreeNodeCursor<T, B>::clearNodeCursorStack()
{
while (!NodeCursorStack.empty())
NodeCursorStack.pop();
}
-template<typename T>
-size_t DSRTreeNodeCursor<T>::countChildNodes(const OFBool searchIntoSub) const
+template<typename T, OFBool B>
+size_t DSRTreeNodeCursor<T, B>::countChildNodes(const OFBool searchIntoSub) const
{
size_t count = 0;
if (NodeCursor != NULL)
{
/* do we have any children at all? */
- DSRTreeNodeCursor<T> cursor(NodeCursor->getDown());
+ DSRTreeNodeCursor<T, B> cursor(NodeCursor->getDown());
if (cursor.isValid())
{
/* iterate over all child nodes */
@@ -401,50 +408,50 @@ size_t DSRTreeNodeCursor<T>::countChildNodes(const OFBool searchIntoSub) const
}
-template<typename T>
-OFBool DSRTreeNodeCursor<T>::hasParentNode() const
+template<typename T, OFBool B>
+OFBool DSRTreeNodeCursor<T, B>::hasParentNode() const
{
return ((NodeCursor != NULL) && !NodeCursorStack.empty());
}
-template<typename T>
-OFBool DSRTreeNodeCursor<T>::hasChildNodes() const
+template<typename T, OFBool B>
+OFBool DSRTreeNodeCursor<T, B>::hasChildNodes() const
{
return (getChildNode() != NULL);
}
-template<typename T>
-OFBool DSRTreeNodeCursor<T>::hasPreviousNode() const
+template<typename T, OFBool B>
+OFBool DSRTreeNodeCursor<T, B>::hasPreviousNode() const
{
return (getPreviousNode() != NULL);
}
-template<typename T>
-OFBool DSRTreeNodeCursor<T>::hasNextNode() const
+template<typename T, OFBool B>
+OFBool DSRTreeNodeCursor<T, B>::hasNextNode() const
{
return (getNextNode() != NULL);
}
-template<typename T>
-OFBool DSRTreeNodeCursor<T>::hasSiblingNodes() const
+template<typename T, OFBool B>
+OFBool DSRTreeNodeCursor<T, B>::hasSiblingNodes() const
{
return (getPreviousNode() != NULL) || (getNextNode() != NULL);
}
-template<typename T>
-T *DSRTreeNodeCursor<T>::getNode() const
+template<typename T, OFBool B>
+T *DSRTreeNodeCursor<T, B>::getNode() const
{
return NodeCursor;
}
-template<typename T>
-const T *DSRTreeNodeCursor<T>::getParentNode() const
+template<typename T, OFBool B>
+const T *DSRTreeNodeCursor<T, B>::getParentNode() const
{
T *node = NULL;
if (hasParentNode())
@@ -453,8 +460,8 @@ const T *DSRTreeNodeCursor<T>::getParentNode() const
}
-template<typename T>
-const T *DSRTreeNodeCursor<T>::getChildNode() const
+template<typename T, OFBool B>
+const T *DSRTreeNodeCursor<T, B>::getChildNode() const
{
T *node = NULL;
if (NodeCursor != NULL)
@@ -463,8 +470,8 @@ const T *DSRTreeNodeCursor<T>::getChildNode() const
}
-template<typename T>
-const T *DSRTreeNodeCursor<T>::getPreviousNode() const
+template<typename T, OFBool B>
+const T *DSRTreeNodeCursor<T, B>::getPreviousNode() const
{
T *node = NULL;
if (NodeCursor != NULL)
@@ -473,8 +480,8 @@ const T *DSRTreeNodeCursor<T>::getPreviousNode() const
}
-template<typename T>
-const T *DSRTreeNodeCursor<T>::getNextNode() const
+template<typename T, OFBool B>
+const T *DSRTreeNodeCursor<T, B>::getNextNode() const
{
T *node = NULL;
if (NodeCursor != NULL)
@@ -483,15 +490,15 @@ const T *DSRTreeNodeCursor<T>::getNextNode() const
}
-template<typename T>
-const DSRTreeNodeCursor<T> &DSRTreeNodeCursor<T>::getCursor() const
+template<typename T, OFBool B>
+const DSRTreeNodeCursor<T, B> &DSRTreeNodeCursor<T, B>::getCursor() const
{
return *this;
}
-template<typename T>
-void DSRTreeNodeCursor<T>::setCursor(const DSRTreeNodeCursor<T> &cursor)
+template<typename T, OFBool B>
+void DSRTreeNodeCursor<T, B>::setCursor(const DSRTreeNodeCursor<T, B> &cursor)
{
NodeCursor = cursor.NodeCursor;
NodeCursorStack = cursor.NodeCursorStack;
@@ -499,8 +506,8 @@ void DSRTreeNodeCursor<T>::setCursor(const DSRTreeNodeCursor<T> &cursor)
}
-template<typename T>
-size_t DSRTreeNodeCursor<T>::setCursor(T *node)
+template<typename T, OFBool B>
+size_t DSRTreeNodeCursor<T, B>::setCursor(T *node)
{
size_t nodeID = 0;
NodeCursor = node;
@@ -512,8 +519,8 @@ size_t DSRTreeNodeCursor<T>::setCursor(T *node)
}
-template<typename T>
-size_t DSRTreeNodeCursor<T>::gotoFirst()
+template<typename T, OFBool B>
+size_t DSRTreeNodeCursor<T, B>::gotoFirst()
{
size_t nodeID = 0;
if (NodeCursor != NULL)
@@ -529,8 +536,8 @@ size_t DSRTreeNodeCursor<T>::gotoFirst()
}
-template<typename T>
-size_t DSRTreeNodeCursor<T>::gotoLast()
+template<typename T, OFBool B>
+size_t DSRTreeNodeCursor<T, B>::gotoLast()
{
size_t nodeID = 0;
if (NodeCursor != NULL)
@@ -546,8 +553,8 @@ size_t DSRTreeNodeCursor<T>::gotoLast()
}
-template<typename T>
-size_t DSRTreeNodeCursor<T>::gotoPrevious()
+template<typename T, OFBool B>
+size_t DSRTreeNodeCursor<T, B>::gotoPrevious()
{
size_t nodeID = 0;
if (NodeCursor != NULL)
@@ -563,8 +570,8 @@ size_t DSRTreeNodeCursor<T>::gotoPrevious()
}
-template<typename T>
-size_t DSRTreeNodeCursor<T>::gotoNext()
+template<typename T, OFBool B>
+size_t DSRTreeNodeCursor<T, B>::gotoNext()
{
size_t nodeID = 0;
if (NodeCursor != NULL)
@@ -580,8 +587,8 @@ size_t DSRTreeNodeCursor<T>::gotoNext()
}
-template<typename T>
-size_t DSRTreeNodeCursor<T>::goUp()
+template<typename T, OFBool B>
+size_t DSRTreeNodeCursor<T, B>::goUp()
{
size_t nodeID = 0;
if (NodeCursor != NULL)
@@ -602,8 +609,8 @@ size_t DSRTreeNodeCursor<T>::goUp()
}
-template<typename T>
-size_t DSRTreeNodeCursor<T>::goDown()
+template<typename T, OFBool B>
+size_t DSRTreeNodeCursor<T, B>::goDown()
{
size_t nodeID = 0;
if (NodeCursor != NULL)
@@ -620,22 +627,22 @@ size_t DSRTreeNodeCursor<T>::goDown()
}
-template<typename T>
-size_t DSRTreeNodeCursor<T>::gotoParent()
+template<typename T, OFBool B>
+size_t DSRTreeNodeCursor<T, B>::gotoParent()
{
return goUp();
}
-template<typename T>
-size_t DSRTreeNodeCursor<T>::gotoChild()
+template<typename T, OFBool B>
+size_t DSRTreeNodeCursor<T, B>::gotoChild()
{
return goDown();
}
-template<typename T>
-size_t DSRTreeNodeCursor<T>::iterate(const OFBool searchIntoSub)
+template<typename T, OFBool B>
+size_t DSRTreeNodeCursor<T, B>::iterate(const OFBool searchIntoSub)
{
size_t nodeID = 0;
if (NodeCursor != NULL)
@@ -680,8 +687,8 @@ size_t DSRTreeNodeCursor<T>::iterate(const OFBool searchIntoSub)
}
-template<typename T>
-size_t DSRTreeNodeCursor<T>::gotoNode(const size_t searchID)
+template<typename T, OFBool B>
+size_t DSRTreeNodeCursor<T, B>::gotoNode(const size_t searchID)
{
size_t nodeID = 0;
if (searchID > 0)
@@ -697,9 +704,9 @@ size_t DSRTreeNodeCursor<T>::gotoNode(const size_t searchID)
}
-template<typename T>
-size_t DSRTreeNodeCursor<T>::gotoNode(const OFString &position,
- const char separator)
+template<typename T, OFBool B>
+size_t DSRTreeNodeCursor<T, B>::gotoNode(const OFString &position,
+ const char separator)
{
size_t nodeID = 0;
if (!position.empty())
@@ -744,8 +751,8 @@ size_t DSRTreeNodeCursor<T>::gotoNode(const OFString &position,
}
-template<typename T>
-size_t DSRTreeNodeCursor<T>::gotoNode(const DSRTreeNodeAnnotation &annotation)
+template<typename T, OFBool B>
+size_t DSRTreeNodeCursor<T, B>::gotoNode(const DSRTreeNodeAnnotation &annotation)
{
size_t nodeID = 0;
if (!annotation.isEmpty())
@@ -761,8 +768,8 @@ size_t DSRTreeNodeCursor<T>::gotoNode(const DSRTreeNodeAnnotation &annotation)
}
-template<typename T>
-size_t DSRTreeNodeCursor<T>::getNodeID() const
+template<typename T, OFBool B>
+size_t DSRTreeNodeCursor<T, B>::getNodeID() const
{
size_t nodeID = 0;
if (NodeCursor != NULL)
@@ -771,8 +778,8 @@ size_t DSRTreeNodeCursor<T>::getNodeID() const
}
-template<typename T>
-size_t DSRTreeNodeCursor<T>::getLevel() const
+template<typename T, OFBool B>
+size_t DSRTreeNodeCursor<T, B>::getLevel() const
{
size_t level = 0;
if (NodeCursor != NULL)
@@ -781,16 +788,16 @@ size_t DSRTreeNodeCursor<T>::getLevel() const
}
-template<typename T>
-DSRPositionCounter &DSRTreeNodeCursor<T>::getPositionCounter()
+template<typename T, OFBool B>
+DSRPositionCounter &DSRTreeNodeCursor<T, B>::getPositionCounter()
{
return Position;
}
-template<typename T>
-const OFString &DSRTreeNodeCursor<T>::getPosition(OFString &position,
- const char separator) const
+template<typename T, OFBool B>
+const OFString &DSRTreeNodeCursor<T, B>::getPosition(OFString &position,
+ const char separator) const
{
return Position.getString(position, separator);
}
diff --git a/dcmsr/include/dcmtk/dcmsr/dsrtree.h b/dcmsr/include/dcmtk/dcmsr/dsrtree.h
index 86d1b7e..aaaaabb 100644
--- a/dcmsr/include/dcmtk/dcmsr/dsrtree.h
+++ b/dcmsr/include/dcmtk/dcmsr/dsrtree.h
@@ -29,6 +29,8 @@
#include "dcmtk/dcmsr/dsrtypes.h"
#include "dcmtk/dcmsr/dsrtncsr.h"
+#include "dcmtk/ofstd/ofutil.h"
+
/*-----------------------*
* forward declaration *
diff --git a/dcmsr/include/dcmtk/dcmsr/dsrtypes.h b/dcmsr/include/dcmtk/dcmsr/dsrtypes.h
index 4eb327d..5ba54ad 100644
--- a/dcmsr/include/dcmtk/dcmsr/dsrtypes.h
+++ b/dcmsr/include/dcmtk/dcmsr/dsrtypes.h
@@ -26,15 +26,18 @@
#include "dcmtk/config/osconfig.h" /* make sure OS specific configuration is included first */
-#include "dcmtk/dcmdata/dctk.h"
+#include "dcmtk/dcmsr/dsdefine.h"
+
+#include "dcmtk/dcmdata/dcelem.h"
+#include "dcmtk/dcmdata/dcitem.h"
+#include "dcmtk/dcmdata/dcsequen.h"
#include "dcmtk/ofstd/ofstream.h"
+#include "dcmtk/ofstd/ofstring.h"
#include "dcmtk/ofstd/oftypes.h"
#include "dcmtk/ofstd/ofcond.h"
#include "dcmtk/oflog/oflog.h"
-#include "dcmtk/dcmsr/dsdefine.h"
-
// global definitions for logging mechanism provided by the oflog module
@@ -446,13 +449,16 @@ class DCMTK_DCMSR_EXPORT DSRTypes
/// do not print internal "included template" nodes (position counter is still increased)
static const size_t PF_hideIncludedTemplateNodes;
+ /// do not count internal "included template" nodes (only with PF_hideIncludedTemplateNodes)
+ static const size_t PF_dontCountIncludedTemplateNodes;
+
/// shortcut: print all codes (combines all PF_printXxxCodes flags, see above)
static const size_t PF_printAllCodes;
//@}
/** @name checkByReferenceRelationships() modes
- * These flags can be combined and passed to the checkByReferenceRelationships() method.
+ * These modes can be combined and passed to the checkByReferenceRelationships() method.
*/
//@{
@@ -467,6 +473,20 @@ class DCMTK_DCMSR_EXPORT DSRTypes
//@}
+ /** @name checkByReferenceRelationships() bit masks
+ * These bit masks are used to "filter" valid flags passed to checkByReferenceRelationships().
+ */
+ //@{
+
+ /// bit mask (filter) for valid print flags (see PF_xxx)
+ static const size_t CB_maskPrintFlags;
+
+ /// bit mask (filter) for valid read flags (see RF_xxx)
+ static const size_t CB_maskReadFlags;
+
+ //@}
+
+
// --- type definitions ---
/** SR document types
@@ -747,6 +767,8 @@ class DCMTK_DCMSR_EXPORT DSRTypes
CS_unknown = CS_invalid,
/// ISO 646 (ISO-IR 6): ASCII
CS_ASCII,
+ /// internal type used to indicate the default character set
+ CS_default = CS_ASCII,
/// ISO-IR 100: Latin alphabet No. 1
CS_Latin1,
/// ISO-IR 101: Latin alphabet No. 2
@@ -1049,7 +1071,8 @@ class DCMTK_DCMSR_EXPORT DSRTypes
*/
static E_VerificationFlag enumeratedValueToVerificationFlag(const OFString &enumeratedValue);
- /** convert DICOM defined term to character set
+ /** convert DICOM defined term to character set.
+ * An empty defined term is mapped to DSRTypes::CS_default (which is ASCII).
** @param definedTerm defined term to be converted
** @return character set if successful, DSRTypes::CS_invalid otherwise
*/
diff --git a/dcmsr/include/dcmtk/dcmsr/dsrxmlc.h b/dcmsr/include/dcmtk/dcmsr/dsrxmlc.h
index 59e5d6e..71b0f08 100644
--- a/dcmsr/include/dcmtk/dcmsr/dsrxmlc.h
+++ b/dcmsr/include/dcmtk/dcmsr/dsrxmlc.h
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2003-2014, OFFIS e.V.
+ * Copyright (C) 2003-2016, OFFIS e.V.
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation were developed by
@@ -26,14 +26,14 @@
#include "dcmtk/config/osconfig.h" /* make sure OS specific configuration is included first */
+#include "dcmtk/dcmsr/dsdefine.h"
+
#include "dcmtk/ofstd/oftypes.h" /* for definition of OFBool */
#define INCLUDE_CSTDLIB
#define INCLUDE_CSTDDEF
#include "dcmtk/ofstd/ofstdinc.h"
-#include "dcmtk/dcmsr/dsdefine.h"
-
#ifdef WITH_LIBXML
#include <libxml/parser.h>
#endif
diff --git a/dcmsr/include/dcmtk/dcmsr/dsrxmld.h b/dcmsr/include/dcmtk/dcmsr/dsrxmld.h
index eb1dd12..871e909 100644
--- a/dcmsr/include/dcmtk/dcmsr/dsrxmld.h
+++ b/dcmsr/include/dcmtk/dcmsr/dsrxmld.h
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2003-2014, OFFIS e.V.
+ * Copyright (C) 2003-2016, OFFIS e.V.
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation were developed by
@@ -26,7 +26,6 @@
#include "dcmtk/config/osconfig.h" /* make sure OS specific configuration is included first */
-#include "dcmtk/ofstd/ofstream.h"
#include "dcmtk/dcmsr/dsrtypes.h"
#include "dcmtk/dcmsr/dsrxmlc.h"
diff --git a/dcmsr/libcmr/Makefile.dep b/dcmsr/libcmr/Makefile.dep
index 69f525a..79c97f5 100644
--- a/dcmsr/libcmr/Makefile.dep
+++ b/dcmsr/libcmr/Makefile.dep
@@ -1,23 +1,31 @@
cid100.o: cid100.cc ../../config/include/dcmtk/config/osconfig.h \
../include/dcmtk/dcmsr/cmr/cid100.h ../include/dcmtk/dcmsr/dsrctxgr.h \
../include/dcmtk/dcmsr/dsrcodvl.h ../include/dcmtk/dcmsr/dsrtypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctk.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
- ../../oflog/include/dcmtk/oflog/oflog.h \
- ../../oflog/include/dcmtk/oflog/logger.h \
- ../../oflog/include/dcmtk/oflog/config.h \
+ ../include/dcmtk/dcmsr/dsdefine.h \
../../ofstd/include/dcmtk/ofstd/ofdefine.h \
../../ofstd/include/dcmtk/ofstd/ofcast.h \
../../ofstd/include/dcmtk/ofstd/ofexport.h \
../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
+ ../../ofstd/include/dcmtk/ofstd/ofthread.h \
+ ../../ofstd/include/dcmtk/ofstd/oftypes.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstream.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstring.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcond.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
+ ../../oflog/include/dcmtk/oflog/oflog.h \
+ ../../oflog/include/dcmtk/oflog/logger.h \
+ ../../oflog/include/dcmtk/oflog/config.h \
../../oflog/include/dcmtk/oflog/config/defines.h \
../../oflog/include/dcmtk/oflog/helpers/threadcf.h \
../../oflog/include/dcmtk/oflog/loglevel.h \
../../ofstd/include/dcmtk/ofstd/ofvector.h \
- ../../ofstd/include/dcmtk/ofstd/oftypes.h \
- ../../ofstd/include/dcmtk/ofstd/ofstream.h \
../../oflog/include/dcmtk/oflog/tstring.h \
- ../../ofstd/include/dcmtk/ofstd/ofstring.h \
../../oflog/include/dcmtk/oflog/tchar.h \
../../oflog/include/dcmtk/oflog/spi/apndatch.h \
../../oflog/include/dcmtk/oflog/appender.h \
@@ -36,106 +44,52 @@ cid100.o: cid100.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofcmdln.h \
../../ofstd/include/dcmtk/ofstd/oflist.h \
../../ofstd/include/dcmtk/ofstd/ofconsol.h \
- ../../ofstd/include/dcmtk/ofstd/ofthread.h \
../../ofstd/include/dcmtk/ofstd/offile.h \
../../ofstd/include/dcmtk/ofstd/ofstd.h \
../../ofstd/include/dcmtk/ofstd/oftraits.h \
- ../../ofstd/include/dcmtk/ofstd/ofcond.h \
../../ofstd/include/dcmtk/ofstd/oflimits.h \
../../config/include/dcmtk/config/arith.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
- ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dctag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \
- ../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdict.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
../../dcmdata/include/dcmtk/dcmdata/dclist.h \
../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcmetinf.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicdir.h \
+ ../../ofstd/include/dcmtk/ofstd/ofexbl.h \
+ ../include/dcmtk/dcmsr/cmr/define.h \
../../ofstd/include/dcmtk/ofstd/ofmap.h \
../../ofstd/include/dcmtk/ofstd/ofutil.h \
- ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdirrec.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrulup.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixseq.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcofsetl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrae.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvras.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
- ../../ofstd/include/dcmtk/ofstd/ofdate.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrds.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrdt.h \
- ../../ofstd/include/dcmtk/ofstd/ofdatime.h \
- ../../ofstd/include/dcmtk/ofstd/oftime.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrur.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlt.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrst.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvruc.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrut.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrobow.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixel.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpobw.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcovlay.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
- ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
- ../include/dcmtk/dcmsr/dsdefine.h \
- ../../ofstd/include/dcmtk/ofstd/ofexbl.h \
- ../include/dcmtk/dcmsr/cmr/define.h
+ ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h
cid10013.o: cid10013.cc ../../config/include/dcmtk/config/osconfig.h \
../include/dcmtk/dcmsr/cmr/cid10013.h ../include/dcmtk/dcmsr/dsrctxgr.h \
../include/dcmtk/dcmsr/dsrcodvl.h ../include/dcmtk/dcmsr/dsrtypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctk.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
- ../../oflog/include/dcmtk/oflog/oflog.h \
- ../../oflog/include/dcmtk/oflog/logger.h \
- ../../oflog/include/dcmtk/oflog/config.h \
+ ../include/dcmtk/dcmsr/dsdefine.h \
../../ofstd/include/dcmtk/ofstd/ofdefine.h \
../../ofstd/include/dcmtk/ofstd/ofcast.h \
../../ofstd/include/dcmtk/ofstd/ofexport.h \
../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
+ ../../ofstd/include/dcmtk/ofstd/ofthread.h \
+ ../../ofstd/include/dcmtk/ofstd/oftypes.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstream.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstring.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcond.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
+ ../../oflog/include/dcmtk/oflog/oflog.h \
+ ../../oflog/include/dcmtk/oflog/logger.h \
+ ../../oflog/include/dcmtk/oflog/config.h \
../../oflog/include/dcmtk/oflog/config/defines.h \
../../oflog/include/dcmtk/oflog/helpers/threadcf.h \
../../oflog/include/dcmtk/oflog/loglevel.h \
../../ofstd/include/dcmtk/ofstd/ofvector.h \
- ../../ofstd/include/dcmtk/ofstd/oftypes.h \
- ../../ofstd/include/dcmtk/ofstd/ofstream.h \
../../oflog/include/dcmtk/oflog/tstring.h \
- ../../ofstd/include/dcmtk/ofstd/ofstring.h \
../../oflog/include/dcmtk/oflog/tchar.h \
../../oflog/include/dcmtk/oflog/spi/apndatch.h \
../../oflog/include/dcmtk/oflog/appender.h \
@@ -154,107 +108,53 @@ cid10013.o: cid10013.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofcmdln.h \
../../ofstd/include/dcmtk/ofstd/oflist.h \
../../ofstd/include/dcmtk/ofstd/ofconsol.h \
- ../../ofstd/include/dcmtk/ofstd/ofthread.h \
../../ofstd/include/dcmtk/ofstd/offile.h \
../../ofstd/include/dcmtk/ofstd/ofstd.h \
../../ofstd/include/dcmtk/ofstd/oftraits.h \
- ../../ofstd/include/dcmtk/ofstd/ofcond.h \
../../ofstd/include/dcmtk/ofstd/oflimits.h \
../../config/include/dcmtk/config/arith.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
- ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dctag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \
- ../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdict.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
../../dcmdata/include/dcmtk/dcmdata/dclist.h \
../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcmetinf.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicdir.h \
+ ../../ofstd/include/dcmtk/ofstd/ofexbl.h \
+ ../include/dcmtk/dcmsr/cmr/define.h \
../../ofstd/include/dcmtk/ofstd/ofmap.h \
../../ofstd/include/dcmtk/ofstd/ofutil.h \
- ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdirrec.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrulup.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixseq.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcofsetl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrae.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvras.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
- ../../ofstd/include/dcmtk/ofstd/ofdate.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrds.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrdt.h \
- ../../ofstd/include/dcmtk/ofstd/ofdatime.h \
- ../../ofstd/include/dcmtk/ofstd/oftime.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrur.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlt.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrst.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvruc.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrut.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrobow.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixel.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpobw.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcovlay.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
- ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
- ../include/dcmtk/dcmsr/dsdefine.h \
- ../../ofstd/include/dcmtk/ofstd/ofexbl.h \
- ../include/dcmtk/dcmsr/cmr/define.h
+ ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h
cid10013e.o: cid10013e.cc ../../config/include/dcmtk/config/osconfig.h \
../include/dcmtk/dcmsr/cmr/cid10013e.h \
../include/dcmtk/dcmsr/cmr/cid10013.h ../include/dcmtk/dcmsr/dsrctxgr.h \
../include/dcmtk/dcmsr/dsrcodvl.h ../include/dcmtk/dcmsr/dsrtypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctk.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
- ../../oflog/include/dcmtk/oflog/oflog.h \
- ../../oflog/include/dcmtk/oflog/logger.h \
- ../../oflog/include/dcmtk/oflog/config.h \
+ ../include/dcmtk/dcmsr/dsdefine.h \
../../ofstd/include/dcmtk/ofstd/ofdefine.h \
../../ofstd/include/dcmtk/ofstd/ofcast.h \
../../ofstd/include/dcmtk/ofstd/ofexport.h \
../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
+ ../../ofstd/include/dcmtk/ofstd/ofthread.h \
+ ../../ofstd/include/dcmtk/ofstd/oftypes.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstream.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstring.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcond.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
+ ../../oflog/include/dcmtk/oflog/oflog.h \
+ ../../oflog/include/dcmtk/oflog/logger.h \
+ ../../oflog/include/dcmtk/oflog/config.h \
../../oflog/include/dcmtk/oflog/config/defines.h \
../../oflog/include/dcmtk/oflog/helpers/threadcf.h \
../../oflog/include/dcmtk/oflog/loglevel.h \
../../ofstd/include/dcmtk/ofstd/ofvector.h \
- ../../ofstd/include/dcmtk/ofstd/oftypes.h \
- ../../ofstd/include/dcmtk/ofstd/ofstream.h \
../../oflog/include/dcmtk/oflog/tstring.h \
- ../../ofstd/include/dcmtk/ofstd/ofstring.h \
../../oflog/include/dcmtk/oflog/tchar.h \
../../oflog/include/dcmtk/oflog/spi/apndatch.h \
../../oflog/include/dcmtk/oflog/appender.h \
@@ -273,106 +173,52 @@ cid10013e.o: cid10013e.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofcmdln.h \
../../ofstd/include/dcmtk/ofstd/oflist.h \
../../ofstd/include/dcmtk/ofstd/ofconsol.h \
- ../../ofstd/include/dcmtk/ofstd/ofthread.h \
../../ofstd/include/dcmtk/ofstd/offile.h \
../../ofstd/include/dcmtk/ofstd/ofstd.h \
../../ofstd/include/dcmtk/ofstd/oftraits.h \
- ../../ofstd/include/dcmtk/ofstd/ofcond.h \
../../ofstd/include/dcmtk/ofstd/oflimits.h \
../../config/include/dcmtk/config/arith.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
- ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dctag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \
- ../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdict.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
../../dcmdata/include/dcmtk/dcmdata/dclist.h \
../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcmetinf.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicdir.h \
+ ../../ofstd/include/dcmtk/ofstd/ofexbl.h \
+ ../include/dcmtk/dcmsr/cmr/define.h \
../../ofstd/include/dcmtk/ofstd/ofmap.h \
../../ofstd/include/dcmtk/ofstd/ofutil.h \
- ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdirrec.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrulup.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixseq.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcofsetl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrae.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvras.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
- ../../ofstd/include/dcmtk/ofstd/ofdate.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrds.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrdt.h \
- ../../ofstd/include/dcmtk/ofstd/ofdatime.h \
- ../../ofstd/include/dcmtk/ofstd/oftime.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrur.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlt.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrst.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvruc.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrut.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrobow.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixel.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpobw.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcovlay.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
- ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
- ../include/dcmtk/dcmsr/dsdefine.h \
- ../../ofstd/include/dcmtk/ofstd/ofexbl.h \
- ../include/dcmtk/dcmsr/cmr/define.h
+ ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h
cid10033.o: cid10033.cc ../../config/include/dcmtk/config/osconfig.h \
../include/dcmtk/dcmsr/cmr/cid10033.h ../include/dcmtk/dcmsr/dsrctxgr.h \
../include/dcmtk/dcmsr/dsrcodvl.h ../include/dcmtk/dcmsr/dsrtypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctk.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
- ../../oflog/include/dcmtk/oflog/oflog.h \
- ../../oflog/include/dcmtk/oflog/logger.h \
- ../../oflog/include/dcmtk/oflog/config.h \
+ ../include/dcmtk/dcmsr/dsdefine.h \
../../ofstd/include/dcmtk/ofstd/ofdefine.h \
../../ofstd/include/dcmtk/ofstd/ofcast.h \
../../ofstd/include/dcmtk/ofstd/ofexport.h \
../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
+ ../../ofstd/include/dcmtk/ofstd/ofthread.h \
+ ../../ofstd/include/dcmtk/ofstd/oftypes.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstream.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstring.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcond.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
+ ../../oflog/include/dcmtk/oflog/oflog.h \
+ ../../oflog/include/dcmtk/oflog/logger.h \
+ ../../oflog/include/dcmtk/oflog/config.h \
../../oflog/include/dcmtk/oflog/config/defines.h \
../../oflog/include/dcmtk/oflog/helpers/threadcf.h \
../../oflog/include/dcmtk/oflog/loglevel.h \
../../ofstd/include/dcmtk/ofstd/ofvector.h \
- ../../ofstd/include/dcmtk/ofstd/oftypes.h \
- ../../ofstd/include/dcmtk/ofstd/ofstream.h \
../../oflog/include/dcmtk/oflog/tstring.h \
- ../../ofstd/include/dcmtk/ofstd/ofstring.h \
../../oflog/include/dcmtk/oflog/tchar.h \
../../oflog/include/dcmtk/oflog/spi/apndatch.h \
../../oflog/include/dcmtk/oflog/appender.h \
@@ -391,107 +237,53 @@ cid10033.o: cid10033.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofcmdln.h \
../../ofstd/include/dcmtk/ofstd/oflist.h \
../../ofstd/include/dcmtk/ofstd/ofconsol.h \
- ../../ofstd/include/dcmtk/ofstd/ofthread.h \
../../ofstd/include/dcmtk/ofstd/offile.h \
../../ofstd/include/dcmtk/ofstd/ofstd.h \
../../ofstd/include/dcmtk/ofstd/oftraits.h \
- ../../ofstd/include/dcmtk/ofstd/ofcond.h \
../../ofstd/include/dcmtk/ofstd/oflimits.h \
../../config/include/dcmtk/config/arith.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
- ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dctag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \
- ../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdict.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
../../dcmdata/include/dcmtk/dcmdata/dclist.h \
../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcmetinf.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicdir.h \
+ ../../ofstd/include/dcmtk/ofstd/ofexbl.h \
+ ../include/dcmtk/dcmsr/cmr/define.h \
../../ofstd/include/dcmtk/ofstd/ofmap.h \
../../ofstd/include/dcmtk/ofstd/ofutil.h \
- ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdirrec.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrulup.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixseq.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcofsetl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrae.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvras.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
- ../../ofstd/include/dcmtk/ofstd/ofdate.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrds.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrdt.h \
- ../../ofstd/include/dcmtk/ofstd/ofdatime.h \
- ../../ofstd/include/dcmtk/ofstd/oftime.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrur.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlt.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrst.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvruc.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrut.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrobow.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixel.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpobw.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcovlay.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
- ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
- ../include/dcmtk/dcmsr/dsdefine.h \
- ../../ofstd/include/dcmtk/ofstd/ofexbl.h \
- ../include/dcmtk/dcmsr/cmr/define.h
+ ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h
cid10033e.o: cid10033e.cc ../../config/include/dcmtk/config/osconfig.h \
../include/dcmtk/dcmsr/cmr/cid10033e.h \
../include/dcmtk/dcmsr/cmr/cid10033.h ../include/dcmtk/dcmsr/dsrctxgr.h \
../include/dcmtk/dcmsr/dsrcodvl.h ../include/dcmtk/dcmsr/dsrtypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctk.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
- ../../oflog/include/dcmtk/oflog/oflog.h \
- ../../oflog/include/dcmtk/oflog/logger.h \
- ../../oflog/include/dcmtk/oflog/config.h \
+ ../include/dcmtk/dcmsr/dsdefine.h \
../../ofstd/include/dcmtk/ofstd/ofdefine.h \
../../ofstd/include/dcmtk/ofstd/ofcast.h \
../../ofstd/include/dcmtk/ofstd/ofexport.h \
../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
+ ../../ofstd/include/dcmtk/ofstd/ofthread.h \
+ ../../ofstd/include/dcmtk/ofstd/oftypes.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstream.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstring.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcond.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
+ ../../oflog/include/dcmtk/oflog/oflog.h \
+ ../../oflog/include/dcmtk/oflog/logger.h \
+ ../../oflog/include/dcmtk/oflog/config.h \
../../oflog/include/dcmtk/oflog/config/defines.h \
../../oflog/include/dcmtk/oflog/helpers/threadcf.h \
../../oflog/include/dcmtk/oflog/loglevel.h \
../../ofstd/include/dcmtk/ofstd/ofvector.h \
- ../../ofstd/include/dcmtk/ofstd/oftypes.h \
- ../../ofstd/include/dcmtk/ofstd/ofstream.h \
../../oflog/include/dcmtk/oflog/tstring.h \
- ../../ofstd/include/dcmtk/ofstd/ofstring.h \
../../oflog/include/dcmtk/oflog/tchar.h \
../../oflog/include/dcmtk/oflog/spi/apndatch.h \
../../oflog/include/dcmtk/oflog/appender.h \
@@ -510,106 +302,52 @@ cid10033e.o: cid10033e.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofcmdln.h \
../../ofstd/include/dcmtk/ofstd/oflist.h \
../../ofstd/include/dcmtk/ofstd/ofconsol.h \
- ../../ofstd/include/dcmtk/ofstd/ofthread.h \
../../ofstd/include/dcmtk/ofstd/offile.h \
../../ofstd/include/dcmtk/ofstd/ofstd.h \
../../ofstd/include/dcmtk/ofstd/oftraits.h \
- ../../ofstd/include/dcmtk/ofstd/ofcond.h \
../../ofstd/include/dcmtk/ofstd/oflimits.h \
../../config/include/dcmtk/config/arith.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
- ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dctag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \
- ../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdict.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
../../dcmdata/include/dcmtk/dcmdata/dclist.h \
../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcmetinf.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicdir.h \
+ ../../ofstd/include/dcmtk/ofstd/ofexbl.h \
+ ../include/dcmtk/dcmsr/cmr/define.h \
../../ofstd/include/dcmtk/ofstd/ofmap.h \
../../ofstd/include/dcmtk/ofstd/ofutil.h \
- ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdirrec.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrulup.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixseq.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcofsetl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrae.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvras.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
- ../../ofstd/include/dcmtk/ofstd/ofdate.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrds.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrdt.h \
- ../../ofstd/include/dcmtk/ofstd/ofdatime.h \
- ../../ofstd/include/dcmtk/ofstd/oftime.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrur.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlt.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrst.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvruc.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrut.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrobow.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixel.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpobw.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcovlay.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
- ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
- ../include/dcmtk/dcmsr/dsdefine.h \
- ../../ofstd/include/dcmtk/ofstd/ofexbl.h \
- ../include/dcmtk/dcmsr/cmr/define.h
+ ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h
cid11.o: cid11.cc ../../config/include/dcmtk/config/osconfig.h \
../include/dcmtk/dcmsr/cmr/cid11.h ../include/dcmtk/dcmsr/dsrctxgr.h \
../include/dcmtk/dcmsr/dsrcodvl.h ../include/dcmtk/dcmsr/dsrtypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctk.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
- ../../oflog/include/dcmtk/oflog/oflog.h \
- ../../oflog/include/dcmtk/oflog/logger.h \
- ../../oflog/include/dcmtk/oflog/config.h \
+ ../include/dcmtk/dcmsr/dsdefine.h \
../../ofstd/include/dcmtk/ofstd/ofdefine.h \
../../ofstd/include/dcmtk/ofstd/ofcast.h \
../../ofstd/include/dcmtk/ofstd/ofexport.h \
../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
+ ../../ofstd/include/dcmtk/ofstd/ofthread.h \
+ ../../ofstd/include/dcmtk/ofstd/oftypes.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstream.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstring.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcond.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
+ ../../oflog/include/dcmtk/oflog/oflog.h \
+ ../../oflog/include/dcmtk/oflog/logger.h \
+ ../../oflog/include/dcmtk/oflog/config.h \
../../oflog/include/dcmtk/oflog/config/defines.h \
../../oflog/include/dcmtk/oflog/helpers/threadcf.h \
../../oflog/include/dcmtk/oflog/loglevel.h \
../../ofstd/include/dcmtk/ofstd/ofvector.h \
- ../../ofstd/include/dcmtk/ofstd/oftypes.h \
- ../../ofstd/include/dcmtk/ofstd/ofstream.h \
../../oflog/include/dcmtk/oflog/tstring.h \
- ../../ofstd/include/dcmtk/ofstd/ofstring.h \
../../oflog/include/dcmtk/oflog/tchar.h \
../../oflog/include/dcmtk/oflog/spi/apndatch.h \
../../oflog/include/dcmtk/oflog/appender.h \
@@ -628,106 +366,52 @@ cid11.o: cid11.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofcmdln.h \
../../ofstd/include/dcmtk/ofstd/oflist.h \
../../ofstd/include/dcmtk/ofstd/ofconsol.h \
- ../../ofstd/include/dcmtk/ofstd/ofthread.h \
../../ofstd/include/dcmtk/ofstd/offile.h \
../../ofstd/include/dcmtk/ofstd/ofstd.h \
../../ofstd/include/dcmtk/ofstd/oftraits.h \
- ../../ofstd/include/dcmtk/ofstd/ofcond.h \
../../ofstd/include/dcmtk/ofstd/oflimits.h \
../../config/include/dcmtk/config/arith.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
- ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dctag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \
- ../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdict.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
../../dcmdata/include/dcmtk/dcmdata/dclist.h \
../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcmetinf.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicdir.h \
+ ../../ofstd/include/dcmtk/ofstd/ofexbl.h \
+ ../include/dcmtk/dcmsr/cmr/define.h \
../../ofstd/include/dcmtk/ofstd/ofmap.h \
../../ofstd/include/dcmtk/ofstd/ofutil.h \
- ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdirrec.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrulup.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixseq.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcofsetl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrae.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvras.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
- ../../ofstd/include/dcmtk/ofstd/ofdate.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrds.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrdt.h \
- ../../ofstd/include/dcmtk/ofstd/ofdatime.h \
- ../../ofstd/include/dcmtk/ofstd/oftime.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrur.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlt.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrst.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvruc.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrut.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrobow.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixel.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpobw.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcovlay.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
- ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
- ../include/dcmtk/dcmsr/dsdefine.h \
- ../../ofstd/include/dcmtk/ofstd/ofexbl.h \
- ../include/dcmtk/dcmsr/cmr/define.h
+ ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h
cid244.o: cid244.cc ../../config/include/dcmtk/config/osconfig.h \
../include/dcmtk/dcmsr/cmr/cid244.h ../include/dcmtk/dcmsr/dsrctxgr.h \
../include/dcmtk/dcmsr/dsrcodvl.h ../include/dcmtk/dcmsr/dsrtypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctk.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
- ../../oflog/include/dcmtk/oflog/oflog.h \
- ../../oflog/include/dcmtk/oflog/logger.h \
- ../../oflog/include/dcmtk/oflog/config.h \
+ ../include/dcmtk/dcmsr/dsdefine.h \
../../ofstd/include/dcmtk/ofstd/ofdefine.h \
../../ofstd/include/dcmtk/ofstd/ofcast.h \
../../ofstd/include/dcmtk/ofstd/ofexport.h \
../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
+ ../../ofstd/include/dcmtk/ofstd/ofthread.h \
+ ../../ofstd/include/dcmtk/ofstd/oftypes.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstream.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstring.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcond.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
+ ../../oflog/include/dcmtk/oflog/oflog.h \
+ ../../oflog/include/dcmtk/oflog/logger.h \
+ ../../oflog/include/dcmtk/oflog/config.h \
../../oflog/include/dcmtk/oflog/config/defines.h \
../../oflog/include/dcmtk/oflog/helpers/threadcf.h \
../../oflog/include/dcmtk/oflog/loglevel.h \
../../ofstd/include/dcmtk/ofstd/ofvector.h \
- ../../ofstd/include/dcmtk/ofstd/oftypes.h \
- ../../ofstd/include/dcmtk/ofstd/ofstream.h \
../../oflog/include/dcmtk/oflog/tstring.h \
- ../../ofstd/include/dcmtk/ofstd/ofstring.h \
../../oflog/include/dcmtk/oflog/tchar.h \
../../oflog/include/dcmtk/oflog/spi/apndatch.h \
../../oflog/include/dcmtk/oflog/appender.h \
@@ -746,107 +430,52 @@ cid244.o: cid244.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofcmdln.h \
../../ofstd/include/dcmtk/ofstd/oflist.h \
../../ofstd/include/dcmtk/ofstd/ofconsol.h \
- ../../ofstd/include/dcmtk/ofstd/ofthread.h \
../../ofstd/include/dcmtk/ofstd/offile.h \
../../ofstd/include/dcmtk/ofstd/ofstd.h \
../../ofstd/include/dcmtk/ofstd/oftraits.h \
- ../../ofstd/include/dcmtk/ofstd/ofcond.h \
../../ofstd/include/dcmtk/ofstd/oflimits.h \
../../config/include/dcmtk/config/arith.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
- ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dctag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \
- ../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdict.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
../../dcmdata/include/dcmtk/dcmdata/dclist.h \
../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcmetinf.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicdir.h \
+ ../../ofstd/include/dcmtk/ofstd/ofexbl.h \
+ ../include/dcmtk/dcmsr/cmr/define.h \
../../ofstd/include/dcmtk/ofstd/ofmap.h \
../../ofstd/include/dcmtk/ofstd/ofutil.h \
- ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdirrec.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrulup.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixseq.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcofsetl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrae.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvras.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
- ../../ofstd/include/dcmtk/ofstd/ofdate.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrds.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrdt.h \
- ../../ofstd/include/dcmtk/ofstd/ofdatime.h \
- ../../ofstd/include/dcmtk/ofstd/oftime.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrur.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlt.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrst.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvruc.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrut.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrobow.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixel.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpobw.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcovlay.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
- ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
- ../include/dcmtk/dcmsr/dsdefine.h \
- ../../ofstd/include/dcmtk/ofstd/ofexbl.h \
- ../include/dcmtk/dcmsr/cmr/define.h
+ ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h
cid244e.o: cid244e.cc ../../config/include/dcmtk/config/osconfig.h \
../include/dcmtk/dcmsr/cmr/cid244e.h ../include/dcmtk/dcmsr/cmr/cid244.h \
../include/dcmtk/dcmsr/dsrctxgr.h ../include/dcmtk/dcmsr/dsrcodvl.h \
- ../include/dcmtk/dcmsr/dsrtypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctk.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
- ../../oflog/include/dcmtk/oflog/oflog.h \
- ../../oflog/include/dcmtk/oflog/logger.h \
- ../../oflog/include/dcmtk/oflog/config.h \
+ ../include/dcmtk/dcmsr/dsrtypes.h ../include/dcmtk/dcmsr/dsdefine.h \
../../ofstd/include/dcmtk/ofstd/ofdefine.h \
../../ofstd/include/dcmtk/ofstd/ofcast.h \
../../ofstd/include/dcmtk/ofstd/ofexport.h \
../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
+ ../../ofstd/include/dcmtk/ofstd/ofthread.h \
+ ../../ofstd/include/dcmtk/ofstd/oftypes.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstream.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstring.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcond.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
+ ../../oflog/include/dcmtk/oflog/oflog.h \
+ ../../oflog/include/dcmtk/oflog/logger.h \
+ ../../oflog/include/dcmtk/oflog/config.h \
../../oflog/include/dcmtk/oflog/config/defines.h \
../../oflog/include/dcmtk/oflog/helpers/threadcf.h \
../../oflog/include/dcmtk/oflog/loglevel.h \
../../ofstd/include/dcmtk/ofstd/ofvector.h \
- ../../ofstd/include/dcmtk/ofstd/oftypes.h \
- ../../ofstd/include/dcmtk/ofstd/ofstream.h \
../../oflog/include/dcmtk/oflog/tstring.h \
- ../../ofstd/include/dcmtk/ofstd/ofstring.h \
../../oflog/include/dcmtk/oflog/tchar.h \
../../oflog/include/dcmtk/oflog/spi/apndatch.h \
../../oflog/include/dcmtk/oflog/appender.h \
@@ -865,106 +494,52 @@ cid244e.o: cid244e.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofcmdln.h \
../../ofstd/include/dcmtk/ofstd/oflist.h \
../../ofstd/include/dcmtk/ofstd/ofconsol.h \
- ../../ofstd/include/dcmtk/ofstd/ofthread.h \
../../ofstd/include/dcmtk/ofstd/offile.h \
../../ofstd/include/dcmtk/ofstd/ofstd.h \
../../ofstd/include/dcmtk/ofstd/oftraits.h \
- ../../ofstd/include/dcmtk/ofstd/ofcond.h \
../../ofstd/include/dcmtk/ofstd/oflimits.h \
../../config/include/dcmtk/config/arith.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
- ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dctag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \
- ../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdict.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
../../dcmdata/include/dcmtk/dcmdata/dclist.h \
../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcmetinf.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicdir.h \
+ ../../ofstd/include/dcmtk/ofstd/ofexbl.h \
+ ../include/dcmtk/dcmsr/cmr/define.h \
../../ofstd/include/dcmtk/ofstd/ofmap.h \
../../ofstd/include/dcmtk/ofstd/ofutil.h \
- ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdirrec.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrulup.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixseq.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcofsetl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrae.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvras.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
- ../../ofstd/include/dcmtk/ofstd/ofdate.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrds.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrdt.h \
- ../../ofstd/include/dcmtk/ofstd/ofdatime.h \
- ../../ofstd/include/dcmtk/ofstd/oftime.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrur.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlt.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrst.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvruc.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrut.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrobow.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixel.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpobw.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcovlay.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
- ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
- ../include/dcmtk/dcmsr/dsdefine.h \
- ../../ofstd/include/dcmtk/ofstd/ofexbl.h \
- ../include/dcmtk/dcmsr/cmr/define.h
+ ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h
cid29.o: cid29.cc ../../config/include/dcmtk/config/osconfig.h \
../include/dcmtk/dcmsr/cmr/cid29.h ../include/dcmtk/dcmsr/dsrctxgr.h \
../include/dcmtk/dcmsr/dsrcodvl.h ../include/dcmtk/dcmsr/dsrtypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctk.h \
+ ../include/dcmtk/dcmsr/dsdefine.h \
+ ../../ofstd/include/dcmtk/ofstd/ofdefine.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcast.h \
+ ../../ofstd/include/dcmtk/ofstd/ofexport.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
+ ../../ofstd/include/dcmtk/ofstd/ofthread.h \
+ ../../ofstd/include/dcmtk/ofstd/oftypes.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstream.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstring.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcond.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
../../oflog/include/dcmtk/oflog/oflog.h \
../../oflog/include/dcmtk/oflog/logger.h \
../../oflog/include/dcmtk/oflog/config.h \
- ../../ofstd/include/dcmtk/ofstd/ofdefine.h \
- ../../ofstd/include/dcmtk/ofstd/ofcast.h \
- ../../ofstd/include/dcmtk/ofstd/ofexport.h \
- ../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
../../oflog/include/dcmtk/oflog/config/defines.h \
../../oflog/include/dcmtk/oflog/helpers/threadcf.h \
../../oflog/include/dcmtk/oflog/loglevel.h \
../../ofstd/include/dcmtk/ofstd/ofvector.h \
- ../../ofstd/include/dcmtk/ofstd/oftypes.h \
- ../../ofstd/include/dcmtk/ofstd/ofstream.h \
../../oflog/include/dcmtk/oflog/tstring.h \
- ../../ofstd/include/dcmtk/ofstd/ofstring.h \
../../oflog/include/dcmtk/oflog/tchar.h \
../../oflog/include/dcmtk/oflog/spi/apndatch.h \
../../oflog/include/dcmtk/oflog/appender.h \
@@ -983,107 +558,52 @@ cid29.o: cid29.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofcmdln.h \
../../ofstd/include/dcmtk/ofstd/oflist.h \
../../ofstd/include/dcmtk/ofstd/ofconsol.h \
- ../../ofstd/include/dcmtk/ofstd/ofthread.h \
../../ofstd/include/dcmtk/ofstd/offile.h \
../../ofstd/include/dcmtk/ofstd/ofstd.h \
../../ofstd/include/dcmtk/ofstd/oftraits.h \
- ../../ofstd/include/dcmtk/ofstd/ofcond.h \
../../ofstd/include/dcmtk/ofstd/oflimits.h \
../../config/include/dcmtk/config/arith.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
- ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dctag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \
- ../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdict.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
../../dcmdata/include/dcmtk/dcmdata/dclist.h \
../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcmetinf.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicdir.h \
+ ../../ofstd/include/dcmtk/ofstd/ofexbl.h \
+ ../include/dcmtk/dcmsr/cmr/define.h \
../../ofstd/include/dcmtk/ofstd/ofmap.h \
../../ofstd/include/dcmtk/ofstd/ofutil.h \
- ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdirrec.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrulup.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixseq.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcofsetl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrae.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvras.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
- ../../ofstd/include/dcmtk/ofstd/ofdate.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrds.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrdt.h \
- ../../ofstd/include/dcmtk/ofstd/ofdatime.h \
- ../../ofstd/include/dcmtk/ofstd/oftime.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrur.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlt.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrst.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvruc.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrut.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrobow.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixel.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpobw.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcovlay.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
- ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
- ../include/dcmtk/dcmsr/dsdefine.h \
- ../../ofstd/include/dcmtk/ofstd/ofexbl.h \
- ../include/dcmtk/dcmsr/cmr/define.h
+ ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h
cid29e.o: cid29e.cc ../../config/include/dcmtk/config/osconfig.h \
../include/dcmtk/dcmsr/cmr/cid29e.h ../include/dcmtk/dcmsr/cmr/cid29.h \
../include/dcmtk/dcmsr/dsrctxgr.h ../include/dcmtk/dcmsr/dsrcodvl.h \
- ../include/dcmtk/dcmsr/dsrtypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctk.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
- ../../oflog/include/dcmtk/oflog/oflog.h \
- ../../oflog/include/dcmtk/oflog/logger.h \
- ../../oflog/include/dcmtk/oflog/config.h \
+ ../include/dcmtk/dcmsr/dsrtypes.h ../include/dcmtk/dcmsr/dsdefine.h \
../../ofstd/include/dcmtk/ofstd/ofdefine.h \
../../ofstd/include/dcmtk/ofstd/ofcast.h \
../../ofstd/include/dcmtk/ofstd/ofexport.h \
../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
+ ../../ofstd/include/dcmtk/ofstd/ofthread.h \
+ ../../ofstd/include/dcmtk/ofstd/oftypes.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstream.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstring.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcond.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
+ ../../oflog/include/dcmtk/oflog/oflog.h \
+ ../../oflog/include/dcmtk/oflog/logger.h \
+ ../../oflog/include/dcmtk/oflog/config.h \
../../oflog/include/dcmtk/oflog/config/defines.h \
../../oflog/include/dcmtk/oflog/helpers/threadcf.h \
../../oflog/include/dcmtk/oflog/loglevel.h \
../../ofstd/include/dcmtk/ofstd/ofvector.h \
- ../../ofstd/include/dcmtk/ofstd/oftypes.h \
- ../../ofstd/include/dcmtk/ofstd/ofstream.h \
../../oflog/include/dcmtk/oflog/tstring.h \
- ../../ofstd/include/dcmtk/ofstd/ofstring.h \
../../oflog/include/dcmtk/oflog/tchar.h \
../../oflog/include/dcmtk/oflog/spi/apndatch.h \
../../oflog/include/dcmtk/oflog/appender.h \
@@ -1102,106 +622,53 @@ cid29e.o: cid29e.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofcmdln.h \
../../ofstd/include/dcmtk/ofstd/oflist.h \
../../ofstd/include/dcmtk/ofstd/ofconsol.h \
- ../../ofstd/include/dcmtk/ofstd/ofthread.h \
../../ofstd/include/dcmtk/ofstd/offile.h \
../../ofstd/include/dcmtk/ofstd/ofstd.h \
../../ofstd/include/dcmtk/ofstd/oftraits.h \
- ../../ofstd/include/dcmtk/ofstd/ofcond.h \
../../ofstd/include/dcmtk/ofstd/oflimits.h \
../../config/include/dcmtk/config/arith.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
- ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dctag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \
- ../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdict.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
../../dcmdata/include/dcmtk/dcmdata/dclist.h \
../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcmetinf.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicdir.h \
+ ../../ofstd/include/dcmtk/ofstd/ofexbl.h \
+ ../include/dcmtk/dcmsr/cmr/define.h \
../../ofstd/include/dcmtk/ofstd/ofmap.h \
../../ofstd/include/dcmtk/ofstd/ofutil.h \
../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdirrec.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrulup.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixseq.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcofsetl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrae.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvras.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
- ../../ofstd/include/dcmtk/ofstd/ofdate.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrds.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrdt.h \
- ../../ofstd/include/dcmtk/ofstd/ofdatime.h \
- ../../ofstd/include/dcmtk/ofstd/oftime.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrur.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlt.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrst.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvruc.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrut.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrobow.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixel.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpobw.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcovlay.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
- ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
- ../include/dcmtk/dcmsr/dsdefine.h \
- ../../ofstd/include/dcmtk/ofstd/ofexbl.h \
- ../include/dcmtk/dcmsr/cmr/define.h ../include/dcmtk/dcmsr/codes/dcm.h
+ ../include/dcmtk/dcmsr/codes/dcm.h
cid4020.o: cid4020.cc ../../config/include/dcmtk/config/osconfig.h \
../include/dcmtk/dcmsr/cmr/cid4020.h ../include/dcmtk/dcmsr/dsrctxgr.h \
../include/dcmtk/dcmsr/dsrcodvl.h ../include/dcmtk/dcmsr/dsrtypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctk.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
- ../../oflog/include/dcmtk/oflog/oflog.h \
- ../../oflog/include/dcmtk/oflog/logger.h \
- ../../oflog/include/dcmtk/oflog/config.h \
+ ../include/dcmtk/dcmsr/dsdefine.h \
../../ofstd/include/dcmtk/ofstd/ofdefine.h \
../../ofstd/include/dcmtk/ofstd/ofcast.h \
../../ofstd/include/dcmtk/ofstd/ofexport.h \
../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
+ ../../ofstd/include/dcmtk/ofstd/ofthread.h \
+ ../../ofstd/include/dcmtk/ofstd/oftypes.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstream.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstring.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcond.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
+ ../../oflog/include/dcmtk/oflog/oflog.h \
+ ../../oflog/include/dcmtk/oflog/logger.h \
+ ../../oflog/include/dcmtk/oflog/config.h \
../../oflog/include/dcmtk/oflog/config/defines.h \
../../oflog/include/dcmtk/oflog/helpers/threadcf.h \
../../oflog/include/dcmtk/oflog/loglevel.h \
../../ofstd/include/dcmtk/ofstd/ofvector.h \
- ../../ofstd/include/dcmtk/ofstd/oftypes.h \
- ../../ofstd/include/dcmtk/ofstd/ofstream.h \
../../oflog/include/dcmtk/oflog/tstring.h \
- ../../ofstd/include/dcmtk/ofstd/ofstring.h \
../../oflog/include/dcmtk/oflog/tchar.h \
../../oflog/include/dcmtk/oflog/spi/apndatch.h \
../../oflog/include/dcmtk/oflog/appender.h \
@@ -1220,106 +687,52 @@ cid4020.o: cid4020.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofcmdln.h \
../../ofstd/include/dcmtk/ofstd/oflist.h \
../../ofstd/include/dcmtk/ofstd/ofconsol.h \
- ../../ofstd/include/dcmtk/ofstd/ofthread.h \
../../ofstd/include/dcmtk/ofstd/offile.h \
../../ofstd/include/dcmtk/ofstd/ofstd.h \
../../ofstd/include/dcmtk/ofstd/oftraits.h \
- ../../ofstd/include/dcmtk/ofstd/ofcond.h \
../../ofstd/include/dcmtk/ofstd/oflimits.h \
../../config/include/dcmtk/config/arith.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
- ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dctag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \
- ../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdict.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
../../dcmdata/include/dcmtk/dcmdata/dclist.h \
../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcmetinf.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicdir.h \
+ ../../ofstd/include/dcmtk/ofstd/ofexbl.h \
+ ../include/dcmtk/dcmsr/cmr/define.h \
../../ofstd/include/dcmtk/ofstd/ofmap.h \
../../ofstd/include/dcmtk/ofstd/ofutil.h \
- ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdirrec.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrulup.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixseq.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcofsetl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrae.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvras.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
- ../../ofstd/include/dcmtk/ofstd/ofdate.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrds.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrdt.h \
- ../../ofstd/include/dcmtk/ofstd/ofdatime.h \
- ../../ofstd/include/dcmtk/ofstd/oftime.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrur.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlt.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrst.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvruc.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrut.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrobow.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixel.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpobw.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcovlay.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
- ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
- ../include/dcmtk/dcmsr/dsdefine.h \
- ../../ofstd/include/dcmtk/ofstd/ofexbl.h \
- ../include/dcmtk/dcmsr/cmr/define.h
+ ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h
cid4021.o: cid4021.cc ../../config/include/dcmtk/config/osconfig.h \
../include/dcmtk/dcmsr/cmr/cid4021.h ../include/dcmtk/dcmsr/dsrctxgr.h \
../include/dcmtk/dcmsr/dsrcodvl.h ../include/dcmtk/dcmsr/dsrtypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctk.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
- ../../oflog/include/dcmtk/oflog/oflog.h \
- ../../oflog/include/dcmtk/oflog/logger.h \
- ../../oflog/include/dcmtk/oflog/config.h \
+ ../include/dcmtk/dcmsr/dsdefine.h \
../../ofstd/include/dcmtk/ofstd/ofdefine.h \
../../ofstd/include/dcmtk/ofstd/ofcast.h \
../../ofstd/include/dcmtk/ofstd/ofexport.h \
../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
+ ../../ofstd/include/dcmtk/ofstd/ofthread.h \
+ ../../ofstd/include/dcmtk/ofstd/oftypes.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstream.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstring.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcond.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
+ ../../oflog/include/dcmtk/oflog/oflog.h \
+ ../../oflog/include/dcmtk/oflog/logger.h \
+ ../../oflog/include/dcmtk/oflog/config.h \
../../oflog/include/dcmtk/oflog/config/defines.h \
../../oflog/include/dcmtk/oflog/helpers/threadcf.h \
../../oflog/include/dcmtk/oflog/loglevel.h \
../../ofstd/include/dcmtk/ofstd/ofvector.h \
- ../../ofstd/include/dcmtk/ofstd/oftypes.h \
- ../../ofstd/include/dcmtk/ofstd/ofstream.h \
../../oflog/include/dcmtk/oflog/tstring.h \
- ../../ofstd/include/dcmtk/ofstd/ofstring.h \
../../oflog/include/dcmtk/oflog/tchar.h \
../../oflog/include/dcmtk/oflog/spi/apndatch.h \
../../oflog/include/dcmtk/oflog/appender.h \
@@ -1338,106 +751,52 @@ cid4021.o: cid4021.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofcmdln.h \
../../ofstd/include/dcmtk/ofstd/oflist.h \
../../ofstd/include/dcmtk/ofstd/ofconsol.h \
- ../../ofstd/include/dcmtk/ofstd/ofthread.h \
../../ofstd/include/dcmtk/ofstd/offile.h \
../../ofstd/include/dcmtk/ofstd/ofstd.h \
../../ofstd/include/dcmtk/ofstd/oftraits.h \
- ../../ofstd/include/dcmtk/ofstd/ofcond.h \
../../ofstd/include/dcmtk/ofstd/oflimits.h \
../../config/include/dcmtk/config/arith.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
- ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dctag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \
- ../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdict.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
../../dcmdata/include/dcmtk/dcmdata/dclist.h \
../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcmetinf.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicdir.h \
+ ../../ofstd/include/dcmtk/ofstd/ofexbl.h \
+ ../include/dcmtk/dcmsr/cmr/define.h \
../../ofstd/include/dcmtk/ofstd/ofmap.h \
../../ofstd/include/dcmtk/ofstd/ofutil.h \
- ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdirrec.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrulup.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixseq.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcofsetl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrae.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvras.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
- ../../ofstd/include/dcmtk/ofstd/ofdate.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrds.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrdt.h \
- ../../ofstd/include/dcmtk/ofstd/ofdatime.h \
- ../../ofstd/include/dcmtk/ofstd/oftime.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrur.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlt.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrst.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvruc.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrut.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrobow.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixel.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpobw.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcovlay.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
- ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
- ../include/dcmtk/dcmsr/dsdefine.h \
- ../../ofstd/include/dcmtk/ofstd/ofexbl.h \
- ../include/dcmtk/dcmsr/cmr/define.h
+ ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h
cid4031.o: cid4031.cc ../../config/include/dcmtk/config/osconfig.h \
../include/dcmtk/dcmsr/cmr/cid4031.h ../include/dcmtk/dcmsr/dsrctxgr.h \
../include/dcmtk/dcmsr/dsrcodvl.h ../include/dcmtk/dcmsr/dsrtypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctk.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
- ../../oflog/include/dcmtk/oflog/oflog.h \
- ../../oflog/include/dcmtk/oflog/logger.h \
- ../../oflog/include/dcmtk/oflog/config.h \
+ ../include/dcmtk/dcmsr/dsdefine.h \
../../ofstd/include/dcmtk/ofstd/ofdefine.h \
../../ofstd/include/dcmtk/ofstd/ofcast.h \
../../ofstd/include/dcmtk/ofstd/ofexport.h \
../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
+ ../../ofstd/include/dcmtk/ofstd/ofthread.h \
+ ../../ofstd/include/dcmtk/ofstd/oftypes.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstream.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstring.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcond.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
+ ../../oflog/include/dcmtk/oflog/oflog.h \
+ ../../oflog/include/dcmtk/oflog/logger.h \
+ ../../oflog/include/dcmtk/oflog/config.h \
../../oflog/include/dcmtk/oflog/config/defines.h \
../../oflog/include/dcmtk/oflog/helpers/threadcf.h \
../../oflog/include/dcmtk/oflog/loglevel.h \
../../ofstd/include/dcmtk/ofstd/ofvector.h \
- ../../ofstd/include/dcmtk/ofstd/oftypes.h \
- ../../ofstd/include/dcmtk/ofstd/ofstream.h \
../../oflog/include/dcmtk/oflog/tstring.h \
- ../../ofstd/include/dcmtk/ofstd/ofstring.h \
../../oflog/include/dcmtk/oflog/tchar.h \
../../oflog/include/dcmtk/oflog/spi/apndatch.h \
../../oflog/include/dcmtk/oflog/appender.h \
@@ -1456,107 +815,53 @@ cid4031.o: cid4031.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofcmdln.h \
../../ofstd/include/dcmtk/ofstd/oflist.h \
../../ofstd/include/dcmtk/ofstd/ofconsol.h \
- ../../ofstd/include/dcmtk/ofstd/ofthread.h \
../../ofstd/include/dcmtk/ofstd/offile.h \
../../ofstd/include/dcmtk/ofstd/ofstd.h \
../../ofstd/include/dcmtk/ofstd/oftraits.h \
- ../../ofstd/include/dcmtk/ofstd/ofcond.h \
../../ofstd/include/dcmtk/ofstd/oflimits.h \
../../config/include/dcmtk/config/arith.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
- ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dctag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \
- ../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdict.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
../../dcmdata/include/dcmtk/dcmdata/dclist.h \
../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcmetinf.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicdir.h \
+ ../../ofstd/include/dcmtk/ofstd/ofexbl.h \
+ ../include/dcmtk/dcmsr/cmr/define.h \
../../ofstd/include/dcmtk/ofstd/ofmap.h \
../../ofstd/include/dcmtk/ofstd/ofutil.h \
- ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdirrec.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrulup.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixseq.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcofsetl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrae.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvras.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
- ../../ofstd/include/dcmtk/ofstd/ofdate.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrds.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrdt.h \
- ../../ofstd/include/dcmtk/ofstd/ofdatime.h \
- ../../ofstd/include/dcmtk/ofstd/oftime.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrur.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlt.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrst.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvruc.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrut.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrobow.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixel.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpobw.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcovlay.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
- ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
- ../include/dcmtk/dcmsr/dsdefine.h \
- ../../ofstd/include/dcmtk/ofstd/ofexbl.h \
- ../include/dcmtk/dcmsr/cmr/define.h
+ ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h
cid4031e.o: cid4031e.cc ../../config/include/dcmtk/config/osconfig.h \
../include/dcmtk/dcmsr/cmr/cid4031e.h \
../include/dcmtk/dcmsr/cmr/cid4031.h ../include/dcmtk/dcmsr/dsrctxgr.h \
../include/dcmtk/dcmsr/dsrcodvl.h ../include/dcmtk/dcmsr/dsrtypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctk.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
- ../../oflog/include/dcmtk/oflog/oflog.h \
- ../../oflog/include/dcmtk/oflog/logger.h \
- ../../oflog/include/dcmtk/oflog/config.h \
+ ../include/dcmtk/dcmsr/dsdefine.h \
../../ofstd/include/dcmtk/ofstd/ofdefine.h \
../../ofstd/include/dcmtk/ofstd/ofcast.h \
../../ofstd/include/dcmtk/ofstd/ofexport.h \
../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
+ ../../ofstd/include/dcmtk/ofstd/ofthread.h \
+ ../../ofstd/include/dcmtk/ofstd/oftypes.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstream.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstring.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcond.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
+ ../../oflog/include/dcmtk/oflog/oflog.h \
+ ../../oflog/include/dcmtk/oflog/logger.h \
+ ../../oflog/include/dcmtk/oflog/config.h \
../../oflog/include/dcmtk/oflog/config/defines.h \
../../oflog/include/dcmtk/oflog/helpers/threadcf.h \
../../oflog/include/dcmtk/oflog/loglevel.h \
../../ofstd/include/dcmtk/ofstd/ofvector.h \
- ../../ofstd/include/dcmtk/ofstd/oftypes.h \
- ../../ofstd/include/dcmtk/ofstd/ofstream.h \
../../oflog/include/dcmtk/oflog/tstring.h \
- ../../ofstd/include/dcmtk/ofstd/ofstring.h \
../../oflog/include/dcmtk/oflog/tchar.h \
../../oflog/include/dcmtk/oflog/spi/apndatch.h \
../../oflog/include/dcmtk/oflog/appender.h \
@@ -1575,106 +880,52 @@ cid4031e.o: cid4031e.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofcmdln.h \
../../ofstd/include/dcmtk/ofstd/oflist.h \
../../ofstd/include/dcmtk/ofstd/ofconsol.h \
- ../../ofstd/include/dcmtk/ofstd/ofthread.h \
../../ofstd/include/dcmtk/ofstd/offile.h \
../../ofstd/include/dcmtk/ofstd/ofstd.h \
../../ofstd/include/dcmtk/ofstd/oftraits.h \
- ../../ofstd/include/dcmtk/ofstd/ofcond.h \
../../ofstd/include/dcmtk/ofstd/oflimits.h \
../../config/include/dcmtk/config/arith.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
- ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dctag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \
- ../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdict.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
../../dcmdata/include/dcmtk/dcmdata/dclist.h \
../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcmetinf.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicdir.h \
+ ../../ofstd/include/dcmtk/ofstd/ofexbl.h \
+ ../include/dcmtk/dcmsr/cmr/define.h \
../../ofstd/include/dcmtk/ofstd/ofmap.h \
../../ofstd/include/dcmtk/ofstd/ofutil.h \
- ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdirrec.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrulup.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixseq.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcofsetl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrae.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvras.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
- ../../ofstd/include/dcmtk/ofstd/ofdate.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrds.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrdt.h \
- ../../ofstd/include/dcmtk/ofstd/ofdatime.h \
- ../../ofstd/include/dcmtk/ofstd/oftime.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrur.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlt.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrst.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvruc.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrut.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrobow.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixel.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpobw.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcovlay.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
- ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
- ../include/dcmtk/dcmsr/dsdefine.h \
- ../../ofstd/include/dcmtk/ofstd/ofexbl.h \
- ../include/dcmtk/dcmsr/cmr/define.h
+ ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h
cid42.o: cid42.cc ../../config/include/dcmtk/config/osconfig.h \
../include/dcmtk/dcmsr/cmr/cid42.h ../include/dcmtk/dcmsr/dsrctxgr.h \
../include/dcmtk/dcmsr/dsrcodvl.h ../include/dcmtk/dcmsr/dsrtypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctk.h \
+ ../include/dcmtk/dcmsr/dsdefine.h \
+ ../../ofstd/include/dcmtk/ofstd/ofdefine.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcast.h \
+ ../../ofstd/include/dcmtk/ofstd/ofexport.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
+ ../../ofstd/include/dcmtk/ofstd/ofthread.h \
+ ../../ofstd/include/dcmtk/ofstd/oftypes.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstream.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstring.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcond.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
../../oflog/include/dcmtk/oflog/oflog.h \
../../oflog/include/dcmtk/oflog/logger.h \
../../oflog/include/dcmtk/oflog/config.h \
- ../../ofstd/include/dcmtk/ofstd/ofdefine.h \
- ../../ofstd/include/dcmtk/ofstd/ofcast.h \
- ../../ofstd/include/dcmtk/ofstd/ofexport.h \
- ../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
../../oflog/include/dcmtk/oflog/config/defines.h \
../../oflog/include/dcmtk/oflog/helpers/threadcf.h \
../../oflog/include/dcmtk/oflog/loglevel.h \
../../ofstd/include/dcmtk/ofstd/ofvector.h \
- ../../ofstd/include/dcmtk/ofstd/oftypes.h \
- ../../ofstd/include/dcmtk/ofstd/ofstream.h \
../../oflog/include/dcmtk/oflog/tstring.h \
- ../../ofstd/include/dcmtk/ofstd/ofstring.h \
../../oflog/include/dcmtk/oflog/tchar.h \
../../oflog/include/dcmtk/oflog/spi/apndatch.h \
../../oflog/include/dcmtk/oflog/appender.h \
@@ -1693,106 +944,52 @@ cid42.o: cid42.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofcmdln.h \
../../ofstd/include/dcmtk/ofstd/oflist.h \
../../ofstd/include/dcmtk/ofstd/ofconsol.h \
- ../../ofstd/include/dcmtk/ofstd/ofthread.h \
../../ofstd/include/dcmtk/ofstd/offile.h \
../../ofstd/include/dcmtk/ofstd/ofstd.h \
../../ofstd/include/dcmtk/ofstd/oftraits.h \
- ../../ofstd/include/dcmtk/ofstd/ofcond.h \
../../ofstd/include/dcmtk/ofstd/oflimits.h \
../../config/include/dcmtk/config/arith.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
- ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dctag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \
- ../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdict.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
../../dcmdata/include/dcmtk/dcmdata/dclist.h \
../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcmetinf.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicdir.h \
+ ../../ofstd/include/dcmtk/ofstd/ofexbl.h \
+ ../include/dcmtk/dcmsr/cmr/define.h \
../../ofstd/include/dcmtk/ofstd/ofmap.h \
../../ofstd/include/dcmtk/ofstd/ofutil.h \
- ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdirrec.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrulup.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixseq.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcofsetl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrae.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvras.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
- ../../ofstd/include/dcmtk/ofstd/ofdate.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrds.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrdt.h \
- ../../ofstd/include/dcmtk/ofstd/ofdatime.h \
- ../../ofstd/include/dcmtk/ofstd/oftime.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrur.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlt.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrst.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvruc.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrut.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrobow.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixel.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpobw.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcovlay.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
- ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
- ../include/dcmtk/dcmsr/dsdefine.h \
- ../../ofstd/include/dcmtk/ofstd/ofexbl.h \
- ../include/dcmtk/dcmsr/cmr/define.h
+ ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h
cid5000.o: cid5000.cc ../../config/include/dcmtk/config/osconfig.h \
../include/dcmtk/dcmsr/cmr/cid5000.h ../include/dcmtk/dcmsr/dsrctxgr.h \
../include/dcmtk/dcmsr/dsrcodvl.h ../include/dcmtk/dcmsr/dsrtypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctk.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
- ../../oflog/include/dcmtk/oflog/oflog.h \
- ../../oflog/include/dcmtk/oflog/logger.h \
- ../../oflog/include/dcmtk/oflog/config.h \
+ ../include/dcmtk/dcmsr/dsdefine.h \
../../ofstd/include/dcmtk/ofstd/ofdefine.h \
../../ofstd/include/dcmtk/ofstd/ofcast.h \
../../ofstd/include/dcmtk/ofstd/ofexport.h \
../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
+ ../../ofstd/include/dcmtk/ofstd/ofthread.h \
+ ../../ofstd/include/dcmtk/ofstd/oftypes.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstream.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstring.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcond.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
+ ../../oflog/include/dcmtk/oflog/oflog.h \
+ ../../oflog/include/dcmtk/oflog/logger.h \
+ ../../oflog/include/dcmtk/oflog/config.h \
../../oflog/include/dcmtk/oflog/config/defines.h \
../../oflog/include/dcmtk/oflog/helpers/threadcf.h \
../../oflog/include/dcmtk/oflog/loglevel.h \
../../ofstd/include/dcmtk/ofstd/ofvector.h \
- ../../ofstd/include/dcmtk/ofstd/oftypes.h \
- ../../ofstd/include/dcmtk/ofstd/ofstream.h \
../../oflog/include/dcmtk/oflog/tstring.h \
- ../../ofstd/include/dcmtk/ofstd/ofstring.h \
../../oflog/include/dcmtk/oflog/tchar.h \
../../oflog/include/dcmtk/oflog/spi/apndatch.h \
../../oflog/include/dcmtk/oflog/appender.h \
@@ -1811,106 +1008,52 @@ cid5000.o: cid5000.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofcmdln.h \
../../ofstd/include/dcmtk/ofstd/oflist.h \
../../ofstd/include/dcmtk/ofstd/ofconsol.h \
- ../../ofstd/include/dcmtk/ofstd/ofthread.h \
../../ofstd/include/dcmtk/ofstd/offile.h \
../../ofstd/include/dcmtk/ofstd/ofstd.h \
../../ofstd/include/dcmtk/ofstd/oftraits.h \
- ../../ofstd/include/dcmtk/ofstd/ofcond.h \
../../ofstd/include/dcmtk/ofstd/oflimits.h \
../../config/include/dcmtk/config/arith.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
- ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dctag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \
- ../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdict.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
../../dcmdata/include/dcmtk/dcmdata/dclist.h \
../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcmetinf.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicdir.h \
+ ../../ofstd/include/dcmtk/ofstd/ofexbl.h \
+ ../include/dcmtk/dcmsr/cmr/define.h \
../../ofstd/include/dcmtk/ofstd/ofmap.h \
../../ofstd/include/dcmtk/ofstd/ofutil.h \
- ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdirrec.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrulup.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixseq.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcofsetl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrae.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvras.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
- ../../ofstd/include/dcmtk/ofstd/ofdate.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrds.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrdt.h \
- ../../ofstd/include/dcmtk/ofstd/ofdatime.h \
- ../../ofstd/include/dcmtk/ofstd/oftime.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrur.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlt.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrst.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvruc.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrut.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrobow.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixel.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpobw.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcovlay.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
- ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
- ../include/dcmtk/dcmsr/dsdefine.h \
- ../../ofstd/include/dcmtk/ofstd/ofexbl.h \
- ../include/dcmtk/dcmsr/cmr/define.h
+ ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h
cid5001.o: cid5001.cc ../../config/include/dcmtk/config/osconfig.h \
../include/dcmtk/dcmsr/cmr/cid5001.h ../include/dcmtk/dcmsr/dsrctxgr.h \
../include/dcmtk/dcmsr/dsrcodvl.h ../include/dcmtk/dcmsr/dsrtypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctk.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
- ../../oflog/include/dcmtk/oflog/oflog.h \
- ../../oflog/include/dcmtk/oflog/logger.h \
- ../../oflog/include/dcmtk/oflog/config.h \
+ ../include/dcmtk/dcmsr/dsdefine.h \
../../ofstd/include/dcmtk/ofstd/ofdefine.h \
../../ofstd/include/dcmtk/ofstd/ofcast.h \
../../ofstd/include/dcmtk/ofstd/ofexport.h \
../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
+ ../../ofstd/include/dcmtk/ofstd/ofthread.h \
+ ../../ofstd/include/dcmtk/ofstd/oftypes.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstream.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstring.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcond.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
+ ../../oflog/include/dcmtk/oflog/oflog.h \
+ ../../oflog/include/dcmtk/oflog/logger.h \
+ ../../oflog/include/dcmtk/oflog/config.h \
../../oflog/include/dcmtk/oflog/config/defines.h \
../../oflog/include/dcmtk/oflog/helpers/threadcf.h \
../../oflog/include/dcmtk/oflog/loglevel.h \
../../ofstd/include/dcmtk/ofstd/ofvector.h \
- ../../ofstd/include/dcmtk/ofstd/oftypes.h \
- ../../ofstd/include/dcmtk/ofstd/ofstream.h \
../../oflog/include/dcmtk/oflog/tstring.h \
- ../../ofstd/include/dcmtk/ofstd/ofstring.h \
../../oflog/include/dcmtk/oflog/tchar.h \
../../oflog/include/dcmtk/oflog/spi/apndatch.h \
../../oflog/include/dcmtk/oflog/appender.h \
@@ -1929,106 +1072,52 @@ cid5001.o: cid5001.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofcmdln.h \
../../ofstd/include/dcmtk/ofstd/oflist.h \
../../ofstd/include/dcmtk/ofstd/ofconsol.h \
- ../../ofstd/include/dcmtk/ofstd/ofthread.h \
../../ofstd/include/dcmtk/ofstd/offile.h \
../../ofstd/include/dcmtk/ofstd/ofstd.h \
../../ofstd/include/dcmtk/ofstd/oftraits.h \
- ../../ofstd/include/dcmtk/ofstd/ofcond.h \
../../ofstd/include/dcmtk/ofstd/oflimits.h \
../../config/include/dcmtk/config/arith.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
- ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dctag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \
- ../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdict.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
../../dcmdata/include/dcmtk/dcmdata/dclist.h \
../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcmetinf.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicdir.h \
+ ../../ofstd/include/dcmtk/ofstd/ofexbl.h \
+ ../include/dcmtk/dcmsr/cmr/define.h \
../../ofstd/include/dcmtk/ofstd/ofmap.h \
../../ofstd/include/dcmtk/ofstd/ofutil.h \
- ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdirrec.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrulup.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixseq.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcofsetl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrae.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvras.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
- ../../ofstd/include/dcmtk/ofstd/ofdate.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrds.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrdt.h \
- ../../ofstd/include/dcmtk/ofstd/ofdatime.h \
- ../../ofstd/include/dcmtk/ofstd/oftime.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrur.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlt.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrst.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvruc.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrut.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrobow.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixel.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpobw.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcovlay.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
- ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
- ../include/dcmtk/dcmsr/dsdefine.h \
- ../../ofstd/include/dcmtk/ofstd/ofexbl.h \
- ../include/dcmtk/dcmsr/cmr/define.h
+ ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h
cid6147.o: cid6147.cc ../../config/include/dcmtk/config/osconfig.h \
../include/dcmtk/dcmsr/cmr/cid6147.h ../include/dcmtk/dcmsr/dsrctxgr.h \
../include/dcmtk/dcmsr/dsrcodvl.h ../include/dcmtk/dcmsr/dsrtypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctk.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
- ../../oflog/include/dcmtk/oflog/oflog.h \
- ../../oflog/include/dcmtk/oflog/logger.h \
- ../../oflog/include/dcmtk/oflog/config.h \
+ ../include/dcmtk/dcmsr/dsdefine.h \
../../ofstd/include/dcmtk/ofstd/ofdefine.h \
../../ofstd/include/dcmtk/ofstd/ofcast.h \
../../ofstd/include/dcmtk/ofstd/ofexport.h \
../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
+ ../../ofstd/include/dcmtk/ofstd/ofthread.h \
+ ../../ofstd/include/dcmtk/ofstd/oftypes.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstream.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstring.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcond.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
+ ../../oflog/include/dcmtk/oflog/oflog.h \
+ ../../oflog/include/dcmtk/oflog/logger.h \
+ ../../oflog/include/dcmtk/oflog/config.h \
../../oflog/include/dcmtk/oflog/config/defines.h \
../../oflog/include/dcmtk/oflog/helpers/threadcf.h \
../../oflog/include/dcmtk/oflog/loglevel.h \
../../ofstd/include/dcmtk/ofstd/ofvector.h \
- ../../ofstd/include/dcmtk/ofstd/oftypes.h \
- ../../ofstd/include/dcmtk/ofstd/ofstream.h \
../../oflog/include/dcmtk/oflog/tstring.h \
- ../../ofstd/include/dcmtk/ofstd/ofstring.h \
../../oflog/include/dcmtk/oflog/tchar.h \
../../oflog/include/dcmtk/oflog/spi/apndatch.h \
../../oflog/include/dcmtk/oflog/appender.h \
@@ -2047,106 +1136,52 @@ cid6147.o: cid6147.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofcmdln.h \
../../ofstd/include/dcmtk/ofstd/oflist.h \
../../ofstd/include/dcmtk/ofstd/ofconsol.h \
- ../../ofstd/include/dcmtk/ofstd/ofthread.h \
../../ofstd/include/dcmtk/ofstd/offile.h \
../../ofstd/include/dcmtk/ofstd/ofstd.h \
../../ofstd/include/dcmtk/ofstd/oftraits.h \
- ../../ofstd/include/dcmtk/ofstd/ofcond.h \
../../ofstd/include/dcmtk/ofstd/oflimits.h \
../../config/include/dcmtk/config/arith.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
- ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dctag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \
- ../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdict.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
../../dcmdata/include/dcmtk/dcmdata/dclist.h \
../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcmetinf.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicdir.h \
+ ../../ofstd/include/dcmtk/ofstd/ofexbl.h \
+ ../include/dcmtk/dcmsr/cmr/define.h \
../../ofstd/include/dcmtk/ofstd/ofmap.h \
../../ofstd/include/dcmtk/ofstd/ofutil.h \
- ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdirrec.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrulup.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixseq.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcofsetl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrae.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvras.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
- ../../ofstd/include/dcmtk/ofstd/ofdate.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrds.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrdt.h \
- ../../ofstd/include/dcmtk/ofstd/ofdatime.h \
- ../../ofstd/include/dcmtk/ofstd/oftime.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrur.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlt.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrst.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvruc.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrut.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrobow.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixel.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpobw.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcovlay.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
- ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
- ../include/dcmtk/dcmsr/dsdefine.h \
- ../../ofstd/include/dcmtk/ofstd/ofexbl.h \
- ../include/dcmtk/dcmsr/cmr/define.h
+ ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h
cid7021.o: cid7021.cc ../../config/include/dcmtk/config/osconfig.h \
../include/dcmtk/dcmsr/cmr/cid7021.h ../include/dcmtk/dcmsr/dsrctxgr.h \
../include/dcmtk/dcmsr/dsrcodvl.h ../include/dcmtk/dcmsr/dsrtypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctk.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
- ../../oflog/include/dcmtk/oflog/oflog.h \
- ../../oflog/include/dcmtk/oflog/logger.h \
- ../../oflog/include/dcmtk/oflog/config.h \
+ ../include/dcmtk/dcmsr/dsdefine.h \
../../ofstd/include/dcmtk/ofstd/ofdefine.h \
../../ofstd/include/dcmtk/ofstd/ofcast.h \
../../ofstd/include/dcmtk/ofstd/ofexport.h \
../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
+ ../../ofstd/include/dcmtk/ofstd/ofthread.h \
+ ../../ofstd/include/dcmtk/ofstd/oftypes.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstream.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstring.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcond.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
+ ../../oflog/include/dcmtk/oflog/oflog.h \
+ ../../oflog/include/dcmtk/oflog/logger.h \
+ ../../oflog/include/dcmtk/oflog/config.h \
../../oflog/include/dcmtk/oflog/config/defines.h \
../../oflog/include/dcmtk/oflog/helpers/threadcf.h \
../../oflog/include/dcmtk/oflog/loglevel.h \
../../ofstd/include/dcmtk/ofstd/ofvector.h \
- ../../ofstd/include/dcmtk/ofstd/oftypes.h \
- ../../ofstd/include/dcmtk/ofstd/ofstream.h \
../../oflog/include/dcmtk/oflog/tstring.h \
- ../../ofstd/include/dcmtk/ofstd/ofstring.h \
../../oflog/include/dcmtk/oflog/tchar.h \
../../oflog/include/dcmtk/oflog/spi/apndatch.h \
../../oflog/include/dcmtk/oflog/appender.h \
@@ -2165,106 +1200,52 @@ cid7021.o: cid7021.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofcmdln.h \
../../ofstd/include/dcmtk/ofstd/oflist.h \
../../ofstd/include/dcmtk/ofstd/ofconsol.h \
- ../../ofstd/include/dcmtk/ofstd/ofthread.h \
../../ofstd/include/dcmtk/ofstd/offile.h \
../../ofstd/include/dcmtk/ofstd/ofstd.h \
../../ofstd/include/dcmtk/ofstd/oftraits.h \
- ../../ofstd/include/dcmtk/ofstd/ofcond.h \
../../ofstd/include/dcmtk/ofstd/oflimits.h \
../../config/include/dcmtk/config/arith.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
- ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dctag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \
- ../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdict.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
../../dcmdata/include/dcmtk/dcmdata/dclist.h \
../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcmetinf.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicdir.h \
+ ../../ofstd/include/dcmtk/ofstd/ofexbl.h \
+ ../include/dcmtk/dcmsr/cmr/define.h \
../../ofstd/include/dcmtk/ofstd/ofmap.h \
../../ofstd/include/dcmtk/ofstd/ofutil.h \
- ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdirrec.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrulup.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixseq.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcofsetl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrae.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvras.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
- ../../ofstd/include/dcmtk/ofstd/ofdate.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrds.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrdt.h \
- ../../ofstd/include/dcmtk/ofstd/ofdatime.h \
- ../../ofstd/include/dcmtk/ofstd/oftime.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrur.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlt.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrst.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvruc.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrut.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrobow.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixel.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpobw.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcovlay.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
- ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
- ../include/dcmtk/dcmsr/dsdefine.h \
- ../../ofstd/include/dcmtk/ofstd/ofexbl.h \
- ../include/dcmtk/dcmsr/cmr/define.h
+ ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h
cid7181.o: cid7181.cc ../../config/include/dcmtk/config/osconfig.h \
../include/dcmtk/dcmsr/cmr/cid7181.h ../include/dcmtk/dcmsr/dsrctxgr.h \
../include/dcmtk/dcmsr/dsrcodvl.h ../include/dcmtk/dcmsr/dsrtypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctk.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
- ../../oflog/include/dcmtk/oflog/oflog.h \
- ../../oflog/include/dcmtk/oflog/logger.h \
- ../../oflog/include/dcmtk/oflog/config.h \
+ ../include/dcmtk/dcmsr/dsdefine.h \
../../ofstd/include/dcmtk/ofstd/ofdefine.h \
../../ofstd/include/dcmtk/ofstd/ofcast.h \
../../ofstd/include/dcmtk/ofstd/ofexport.h \
../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
+ ../../ofstd/include/dcmtk/ofstd/ofthread.h \
+ ../../ofstd/include/dcmtk/ofstd/oftypes.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstream.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstring.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcond.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
+ ../../oflog/include/dcmtk/oflog/oflog.h \
+ ../../oflog/include/dcmtk/oflog/logger.h \
+ ../../oflog/include/dcmtk/oflog/config.h \
../../oflog/include/dcmtk/oflog/config/defines.h \
../../oflog/include/dcmtk/oflog/helpers/threadcf.h \
../../oflog/include/dcmtk/oflog/loglevel.h \
../../ofstd/include/dcmtk/ofstd/ofvector.h \
- ../../ofstd/include/dcmtk/ofstd/oftypes.h \
- ../../ofstd/include/dcmtk/ofstd/ofstream.h \
../../oflog/include/dcmtk/oflog/tstring.h \
- ../../ofstd/include/dcmtk/ofstd/ofstring.h \
../../oflog/include/dcmtk/oflog/tchar.h \
../../oflog/include/dcmtk/oflog/spi/apndatch.h \
../../oflog/include/dcmtk/oflog/appender.h \
@@ -2283,106 +1264,52 @@ cid7181.o: cid7181.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofcmdln.h \
../../ofstd/include/dcmtk/ofstd/oflist.h \
../../ofstd/include/dcmtk/ofstd/ofconsol.h \
- ../../ofstd/include/dcmtk/ofstd/ofthread.h \
../../ofstd/include/dcmtk/ofstd/offile.h \
../../ofstd/include/dcmtk/ofstd/ofstd.h \
../../ofstd/include/dcmtk/ofstd/oftraits.h \
- ../../ofstd/include/dcmtk/ofstd/ofcond.h \
../../ofstd/include/dcmtk/ofstd/oflimits.h \
../../config/include/dcmtk/config/arith.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
- ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dctag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \
- ../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdict.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
../../dcmdata/include/dcmtk/dcmdata/dclist.h \
../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcmetinf.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicdir.h \
+ ../../ofstd/include/dcmtk/ofstd/ofexbl.h \
+ ../include/dcmtk/dcmsr/cmr/define.h \
../../ofstd/include/dcmtk/ofstd/ofmap.h \
../../ofstd/include/dcmtk/ofstd/ofutil.h \
- ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdirrec.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrulup.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixseq.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcofsetl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrae.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvras.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
- ../../ofstd/include/dcmtk/ofstd/ofdate.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrds.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrdt.h \
- ../../ofstd/include/dcmtk/ofstd/ofdatime.h \
- ../../ofstd/include/dcmtk/ofstd/oftime.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrur.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlt.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrst.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvruc.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrut.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrobow.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixel.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpobw.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcovlay.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
- ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
- ../include/dcmtk/dcmsr/dsdefine.h \
- ../../ofstd/include/dcmtk/ofstd/ofexbl.h \
- ../include/dcmtk/dcmsr/cmr/define.h
+ ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h
cid7445.o: cid7445.cc ../../config/include/dcmtk/config/osconfig.h \
../include/dcmtk/dcmsr/cmr/cid7445.h ../include/dcmtk/dcmsr/dsrctxgr.h \
../include/dcmtk/dcmsr/dsrcodvl.h ../include/dcmtk/dcmsr/dsrtypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctk.h \
+ ../include/dcmtk/dcmsr/dsdefine.h \
+ ../../ofstd/include/dcmtk/ofstd/ofdefine.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcast.h \
+ ../../ofstd/include/dcmtk/ofstd/ofexport.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
+ ../../ofstd/include/dcmtk/ofstd/ofthread.h \
+ ../../ofstd/include/dcmtk/ofstd/oftypes.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstream.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstring.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcond.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
../../oflog/include/dcmtk/oflog/oflog.h \
../../oflog/include/dcmtk/oflog/logger.h \
../../oflog/include/dcmtk/oflog/config.h \
- ../../ofstd/include/dcmtk/ofstd/ofdefine.h \
- ../../ofstd/include/dcmtk/ofstd/ofcast.h \
- ../../ofstd/include/dcmtk/ofstd/ofexport.h \
- ../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
../../oflog/include/dcmtk/oflog/config/defines.h \
../../oflog/include/dcmtk/oflog/helpers/threadcf.h \
../../oflog/include/dcmtk/oflog/loglevel.h \
../../ofstd/include/dcmtk/ofstd/ofvector.h \
- ../../ofstd/include/dcmtk/ofstd/oftypes.h \
- ../../ofstd/include/dcmtk/ofstd/ofstream.h \
../../oflog/include/dcmtk/oflog/tstring.h \
- ../../ofstd/include/dcmtk/ofstd/ofstring.h \
../../oflog/include/dcmtk/oflog/tchar.h \
../../oflog/include/dcmtk/oflog/spi/apndatch.h \
../../oflog/include/dcmtk/oflog/appender.h \
@@ -2401,106 +1328,52 @@ cid7445.o: cid7445.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofcmdln.h \
../../ofstd/include/dcmtk/ofstd/oflist.h \
../../ofstd/include/dcmtk/ofstd/ofconsol.h \
- ../../ofstd/include/dcmtk/ofstd/ofthread.h \
../../ofstd/include/dcmtk/ofstd/offile.h \
../../ofstd/include/dcmtk/ofstd/ofstd.h \
../../ofstd/include/dcmtk/ofstd/oftraits.h \
- ../../ofstd/include/dcmtk/ofstd/ofcond.h \
../../ofstd/include/dcmtk/ofstd/oflimits.h \
../../config/include/dcmtk/config/arith.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
- ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dctag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \
- ../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdict.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
../../dcmdata/include/dcmtk/dcmdata/dclist.h \
../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcmetinf.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicdir.h \
+ ../../ofstd/include/dcmtk/ofstd/ofexbl.h \
+ ../include/dcmtk/dcmsr/cmr/define.h \
../../ofstd/include/dcmtk/ofstd/ofmap.h \
../../ofstd/include/dcmtk/ofstd/ofutil.h \
- ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdirrec.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrulup.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixseq.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcofsetl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrae.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvras.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
- ../../ofstd/include/dcmtk/ofstd/ofdate.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrds.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrdt.h \
- ../../ofstd/include/dcmtk/ofstd/ofdatime.h \
- ../../ofstd/include/dcmtk/ofstd/oftime.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrur.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlt.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrst.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvruc.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrut.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrobow.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixel.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpobw.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcovlay.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
- ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
- ../include/dcmtk/dcmsr/dsdefine.h \
- ../../ofstd/include/dcmtk/ofstd/ofexbl.h \
- ../include/dcmtk/dcmsr/cmr/define.h
+ ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h
cid7452.o: cid7452.cc ../../config/include/dcmtk/config/osconfig.h \
../include/dcmtk/dcmsr/cmr/cid7452.h ../include/dcmtk/dcmsr/dsrctxgr.h \
../include/dcmtk/dcmsr/dsrcodvl.h ../include/dcmtk/dcmsr/dsrtypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctk.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
- ../../oflog/include/dcmtk/oflog/oflog.h \
- ../../oflog/include/dcmtk/oflog/logger.h \
- ../../oflog/include/dcmtk/oflog/config.h \
+ ../include/dcmtk/dcmsr/dsdefine.h \
../../ofstd/include/dcmtk/ofstd/ofdefine.h \
../../ofstd/include/dcmtk/ofstd/ofcast.h \
../../ofstd/include/dcmtk/ofstd/ofexport.h \
../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
+ ../../ofstd/include/dcmtk/ofstd/ofthread.h \
+ ../../ofstd/include/dcmtk/ofstd/oftypes.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstream.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstring.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcond.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
+ ../../oflog/include/dcmtk/oflog/oflog.h \
+ ../../oflog/include/dcmtk/oflog/logger.h \
+ ../../oflog/include/dcmtk/oflog/config.h \
../../oflog/include/dcmtk/oflog/config/defines.h \
../../oflog/include/dcmtk/oflog/helpers/threadcf.h \
../../oflog/include/dcmtk/oflog/loglevel.h \
../../ofstd/include/dcmtk/ofstd/ofvector.h \
- ../../ofstd/include/dcmtk/ofstd/oftypes.h \
- ../../ofstd/include/dcmtk/ofstd/ofstream.h \
../../oflog/include/dcmtk/oflog/tstring.h \
- ../../ofstd/include/dcmtk/ofstd/ofstring.h \
../../oflog/include/dcmtk/oflog/tchar.h \
../../oflog/include/dcmtk/oflog/spi/apndatch.h \
../../oflog/include/dcmtk/oflog/appender.h \
@@ -2519,106 +1392,52 @@ cid7452.o: cid7452.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofcmdln.h \
../../ofstd/include/dcmtk/ofstd/oflist.h \
../../ofstd/include/dcmtk/ofstd/ofconsol.h \
- ../../ofstd/include/dcmtk/ofstd/ofthread.h \
../../ofstd/include/dcmtk/ofstd/offile.h \
../../ofstd/include/dcmtk/ofstd/ofstd.h \
../../ofstd/include/dcmtk/ofstd/oftraits.h \
- ../../ofstd/include/dcmtk/ofstd/ofcond.h \
../../ofstd/include/dcmtk/ofstd/oflimits.h \
../../config/include/dcmtk/config/arith.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
- ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dctag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \
- ../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdict.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
../../dcmdata/include/dcmtk/dcmdata/dclist.h \
../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcmetinf.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicdir.h \
+ ../../ofstd/include/dcmtk/ofstd/ofexbl.h \
+ ../include/dcmtk/dcmsr/cmr/define.h \
../../ofstd/include/dcmtk/ofstd/ofmap.h \
../../ofstd/include/dcmtk/ofstd/ofutil.h \
- ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdirrec.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrulup.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixseq.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcofsetl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrae.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvras.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
- ../../ofstd/include/dcmtk/ofstd/ofdate.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrds.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrdt.h \
- ../../ofstd/include/dcmtk/ofstd/ofdatime.h \
- ../../ofstd/include/dcmtk/ofstd/oftime.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrur.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlt.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrst.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvruc.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrut.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrobow.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixel.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpobw.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcovlay.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
- ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
- ../include/dcmtk/dcmsr/dsdefine.h \
- ../../ofstd/include/dcmtk/ofstd/ofexbl.h \
- ../include/dcmtk/dcmsr/cmr/define.h
+ ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h
cid7453.o: cid7453.cc ../../config/include/dcmtk/config/osconfig.h \
../include/dcmtk/dcmsr/cmr/cid7453.h ../include/dcmtk/dcmsr/dsrctxgr.h \
../include/dcmtk/dcmsr/dsrcodvl.h ../include/dcmtk/dcmsr/dsrtypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctk.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
- ../../oflog/include/dcmtk/oflog/oflog.h \
- ../../oflog/include/dcmtk/oflog/logger.h \
- ../../oflog/include/dcmtk/oflog/config.h \
+ ../include/dcmtk/dcmsr/dsdefine.h \
../../ofstd/include/dcmtk/ofstd/ofdefine.h \
../../ofstd/include/dcmtk/ofstd/ofcast.h \
../../ofstd/include/dcmtk/ofstd/ofexport.h \
../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
+ ../../ofstd/include/dcmtk/ofstd/ofthread.h \
+ ../../ofstd/include/dcmtk/ofstd/oftypes.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstream.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstring.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcond.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
+ ../../oflog/include/dcmtk/oflog/oflog.h \
+ ../../oflog/include/dcmtk/oflog/logger.h \
+ ../../oflog/include/dcmtk/oflog/config.h \
../../oflog/include/dcmtk/oflog/config/defines.h \
../../oflog/include/dcmtk/oflog/helpers/threadcf.h \
../../oflog/include/dcmtk/oflog/loglevel.h \
../../ofstd/include/dcmtk/ofstd/ofvector.h \
- ../../ofstd/include/dcmtk/ofstd/oftypes.h \
- ../../ofstd/include/dcmtk/ofstd/ofstream.h \
../../oflog/include/dcmtk/oflog/tstring.h \
- ../../ofstd/include/dcmtk/ofstd/ofstring.h \
../../oflog/include/dcmtk/oflog/tchar.h \
../../oflog/include/dcmtk/oflog/spi/apndatch.h \
../../oflog/include/dcmtk/oflog/appender.h \
@@ -2637,106 +1456,52 @@ cid7453.o: cid7453.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofcmdln.h \
../../ofstd/include/dcmtk/ofstd/oflist.h \
../../ofstd/include/dcmtk/ofstd/ofconsol.h \
- ../../ofstd/include/dcmtk/ofstd/ofthread.h \
../../ofstd/include/dcmtk/ofstd/offile.h \
../../ofstd/include/dcmtk/ofstd/ofstd.h \
../../ofstd/include/dcmtk/ofstd/oftraits.h \
- ../../ofstd/include/dcmtk/ofstd/ofcond.h \
../../ofstd/include/dcmtk/ofstd/oflimits.h \
../../config/include/dcmtk/config/arith.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
- ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dctag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \
- ../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdict.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
../../dcmdata/include/dcmtk/dcmdata/dclist.h \
../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcmetinf.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicdir.h \
+ ../../ofstd/include/dcmtk/ofstd/ofexbl.h \
+ ../include/dcmtk/dcmsr/cmr/define.h \
../../ofstd/include/dcmtk/ofstd/ofmap.h \
../../ofstd/include/dcmtk/ofstd/ofutil.h \
- ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdirrec.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrulup.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixseq.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcofsetl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrae.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvras.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
- ../../ofstd/include/dcmtk/ofstd/ofdate.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrds.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrdt.h \
- ../../ofstd/include/dcmtk/ofstd/ofdatime.h \
- ../../ofstd/include/dcmtk/ofstd/oftime.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrur.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlt.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrst.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvruc.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrut.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrobow.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixel.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpobw.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcovlay.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
- ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
- ../include/dcmtk/dcmsr/dsdefine.h \
- ../../ofstd/include/dcmtk/ofstd/ofexbl.h \
- ../include/dcmtk/dcmsr/cmr/define.h
+ ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h
cid7464.o: cid7464.cc ../../config/include/dcmtk/config/osconfig.h \
../include/dcmtk/dcmsr/cmr/cid7464.h ../include/dcmtk/dcmsr/dsrctxgr.h \
../include/dcmtk/dcmsr/dsrcodvl.h ../include/dcmtk/dcmsr/dsrtypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctk.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
- ../../oflog/include/dcmtk/oflog/oflog.h \
- ../../oflog/include/dcmtk/oflog/logger.h \
- ../../oflog/include/dcmtk/oflog/config.h \
+ ../include/dcmtk/dcmsr/dsdefine.h \
../../ofstd/include/dcmtk/ofstd/ofdefine.h \
../../ofstd/include/dcmtk/ofstd/ofcast.h \
../../ofstd/include/dcmtk/ofstd/ofexport.h \
../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
+ ../../ofstd/include/dcmtk/ofstd/ofthread.h \
+ ../../ofstd/include/dcmtk/ofstd/oftypes.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstream.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstring.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcond.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
+ ../../oflog/include/dcmtk/oflog/oflog.h \
+ ../../oflog/include/dcmtk/oflog/logger.h \
+ ../../oflog/include/dcmtk/oflog/config.h \
../../oflog/include/dcmtk/oflog/config/defines.h \
../../oflog/include/dcmtk/oflog/helpers/threadcf.h \
../../oflog/include/dcmtk/oflog/loglevel.h \
../../ofstd/include/dcmtk/ofstd/ofvector.h \
- ../../ofstd/include/dcmtk/ofstd/oftypes.h \
- ../../ofstd/include/dcmtk/ofstd/ofstream.h \
../../oflog/include/dcmtk/oflog/tstring.h \
- ../../ofstd/include/dcmtk/ofstd/ofstring.h \
../../oflog/include/dcmtk/oflog/tchar.h \
../../oflog/include/dcmtk/oflog/spi/apndatch.h \
../../oflog/include/dcmtk/oflog/appender.h \
@@ -2755,106 +1520,52 @@ cid7464.o: cid7464.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofcmdln.h \
../../ofstd/include/dcmtk/ofstd/oflist.h \
../../ofstd/include/dcmtk/ofstd/ofconsol.h \
- ../../ofstd/include/dcmtk/ofstd/ofthread.h \
../../ofstd/include/dcmtk/ofstd/offile.h \
../../ofstd/include/dcmtk/ofstd/ofstd.h \
../../ofstd/include/dcmtk/ofstd/oftraits.h \
- ../../ofstd/include/dcmtk/ofstd/ofcond.h \
../../ofstd/include/dcmtk/ofstd/oflimits.h \
../../config/include/dcmtk/config/arith.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
- ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dctag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \
- ../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdict.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
../../dcmdata/include/dcmtk/dcmdata/dclist.h \
../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcmetinf.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicdir.h \
+ ../../ofstd/include/dcmtk/ofstd/ofexbl.h \
+ ../include/dcmtk/dcmsr/cmr/define.h \
../../ofstd/include/dcmtk/ofstd/ofmap.h \
../../ofstd/include/dcmtk/ofstd/ofutil.h \
- ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdirrec.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrulup.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixseq.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcofsetl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrae.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvras.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
- ../../ofstd/include/dcmtk/ofstd/ofdate.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrds.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrdt.h \
- ../../ofstd/include/dcmtk/ofstd/ofdatime.h \
- ../../ofstd/include/dcmtk/ofstd/oftime.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrur.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlt.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrst.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvruc.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrut.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrobow.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixel.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpobw.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcovlay.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
- ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
- ../include/dcmtk/dcmsr/dsdefine.h \
- ../../ofstd/include/dcmtk/ofstd/ofexbl.h \
- ../include/dcmtk/dcmsr/cmr/define.h
+ ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h
cid7469.o: cid7469.cc ../../config/include/dcmtk/config/osconfig.h \
../include/dcmtk/dcmsr/cmr/cid7469.h ../include/dcmtk/dcmsr/dsrctxgr.h \
../include/dcmtk/dcmsr/dsrcodvl.h ../include/dcmtk/dcmsr/dsrtypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctk.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
- ../../oflog/include/dcmtk/oflog/oflog.h \
- ../../oflog/include/dcmtk/oflog/logger.h \
- ../../oflog/include/dcmtk/oflog/config.h \
+ ../include/dcmtk/dcmsr/dsdefine.h \
../../ofstd/include/dcmtk/ofstd/ofdefine.h \
../../ofstd/include/dcmtk/ofstd/ofcast.h \
../../ofstd/include/dcmtk/ofstd/ofexport.h \
../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
+ ../../ofstd/include/dcmtk/ofstd/ofthread.h \
+ ../../ofstd/include/dcmtk/ofstd/oftypes.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstream.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstring.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcond.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
+ ../../oflog/include/dcmtk/oflog/oflog.h \
+ ../../oflog/include/dcmtk/oflog/logger.h \
+ ../../oflog/include/dcmtk/oflog/config.h \
../../oflog/include/dcmtk/oflog/config/defines.h \
../../oflog/include/dcmtk/oflog/helpers/threadcf.h \
../../oflog/include/dcmtk/oflog/loglevel.h \
../../ofstd/include/dcmtk/ofstd/ofvector.h \
- ../../ofstd/include/dcmtk/ofstd/oftypes.h \
- ../../ofstd/include/dcmtk/ofstd/ofstream.h \
../../oflog/include/dcmtk/oflog/tstring.h \
- ../../ofstd/include/dcmtk/ofstd/ofstring.h \
../../oflog/include/dcmtk/oflog/tchar.h \
../../oflog/include/dcmtk/oflog/spi/apndatch.h \
../../oflog/include/dcmtk/oflog/appender.h \
@@ -2873,86 +1584,24 @@ cid7469.o: cid7469.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofcmdln.h \
../../ofstd/include/dcmtk/ofstd/oflist.h \
../../ofstd/include/dcmtk/ofstd/ofconsol.h \
- ../../ofstd/include/dcmtk/ofstd/ofthread.h \
../../ofstd/include/dcmtk/ofstd/offile.h \
../../ofstd/include/dcmtk/ofstd/ofstd.h \
../../ofstd/include/dcmtk/ofstd/oftraits.h \
- ../../ofstd/include/dcmtk/ofstd/ofcond.h \
../../ofstd/include/dcmtk/ofstd/oflimits.h \
../../config/include/dcmtk/config/arith.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
- ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dctag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \
- ../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdict.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
../../dcmdata/include/dcmtk/dcmdata/dclist.h \
../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcmetinf.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicdir.h \
+ ../../ofstd/include/dcmtk/ofstd/ofexbl.h \
+ ../include/dcmtk/dcmsr/cmr/define.h \
../../ofstd/include/dcmtk/ofstd/ofmap.h \
../../ofstd/include/dcmtk/ofstd/ofutil.h \
- ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdirrec.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrulup.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixseq.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcofsetl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrae.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvras.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
- ../../ofstd/include/dcmtk/ofstd/ofdate.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrds.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrdt.h \
- ../../ofstd/include/dcmtk/ofstd/ofdatime.h \
- ../../ofstd/include/dcmtk/ofstd/oftime.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrur.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlt.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrst.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvruc.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrut.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrobow.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixel.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpobw.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcovlay.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
- ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
- ../include/dcmtk/dcmsr/dsdefine.h \
- ../../ofstd/include/dcmtk/ofstd/ofexbl.h \
- ../include/dcmtk/dcmsr/cmr/define.h
+ ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h
init.o: init.cc ../../config/include/dcmtk/config/osconfig.h \
../include/dcmtk/dcmsr/cmr/init.h ../include/dcmtk/dcmsr/cmr/define.h \
../../ofstd/include/dcmtk/ofstd/ofdefine.h \
@@ -2961,7 +1610,18 @@ init.o: init.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
../include/dcmtk/dcmsr/cmr/cid11.h ../include/dcmtk/dcmsr/dsrctxgr.h \
../include/dcmtk/dcmsr/dsrcodvl.h ../include/dcmtk/dcmsr/dsrtypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctk.h \
+ ../include/dcmtk/dcmsr/dsdefine.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
+ ../../ofstd/include/dcmtk/ofstd/ofthread.h \
+ ../../ofstd/include/dcmtk/ofstd/oftypes.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstream.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstring.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcond.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
../../oflog/include/dcmtk/oflog/oflog.h \
../../oflog/include/dcmtk/oflog/logger.h \
@@ -2970,10 +1630,7 @@ init.o: init.cc ../../config/include/dcmtk/config/osconfig.h \
../../oflog/include/dcmtk/oflog/helpers/threadcf.h \
../../oflog/include/dcmtk/oflog/loglevel.h \
../../ofstd/include/dcmtk/ofstd/ofvector.h \
- ../../ofstd/include/dcmtk/ofstd/oftypes.h \
- ../../ofstd/include/dcmtk/ofstd/ofstream.h \
../../oflog/include/dcmtk/oflog/tstring.h \
- ../../ofstd/include/dcmtk/ofstd/ofstring.h \
../../oflog/include/dcmtk/oflog/tchar.h \
../../oflog/include/dcmtk/oflog/spi/apndatch.h \
../../oflog/include/dcmtk/oflog/appender.h \
@@ -2992,85 +1649,23 @@ init.o: init.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofcmdln.h \
../../ofstd/include/dcmtk/ofstd/oflist.h \
../../ofstd/include/dcmtk/ofstd/ofconsol.h \
- ../../ofstd/include/dcmtk/ofstd/ofthread.h \
../../ofstd/include/dcmtk/ofstd/offile.h \
../../ofstd/include/dcmtk/ofstd/ofstd.h \
../../ofstd/include/dcmtk/ofstd/oftraits.h \
- ../../ofstd/include/dcmtk/ofstd/ofcond.h \
../../ofstd/include/dcmtk/ofstd/oflimits.h \
../../config/include/dcmtk/config/arith.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
- ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dctag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \
- ../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdict.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
../../dcmdata/include/dcmtk/dcmdata/dclist.h \
../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcmetinf.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicdir.h \
+ ../../ofstd/include/dcmtk/ofstd/ofexbl.h \
../../ofstd/include/dcmtk/ofstd/ofmap.h \
../../ofstd/include/dcmtk/ofstd/ofutil.h \
../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdirrec.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrulup.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixseq.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcofsetl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrae.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvras.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
- ../../ofstd/include/dcmtk/ofstd/ofdate.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrds.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrdt.h \
- ../../ofstd/include/dcmtk/ofstd/ofdatime.h \
- ../../ofstd/include/dcmtk/ofstd/oftime.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrur.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlt.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrst.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvruc.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrut.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrobow.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixel.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpobw.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcovlay.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
- ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
- ../include/dcmtk/dcmsr/dsdefine.h \
- ../../ofstd/include/dcmtk/ofstd/ofexbl.h \
../include/dcmtk/dcmsr/cmr/cid29.h ../include/dcmtk/dcmsr/cmr/cid42.h \
../include/dcmtk/dcmsr/cmr/cid100.h ../include/dcmtk/dcmsr/cmr/cid244.h \
../include/dcmtk/dcmsr/cmr/cid4020.h \
@@ -3134,23 +1729,31 @@ logger.o: logger.cc ../../config/include/dcmtk/config/osconfig.h \
srnumvl.o: srnumvl.cc ../../config/include/dcmtk/config/osconfig.h \
../include/dcmtk/dcmsr/cmr/srnumvl.h ../include/dcmtk/dcmsr/dsrnumvl.h \
../include/dcmtk/dcmsr/dsrcodvl.h ../include/dcmtk/dcmsr/dsrtypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctk.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
- ../../oflog/include/dcmtk/oflog/oflog.h \
- ../../oflog/include/dcmtk/oflog/logger.h \
- ../../oflog/include/dcmtk/oflog/config.h \
+ ../include/dcmtk/dcmsr/dsdefine.h \
../../ofstd/include/dcmtk/ofstd/ofdefine.h \
../../ofstd/include/dcmtk/ofstd/ofcast.h \
../../ofstd/include/dcmtk/ofstd/ofexport.h \
../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
+ ../../ofstd/include/dcmtk/ofstd/ofthread.h \
+ ../../ofstd/include/dcmtk/ofstd/oftypes.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstream.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstring.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcond.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
+ ../../oflog/include/dcmtk/oflog/oflog.h \
+ ../../oflog/include/dcmtk/oflog/logger.h \
+ ../../oflog/include/dcmtk/oflog/config.h \
../../oflog/include/dcmtk/oflog/config/defines.h \
../../oflog/include/dcmtk/oflog/helpers/threadcf.h \
../../oflog/include/dcmtk/oflog/loglevel.h \
../../ofstd/include/dcmtk/ofstd/ofvector.h \
- ../../ofstd/include/dcmtk/ofstd/oftypes.h \
- ../../ofstd/include/dcmtk/ofstd/ofstream.h \
../../oflog/include/dcmtk/oflog/tstring.h \
- ../../ofstd/include/dcmtk/ofstd/ofstring.h \
../../oflog/include/dcmtk/oflog/tchar.h \
../../oflog/include/dcmtk/oflog/spi/apndatch.h \
../../oflog/include/dcmtk/oflog/appender.h \
@@ -3169,108 +1772,57 @@ srnumvl.o: srnumvl.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofcmdln.h \
../../ofstd/include/dcmtk/ofstd/oflist.h \
../../ofstd/include/dcmtk/ofstd/ofconsol.h \
- ../../ofstd/include/dcmtk/ofstd/ofthread.h \
../../ofstd/include/dcmtk/ofstd/offile.h \
../../ofstd/include/dcmtk/ofstd/ofstd.h \
../../ofstd/include/dcmtk/ofstd/oftraits.h \
- ../../ofstd/include/dcmtk/ofstd/ofcond.h \
../../ofstd/include/dcmtk/ofstd/oflimits.h \
../../config/include/dcmtk/config/arith.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
- ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dctag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \
- ../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdict.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
../../dcmdata/include/dcmtk/dcmdata/dclist.h \
../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcmetinf.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicdir.h \
- ../../ofstd/include/dcmtk/ofstd/ofmap.h \
- ../../ofstd/include/dcmtk/ofstd/ofutil.h \
- ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdirrec.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrulup.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixseq.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcofsetl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrae.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvras.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
- ../../ofstd/include/dcmtk/ofstd/ofdate.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrds.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrdt.h \
- ../../ofstd/include/dcmtk/ofstd/ofdatime.h \
- ../../ofstd/include/dcmtk/ofstd/oftime.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrur.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlt.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrst.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvruc.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrut.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrobow.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixel.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpobw.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcovlay.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
- ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
- ../include/dcmtk/dcmsr/dsdefine.h \
../../ofstd/include/dcmtk/ofstd/ofexbl.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
../include/dcmtk/dcmsr/cmr/cid42.h ../include/dcmtk/dcmsr/dsrctxgr.h \
- ../include/dcmtk/dcmsr/cmr/define.h
+ ../include/dcmtk/dcmsr/cmr/define.h \
+ ../../ofstd/include/dcmtk/ofstd/ofmap.h \
+ ../../ofstd/include/dcmtk/ofstd/ofutil.h \
+ ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h
tid1001.o: tid1001.cc ../../config/include/dcmtk/config/osconfig.h \
../include/dcmtk/dcmsr/cmr/tid1001.h ../include/dcmtk/dcmsr/dsrstpl.h \
../include/dcmtk/dcmsr/dsrdoctr.h ../include/dcmtk/dcmsr/dsrdocst.h \
../include/dcmtk/dcmsr/dsrtree.h ../include/dcmtk/dcmsr/dsrtypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctk.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
- ../../oflog/include/dcmtk/oflog/oflog.h \
- ../../oflog/include/dcmtk/oflog/logger.h \
- ../../oflog/include/dcmtk/oflog/config.h \
+ ../include/dcmtk/dcmsr/dsdefine.h \
../../ofstd/include/dcmtk/ofstd/ofdefine.h \
../../ofstd/include/dcmtk/ofstd/ofcast.h \
../../ofstd/include/dcmtk/ofstd/ofexport.h \
../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
+ ../../ofstd/include/dcmtk/ofstd/ofthread.h \
+ ../../ofstd/include/dcmtk/ofstd/oftypes.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstream.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstring.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcond.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
+ ../../oflog/include/dcmtk/oflog/oflog.h \
+ ../../oflog/include/dcmtk/oflog/logger.h \
+ ../../oflog/include/dcmtk/oflog/config.h \
../../oflog/include/dcmtk/oflog/config/defines.h \
../../oflog/include/dcmtk/oflog/helpers/threadcf.h \
../../oflog/include/dcmtk/oflog/loglevel.h \
../../ofstd/include/dcmtk/ofstd/ofvector.h \
- ../../ofstd/include/dcmtk/ofstd/oftypes.h \
- ../../ofstd/include/dcmtk/ofstd/ofstream.h \
../../oflog/include/dcmtk/oflog/tstring.h \
- ../../ofstd/include/dcmtk/ofstd/ofstring.h \
../../oflog/include/dcmtk/oflog/tchar.h \
../../oflog/include/dcmtk/oflog/spi/apndatch.h \
../../oflog/include/dcmtk/oflog/appender.h \
@@ -3289,89 +1841,31 @@ tid1001.o: tid1001.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofcmdln.h \
../../ofstd/include/dcmtk/ofstd/oflist.h \
../../ofstd/include/dcmtk/ofstd/ofconsol.h \
- ../../ofstd/include/dcmtk/ofstd/ofthread.h \
../../ofstd/include/dcmtk/ofstd/offile.h \
../../ofstd/include/dcmtk/ofstd/ofstd.h \
../../ofstd/include/dcmtk/ofstd/oftraits.h \
- ../../ofstd/include/dcmtk/ofstd/ofcond.h \
../../ofstd/include/dcmtk/ofstd/oflimits.h \
../../config/include/dcmtk/config/arith.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
- ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dctag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \
- ../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdict.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
../../dcmdata/include/dcmtk/dcmdata/dclist.h \
../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcmetinf.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicdir.h \
- ../../ofstd/include/dcmtk/ofstd/ofmap.h \
+ ../include/dcmtk/dcmsr/dsrtncsr.h ../include/dcmtk/dcmsr/dsrposcn.h \
+ ../include/dcmtk/dcmsr/dsrtnant.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstack.h \
../../ofstd/include/dcmtk/ofstd/ofutil.h \
../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdirrec.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrulup.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixseq.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcofsetl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrae.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvras.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
- ../../ofstd/include/dcmtk/ofstd/ofdate.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrds.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrdt.h \
- ../../ofstd/include/dcmtk/ofstd/ofdatime.h \
- ../../ofstd/include/dcmtk/ofstd/oftime.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrur.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlt.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrst.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvruc.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrut.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrobow.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixel.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpobw.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcovlay.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
- ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
- ../include/dcmtk/dcmsr/dsdefine.h ../include/dcmtk/dcmsr/dsrtncsr.h \
- ../../ofstd/include/dcmtk/ofstd/ofstack.h \
- ../include/dcmtk/dcmsr/dsrposcn.h ../include/dcmtk/dcmsr/dsrtnant.h \
../include/dcmtk/dcmsr/dsrdoctn.h ../include/dcmtk/dcmsr/dsrcodvl.h \
../../ofstd/include/dcmtk/ofstd/ofexbl.h \
- ../include/dcmtk/dcmsr/dsrcitem.h ../include/dcmtk/dcmsr/dsrnumvl.h \
+ ../include/dcmtk/dcmsr/dsrdncsr.h ../include/dcmtk/dcmsr/dsrcitem.h \
+ ../include/dcmtk/dcmsr/dsrnumvl.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
../include/dcmtk/dcmsr/dsrscovl.h ../include/dcmtk/dcmsr/dsrscogr.h \
../include/dcmtk/dcmsr/dsrtlist.h ../include/dcmtk/dcmsr/dsrsc3vl.h \
../include/dcmtk/dcmsr/dsrsc3gr.h ../include/dcmtk/dcmsr/dsrtcovl.h \
@@ -3382,29 +1876,40 @@ tid1001.o: tid1001.cc ../../config/include/dcmtk/config/osconfig.h \
../include/dcmtk/dcmsr/dsrwavch.h \
../../ofstd/include/dcmtk/ofstd/ofmem.h ../include/dcmtk/dcmsr/dsrctpl.h \
../include/dcmtk/dcmsr/cmr/define.h ../include/dcmtk/dcmsr/cmr/cid7445.h \
- ../include/dcmtk/dcmsr/dsrctxgr.h ../include/dcmtk/dcmsr/cmr/cid7452.h \
- ../include/dcmtk/dcmsr/cmr/cid7453.h ../include/dcmtk/dcmsr/codes/dcm.h
+ ../include/dcmtk/dcmsr/dsrctxgr.h \
+ ../../ofstd/include/dcmtk/ofstd/ofmap.h \
+ ../include/dcmtk/dcmsr/cmr/cid7452.h \
+ ../include/dcmtk/dcmsr/cmr/cid7453.h ../include/dcmtk/dcmsr/codes/dcm.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h
tid1204.o: tid1204.cc ../../config/include/dcmtk/config/osconfig.h \
../include/dcmtk/dcmsr/cmr/tid1204.h ../include/dcmtk/dcmsr/dsrstpl.h \
../include/dcmtk/dcmsr/dsrdoctr.h ../include/dcmtk/dcmsr/dsrdocst.h \
../include/dcmtk/dcmsr/dsrtree.h ../include/dcmtk/dcmsr/dsrtypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctk.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
- ../../oflog/include/dcmtk/oflog/oflog.h \
- ../../oflog/include/dcmtk/oflog/logger.h \
- ../../oflog/include/dcmtk/oflog/config.h \
+ ../include/dcmtk/dcmsr/dsdefine.h \
../../ofstd/include/dcmtk/ofstd/ofdefine.h \
../../ofstd/include/dcmtk/ofstd/ofcast.h \
../../ofstd/include/dcmtk/ofstd/ofexport.h \
../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
+ ../../ofstd/include/dcmtk/ofstd/ofthread.h \
+ ../../ofstd/include/dcmtk/ofstd/oftypes.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstream.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstring.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcond.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
+ ../../oflog/include/dcmtk/oflog/oflog.h \
+ ../../oflog/include/dcmtk/oflog/logger.h \
+ ../../oflog/include/dcmtk/oflog/config.h \
../../oflog/include/dcmtk/oflog/config/defines.h \
../../oflog/include/dcmtk/oflog/helpers/threadcf.h \
../../oflog/include/dcmtk/oflog/loglevel.h \
../../ofstd/include/dcmtk/ofstd/ofvector.h \
- ../../ofstd/include/dcmtk/ofstd/oftypes.h \
- ../../ofstd/include/dcmtk/ofstd/ofstream.h \
../../oflog/include/dcmtk/oflog/tstring.h \
- ../../ofstd/include/dcmtk/ofstd/ofstring.h \
../../oflog/include/dcmtk/oflog/tchar.h \
../../oflog/include/dcmtk/oflog/spi/apndatch.h \
../../oflog/include/dcmtk/oflog/appender.h \
@@ -3423,89 +1928,31 @@ tid1204.o: tid1204.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofcmdln.h \
../../ofstd/include/dcmtk/ofstd/oflist.h \
../../ofstd/include/dcmtk/ofstd/ofconsol.h \
- ../../ofstd/include/dcmtk/ofstd/ofthread.h \
../../ofstd/include/dcmtk/ofstd/offile.h \
../../ofstd/include/dcmtk/ofstd/ofstd.h \
../../ofstd/include/dcmtk/ofstd/oftraits.h \
- ../../ofstd/include/dcmtk/ofstd/ofcond.h \
../../ofstd/include/dcmtk/ofstd/oflimits.h \
../../config/include/dcmtk/config/arith.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
- ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dctag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \
- ../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdict.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
../../dcmdata/include/dcmtk/dcmdata/dclist.h \
../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcmetinf.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicdir.h \
- ../../ofstd/include/dcmtk/ofstd/ofmap.h \
+ ../include/dcmtk/dcmsr/dsrtncsr.h ../include/dcmtk/dcmsr/dsrposcn.h \
+ ../include/dcmtk/dcmsr/dsrtnant.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstack.h \
../../ofstd/include/dcmtk/ofstd/ofutil.h \
../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdirrec.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrulup.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixseq.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcofsetl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrae.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvras.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
- ../../ofstd/include/dcmtk/ofstd/ofdate.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrds.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrdt.h \
- ../../ofstd/include/dcmtk/ofstd/ofdatime.h \
- ../../ofstd/include/dcmtk/ofstd/oftime.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrur.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlt.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrst.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvruc.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrut.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrobow.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixel.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpobw.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcovlay.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
- ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
- ../include/dcmtk/dcmsr/dsdefine.h ../include/dcmtk/dcmsr/dsrtncsr.h \
- ../../ofstd/include/dcmtk/ofstd/ofstack.h \
- ../include/dcmtk/dcmsr/dsrposcn.h ../include/dcmtk/dcmsr/dsrtnant.h \
../include/dcmtk/dcmsr/dsrdoctn.h ../include/dcmtk/dcmsr/dsrcodvl.h \
../../ofstd/include/dcmtk/ofstd/ofexbl.h \
- ../include/dcmtk/dcmsr/dsrcitem.h ../include/dcmtk/dcmsr/dsrnumvl.h \
+ ../include/dcmtk/dcmsr/dsrdncsr.h ../include/dcmtk/dcmsr/dsrcitem.h \
+ ../include/dcmtk/dcmsr/dsrnumvl.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
../include/dcmtk/dcmsr/dsrscovl.h ../include/dcmtk/dcmsr/dsrscogr.h \
../include/dcmtk/dcmsr/dsrtlist.h ../include/dcmtk/dcmsr/dsrsc3vl.h \
../include/dcmtk/dcmsr/dsrsc3gr.h ../include/dcmtk/dcmsr/dsrtcovl.h \
@@ -3516,29 +1963,39 @@ tid1204.o: tid1204.cc ../../config/include/dcmtk/config/osconfig.h \
../include/dcmtk/dcmsr/dsrwavch.h \
../../ofstd/include/dcmtk/ofstd/ofmem.h ../include/dcmtk/dcmsr/dsrctpl.h \
../include/dcmtk/dcmsr/cmr/define.h ../include/dcmtk/dcmsr/cmr/cid5000.h \
- ../include/dcmtk/dcmsr/dsrctxgr.h ../include/dcmtk/dcmsr/cmr/cid5001.h \
- ../include/dcmtk/dcmsr/codes/dcm.h
+ ../include/dcmtk/dcmsr/dsrctxgr.h \
+ ../../ofstd/include/dcmtk/ofstd/ofmap.h \
+ ../include/dcmtk/dcmsr/cmr/cid5001.h ../include/dcmtk/dcmsr/codes/dcm.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h
tid1411.o: tid1411.cc ../../config/include/dcmtk/config/osconfig.h \
../include/dcmtk/dcmsr/cmr/tid1411.h ../include/dcmtk/dcmsr/dsrstpl.h \
../include/dcmtk/dcmsr/dsrdoctr.h ../include/dcmtk/dcmsr/dsrdocst.h \
../include/dcmtk/dcmsr/dsrtree.h ../include/dcmtk/dcmsr/dsrtypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctk.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
- ../../oflog/include/dcmtk/oflog/oflog.h \
- ../../oflog/include/dcmtk/oflog/logger.h \
- ../../oflog/include/dcmtk/oflog/config.h \
+ ../include/dcmtk/dcmsr/dsdefine.h \
../../ofstd/include/dcmtk/ofstd/ofdefine.h \
../../ofstd/include/dcmtk/ofstd/ofcast.h \
../../ofstd/include/dcmtk/ofstd/ofexport.h \
../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
+ ../../ofstd/include/dcmtk/ofstd/ofthread.h \
+ ../../ofstd/include/dcmtk/ofstd/oftypes.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstream.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstring.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcond.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
+ ../../oflog/include/dcmtk/oflog/oflog.h \
+ ../../oflog/include/dcmtk/oflog/logger.h \
+ ../../oflog/include/dcmtk/oflog/config.h \
../../oflog/include/dcmtk/oflog/config/defines.h \
../../oflog/include/dcmtk/oflog/helpers/threadcf.h \
../../oflog/include/dcmtk/oflog/loglevel.h \
../../ofstd/include/dcmtk/ofstd/ofvector.h \
- ../../ofstd/include/dcmtk/ofstd/oftypes.h \
- ../../ofstd/include/dcmtk/ofstd/ofstream.h \
../../oflog/include/dcmtk/oflog/tstring.h \
- ../../ofstd/include/dcmtk/ofstd/ofstring.h \
../../oflog/include/dcmtk/oflog/tchar.h \
../../oflog/include/dcmtk/oflog/spi/apndatch.h \
../../oflog/include/dcmtk/oflog/appender.h \
@@ -3557,89 +2014,31 @@ tid1411.o: tid1411.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofcmdln.h \
../../ofstd/include/dcmtk/ofstd/oflist.h \
../../ofstd/include/dcmtk/ofstd/ofconsol.h \
- ../../ofstd/include/dcmtk/ofstd/ofthread.h \
../../ofstd/include/dcmtk/ofstd/offile.h \
../../ofstd/include/dcmtk/ofstd/ofstd.h \
../../ofstd/include/dcmtk/ofstd/oftraits.h \
- ../../ofstd/include/dcmtk/ofstd/ofcond.h \
../../ofstd/include/dcmtk/ofstd/oflimits.h \
../../config/include/dcmtk/config/arith.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
- ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dctag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \
- ../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdict.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
../../dcmdata/include/dcmtk/dcmdata/dclist.h \
../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcmetinf.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicdir.h \
- ../../ofstd/include/dcmtk/ofstd/ofmap.h \
+ ../include/dcmtk/dcmsr/dsrtncsr.h ../include/dcmtk/dcmsr/dsrposcn.h \
+ ../include/dcmtk/dcmsr/dsrtnant.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstack.h \
../../ofstd/include/dcmtk/ofstd/ofutil.h \
../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdirrec.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrulup.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixseq.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcofsetl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrae.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvras.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
- ../../ofstd/include/dcmtk/ofstd/ofdate.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrds.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrdt.h \
- ../../ofstd/include/dcmtk/ofstd/ofdatime.h \
- ../../ofstd/include/dcmtk/ofstd/oftime.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrur.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlt.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrst.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvruc.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrut.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrobow.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixel.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpobw.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcovlay.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
- ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
- ../include/dcmtk/dcmsr/dsdefine.h ../include/dcmtk/dcmsr/dsrtncsr.h \
- ../../ofstd/include/dcmtk/ofstd/ofstack.h \
- ../include/dcmtk/dcmsr/dsrposcn.h ../include/dcmtk/dcmsr/dsrtnant.h \
../include/dcmtk/dcmsr/dsrdoctn.h ../include/dcmtk/dcmsr/dsrcodvl.h \
../../ofstd/include/dcmtk/ofstd/ofexbl.h \
- ../include/dcmtk/dcmsr/dsrcitem.h ../include/dcmtk/dcmsr/dsrnumvl.h \
+ ../include/dcmtk/dcmsr/dsrdncsr.h ../include/dcmtk/dcmsr/dsrcitem.h \
+ ../include/dcmtk/dcmsr/dsrnumvl.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
../include/dcmtk/dcmsr/dsrscovl.h ../include/dcmtk/dcmsr/dsrscogr.h \
../include/dcmtk/dcmsr/dsrtlist.h ../include/dcmtk/dcmsr/dsrsc3vl.h \
../include/dcmtk/dcmsr/dsrsc3gr.h ../include/dcmtk/dcmsr/dsrtcovl.h \
@@ -3652,33 +2051,45 @@ tid1411.o: tid1411.cc ../../config/include/dcmtk/config/osconfig.h \
../include/dcmtk/dcmsr/cmr/define.h \
../include/dcmtk/dcmsr/cmr/srnumvlu.h \
../include/dcmtk/dcmsr/cmr/srnumvl.h ../include/dcmtk/dcmsr/cmr/cid42.h \
- ../include/dcmtk/dcmsr/dsrctxgr.h ../include/dcmtk/dcmsr/cmr/cid6147.h \
+ ../include/dcmtk/dcmsr/dsrctxgr.h \
+ ../../ofstd/include/dcmtk/ofstd/ofmap.h \
+ ../include/dcmtk/dcmsr/cmr/cid6147.h \
../include/dcmtk/dcmsr/cmr/cid7181.h \
../include/dcmtk/dcmsr/cmr/cid7464.h \
../include/dcmtk/dcmsr/cmr/cid7469.h ../include/dcmtk/dcmsr/cmr/logger.h \
../include/dcmtk/dcmsr/codes/dcm.h ../include/dcmtk/dcmsr/codes/ncit.h \
- ../include/dcmtk/dcmsr/codes/srt.h ../include/dcmtk/dcmsr/codes/umls.h
+ ../include/dcmtk/dcmsr/codes/srt.h ../include/dcmtk/dcmsr/codes/umls.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h
tid1500.o: tid1500.cc ../../config/include/dcmtk/config/osconfig.h \
../include/dcmtk/dcmsr/cmr/tid1500.h ../include/dcmtk/dcmsr/dsrrtpl.h \
../include/dcmtk/dcmsr/dsrdoctr.h ../include/dcmtk/dcmsr/dsrdocst.h \
../include/dcmtk/dcmsr/dsrtree.h ../include/dcmtk/dcmsr/dsrtypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctk.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
- ../../oflog/include/dcmtk/oflog/oflog.h \
- ../../oflog/include/dcmtk/oflog/logger.h \
- ../../oflog/include/dcmtk/oflog/config.h \
+ ../include/dcmtk/dcmsr/dsdefine.h \
../../ofstd/include/dcmtk/ofstd/ofdefine.h \
../../ofstd/include/dcmtk/ofstd/ofcast.h \
../../ofstd/include/dcmtk/ofstd/ofexport.h \
../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
+ ../../ofstd/include/dcmtk/ofstd/ofthread.h \
+ ../../ofstd/include/dcmtk/ofstd/oftypes.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstream.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstring.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcond.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
+ ../../oflog/include/dcmtk/oflog/oflog.h \
+ ../../oflog/include/dcmtk/oflog/logger.h \
+ ../../oflog/include/dcmtk/oflog/config.h \
../../oflog/include/dcmtk/oflog/config/defines.h \
../../oflog/include/dcmtk/oflog/helpers/threadcf.h \
../../oflog/include/dcmtk/oflog/loglevel.h \
../../ofstd/include/dcmtk/ofstd/ofvector.h \
- ../../ofstd/include/dcmtk/ofstd/oftypes.h \
- ../../ofstd/include/dcmtk/ofstd/ofstream.h \
../../oflog/include/dcmtk/oflog/tstring.h \
- ../../ofstd/include/dcmtk/ofstd/ofstring.h \
../../oflog/include/dcmtk/oflog/tchar.h \
../../oflog/include/dcmtk/oflog/spi/apndatch.h \
../../oflog/include/dcmtk/oflog/appender.h \
@@ -3697,89 +2108,31 @@ tid1500.o: tid1500.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofcmdln.h \
../../ofstd/include/dcmtk/ofstd/oflist.h \
../../ofstd/include/dcmtk/ofstd/ofconsol.h \
- ../../ofstd/include/dcmtk/ofstd/ofthread.h \
../../ofstd/include/dcmtk/ofstd/offile.h \
../../ofstd/include/dcmtk/ofstd/ofstd.h \
../../ofstd/include/dcmtk/ofstd/oftraits.h \
- ../../ofstd/include/dcmtk/ofstd/ofcond.h \
../../ofstd/include/dcmtk/ofstd/oflimits.h \
../../config/include/dcmtk/config/arith.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
- ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dctag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \
- ../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdict.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
../../dcmdata/include/dcmtk/dcmdata/dclist.h \
../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcmetinf.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicdir.h \
- ../../ofstd/include/dcmtk/ofstd/ofmap.h \
+ ../include/dcmtk/dcmsr/dsrtncsr.h ../include/dcmtk/dcmsr/dsrposcn.h \
+ ../include/dcmtk/dcmsr/dsrtnant.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstack.h \
../../ofstd/include/dcmtk/ofstd/ofutil.h \
../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdirrec.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrulup.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixseq.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcofsetl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrae.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvras.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
- ../../ofstd/include/dcmtk/ofstd/ofdate.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrds.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrdt.h \
- ../../ofstd/include/dcmtk/ofstd/ofdatime.h \
- ../../ofstd/include/dcmtk/ofstd/oftime.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrur.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlt.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrst.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvruc.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrut.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrobow.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixel.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpobw.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcovlay.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
- ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
- ../include/dcmtk/dcmsr/dsdefine.h ../include/dcmtk/dcmsr/dsrtncsr.h \
- ../../ofstd/include/dcmtk/ofstd/ofstack.h \
- ../include/dcmtk/dcmsr/dsrposcn.h ../include/dcmtk/dcmsr/dsrtnant.h \
../include/dcmtk/dcmsr/dsrdoctn.h ../include/dcmtk/dcmsr/dsrcodvl.h \
../../ofstd/include/dcmtk/ofstd/ofexbl.h \
- ../include/dcmtk/dcmsr/dsrcitem.h ../include/dcmtk/dcmsr/dsrnumvl.h \
+ ../include/dcmtk/dcmsr/dsrdncsr.h ../include/dcmtk/dcmsr/dsrcitem.h \
+ ../include/dcmtk/dcmsr/dsrnumvl.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
../include/dcmtk/dcmsr/dsrscovl.h ../include/dcmtk/dcmsr/dsrscogr.h \
../include/dcmtk/dcmsr/dsrtlist.h ../include/dcmtk/dcmsr/dsrsc3vl.h \
../include/dcmtk/dcmsr/dsrsc3gr.h ../include/dcmtk/dcmsr/dsrtcovl.h \
@@ -3792,6 +2145,7 @@ tid1500.o: tid1500.cc ../../config/include/dcmtk/config/osconfig.h \
../include/dcmtk/dcmsr/dsrstpl.h ../include/dcmtk/dcmsr/cmr/define.h \
../include/dcmtk/dcmsr/cmr/tid1001.h \
../include/dcmtk/dcmsr/cmr/cid7445.h ../include/dcmtk/dcmsr/dsrctxgr.h \
+ ../../ofstd/include/dcmtk/ofstd/ofmap.h \
../include/dcmtk/dcmsr/cmr/cid7452.h \
../include/dcmtk/dcmsr/cmr/cid7453.h \
../include/dcmtk/dcmsr/cmr/tid1204.h \
@@ -3809,28 +2163,37 @@ tid1500.o: tid1500.cc ../../config/include/dcmtk/config/osconfig.h \
../include/dcmtk/dcmsr/cmr/cid7464.h \
../include/dcmtk/dcmsr/cmr/cid7469.h ../include/dcmtk/dcmsr/cmr/logger.h \
../include/dcmtk/dcmsr/codes/dcm.h ../include/dcmtk/dcmsr/codes/umls.h \
- ../include/dcmtk/dcmsr/dsrtpltn.h
+ ../include/dcmtk/dcmsr/dsrtpltn.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h
tid1600.o: tid1600.cc ../../config/include/dcmtk/config/osconfig.h \
../include/dcmtk/dcmsr/cmr/tid1600.h ../include/dcmtk/dcmsr/dsrstpl.h \
../include/dcmtk/dcmsr/dsrdoctr.h ../include/dcmtk/dcmsr/dsrdocst.h \
../include/dcmtk/dcmsr/dsrtree.h ../include/dcmtk/dcmsr/dsrtypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctk.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
- ../../oflog/include/dcmtk/oflog/oflog.h \
- ../../oflog/include/dcmtk/oflog/logger.h \
- ../../oflog/include/dcmtk/oflog/config.h \
+ ../include/dcmtk/dcmsr/dsdefine.h \
../../ofstd/include/dcmtk/ofstd/ofdefine.h \
../../ofstd/include/dcmtk/ofstd/ofcast.h \
../../ofstd/include/dcmtk/ofstd/ofexport.h \
../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
+ ../../ofstd/include/dcmtk/ofstd/ofthread.h \
+ ../../ofstd/include/dcmtk/ofstd/oftypes.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstream.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstring.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcond.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
+ ../../oflog/include/dcmtk/oflog/oflog.h \
+ ../../oflog/include/dcmtk/oflog/logger.h \
+ ../../oflog/include/dcmtk/oflog/config.h \
../../oflog/include/dcmtk/oflog/config/defines.h \
../../oflog/include/dcmtk/oflog/helpers/threadcf.h \
../../oflog/include/dcmtk/oflog/loglevel.h \
../../ofstd/include/dcmtk/ofstd/ofvector.h \
- ../../ofstd/include/dcmtk/ofstd/oftypes.h \
- ../../ofstd/include/dcmtk/ofstd/ofstream.h \
../../oflog/include/dcmtk/oflog/tstring.h \
- ../../ofstd/include/dcmtk/ofstd/ofstring.h \
../../oflog/include/dcmtk/oflog/tchar.h \
../../oflog/include/dcmtk/oflog/spi/apndatch.h \
../../oflog/include/dcmtk/oflog/appender.h \
@@ -3849,89 +2212,31 @@ tid1600.o: tid1600.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofcmdln.h \
../../ofstd/include/dcmtk/ofstd/oflist.h \
../../ofstd/include/dcmtk/ofstd/ofconsol.h \
- ../../ofstd/include/dcmtk/ofstd/ofthread.h \
../../ofstd/include/dcmtk/ofstd/offile.h \
../../ofstd/include/dcmtk/ofstd/ofstd.h \
../../ofstd/include/dcmtk/ofstd/oftraits.h \
- ../../ofstd/include/dcmtk/ofstd/ofcond.h \
../../ofstd/include/dcmtk/ofstd/oflimits.h \
../../config/include/dcmtk/config/arith.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
- ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dctag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \
- ../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdict.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
../../dcmdata/include/dcmtk/dcmdata/dclist.h \
../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcmetinf.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicdir.h \
- ../../ofstd/include/dcmtk/ofstd/ofmap.h \
+ ../include/dcmtk/dcmsr/dsrtncsr.h ../include/dcmtk/dcmsr/dsrposcn.h \
+ ../include/dcmtk/dcmsr/dsrtnant.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstack.h \
../../ofstd/include/dcmtk/ofstd/ofutil.h \
../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdirrec.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrulup.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixseq.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcofsetl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrae.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvras.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
- ../../ofstd/include/dcmtk/ofstd/ofdate.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrds.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrdt.h \
- ../../ofstd/include/dcmtk/ofstd/ofdatime.h \
- ../../ofstd/include/dcmtk/ofstd/oftime.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrur.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlt.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrst.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvruc.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrut.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrobow.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixel.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpobw.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcovlay.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
- ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
- ../include/dcmtk/dcmsr/dsdefine.h ../include/dcmtk/dcmsr/dsrtncsr.h \
- ../../ofstd/include/dcmtk/ofstd/ofstack.h \
- ../include/dcmtk/dcmsr/dsrposcn.h ../include/dcmtk/dcmsr/dsrtnant.h \
../include/dcmtk/dcmsr/dsrdoctn.h ../include/dcmtk/dcmsr/dsrcodvl.h \
../../ofstd/include/dcmtk/ofstd/ofexbl.h \
- ../include/dcmtk/dcmsr/dsrcitem.h ../include/dcmtk/dcmsr/dsrnumvl.h \
+ ../include/dcmtk/dcmsr/dsrdncsr.h ../include/dcmtk/dcmsr/dsrcitem.h \
+ ../include/dcmtk/dcmsr/dsrnumvl.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
../include/dcmtk/dcmsr/dsrscovl.h ../include/dcmtk/dcmsr/dsrscogr.h \
../include/dcmtk/dcmsr/dsrtlist.h ../include/dcmtk/dcmsr/dsrsc3vl.h \
../include/dcmtk/dcmsr/dsrsc3gr.h ../include/dcmtk/dcmsr/dsrtcovl.h \
@@ -3942,7 +2247,9 @@ tid1600.o: tid1600.cc ../../config/include/dcmtk/config/osconfig.h \
../include/dcmtk/dcmsr/dsrwavch.h \
../../ofstd/include/dcmtk/ofstd/ofmem.h ../include/dcmtk/dcmsr/dsrctpl.h \
../include/dcmtk/dcmsr/cmr/define.h ../include/dcmtk/dcmsr/cmr/cid4020.h \
- ../include/dcmtk/dcmsr/dsrctxgr.h ../include/dcmtk/dcmsr/cmr/cid4021.h \
+ ../include/dcmtk/dcmsr/dsrctxgr.h \
+ ../../ofstd/include/dcmtk/ofstd/ofmap.h \
+ ../include/dcmtk/dcmsr/cmr/cid4021.h \
../include/dcmtk/dcmsr/cmr/srnumvl.h ../include/dcmtk/dcmsr/cmr/cid42.h \
../include/dcmtk/dcmsr/cmr/cid29e.h ../include/dcmtk/dcmsr/cmr/cid29.h \
../include/dcmtk/dcmsr/cmr/cid244e.h ../include/dcmtk/dcmsr/cmr/cid244.h \
@@ -3954,4 +2261,6 @@ tid1600.o: tid1600.cc ../../config/include/dcmtk/config/osconfig.h \
../include/dcmtk/dcmsr/cmr/cid10033.h \
../include/dcmtk/dcmsr/cmr/logger.h ../include/dcmtk/dcmsr/codes/dcm.h \
../include/dcmtk/dcmsr/codes/srt.h ../include/dcmtk/dcmsr/codes/ucum.h \
- ../include/dcmtk/dcmsr/dsrdattn.h ../include/dcmtk/dcmsr/dsrstrvl.h
+ ../include/dcmtk/dcmsr/dsrdattn.h ../include/dcmtk/dcmsr/dsrstrvl.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h
diff --git a/dcmsr/libcmr/cid100.cc b/dcmsr/libcmr/cid100.cc
index b24376a..7e89977 100644
--- a/dcmsr/libcmr/cid100.cc
+++ b/dcmsr/libcmr/cid100.cc
@@ -5,8 +5,8 @@
*
* Source file for class CID100_QuantitativeDiagnosticImagingProcedures
*
- * Generated automatically from DICOM PS 3.16-2015c
- * File created on 2016-01-08 15:04:42 by J. Riesmeier
+ * Generated automatically from DICOM PS 3.16-2016b
+ * File created on 2016-04-06 16:26:37 by J. Riesmeier
*
*/
@@ -158,9 +158,9 @@ CID100_QuantitativeDiagnosticImagingProcedures::CodeList &CID100_QuantitativeDia
Codes->insert(OFMake_pair(PETWholeBody, DSRBasicCodedEntry("44139-4", "LN", "PET whole body")));
Codes->insert(OFMake_pair(PETCT_FDGImagingOfWholeBody, DSRBasicCodedEntry("P5-080FF", "SRT", "PET/CT FDG imaging of whole body")));
Codes->insert(OFMake_pair(PETCT_METImagingOfWholeBody, DSRBasicCodedEntry("P5-08118", "SRT", "PET/CT MET imaging of whole body")));
- Codes->insert(OFMake_pair(CT_HEAD_PERFUSION_WITH_IV_CONTRAST, DSRBasicCodedEntry("RPID96", "RADLEX", "CT HEAD PERFUSION WITH IV CONTRAST")));
- Codes->insert(OFMake_pair(NM_HEAD_PERFUSION_BRAIN_SPECT, DSRBasicCodedEntry("RPID5258", "RADLEX", "NM HEAD PERFUSION BRAIN SPECT")));
- Codes->insert(OFMake_pair(NM_HEAD_PERFUSION_BRAIN_PET_CT_AV45, DSRBasicCodedEntry("RPID5427", "RADLEX", "NM HEAD PERFUSION BRAIN PET-CT AV-45")));
+ Codes->insert(OFMake_pair(CTHeadPerfusionWithIVContrast, DSRBasicCodedEntry("RPID96", "RADLEX", "CT head perfusion with IV contrast")));
+ Codes->insert(OFMake_pair(NMHeadPerfusionBrainSPECT, DSRBasicCodedEntry("RPID5258", "RADLEX", "NM head perfusion brain SPECT")));
+ Codes->insert(OFMake_pair(NMHeadPerfusionBrainPET_CT_AV45, DSRBasicCodedEntry("RPID5427", "RADLEX", "NM head perfusion brain PET-CT AV-45")));
}
/* should never be NULL */
return *Codes;
diff --git a/dcmsr/libcmr/cid10013.cc b/dcmsr/libcmr/cid10013.cc
index 2c3837c..39eec59 100644
--- a/dcmsr/libcmr/cid10013.cc
+++ b/dcmsr/libcmr/cid10013.cc
@@ -5,8 +5,8 @@
*
* Source file for class CID10013_CTAcquisitionType
*
- * Generated automatically from DICOM PS 3.16-2015c
- * File created on 2016-01-08 15:05:05 by J. Riesmeier
+ * Generated automatically from DICOM PS 3.16-2016b
+ * File created on 2016-04-06 16:27:00 by J. Riesmeier
*
*/
@@ -18,7 +18,7 @@
// general information on CID 10013 (CT Acquisition Type)
#define CONTEXT_GROUP_NUMBER "10013"
-#define CONTEXT_GROUP_VERSION "20071031"
+#define CONTEXT_GROUP_VERSION "20160314"
#define CONTEXT_GROUP_UID "1.2.840.10008.6.1.545"
#define CONTEXT_GROUP_TYPE OFTrue /* extensible */
@@ -154,6 +154,7 @@ CID10013_CTAcquisitionType::CodeList &CID10013_CTAcquisitionType::getCodes()
Codes->insert(OFMake_pair(ConstantAngleAcquisition, DSRBasicCodedEntry("113805", "DCM", "Constant Angle Acquisition")));
Codes->insert(OFMake_pair(StationaryAcquisition, DSRBasicCodedEntry("113806", "DCM", "Stationary Acquisition")));
Codes->insert(OFMake_pair(FreeAcquisition, DSRBasicCodedEntry("113807", "DCM", "Free Acquisition")));
+ Codes->insert(OFMake_pair(ConeBeamAcquisition, DSRBasicCodedEntry("R-FB8F1", "SRT", "Cone Beam Acquisition")));
}
/* should never be NULL */
return *Codes;
diff --git a/dcmsr/libcmr/cid10033.cc b/dcmsr/libcmr/cid10033.cc
index f5c2b3b..7ebbee8 100644
--- a/dcmsr/libcmr/cid10033.cc
+++ b/dcmsr/libcmr/cid10033.cc
@@ -5,8 +5,8 @@
*
* Source file for class CID10033_CTReconstructionAlgorithm
*
- * Generated automatically from DICOM PS 3.16-2015c
- * File created on 2016-01-08 15:05:06 by J. Riesmeier
+ * Generated automatically from DICOM PS 3.16-2016b
+ * File created on 2016-04-06 16:27:02 by J. Riesmeier
*
*/
diff --git a/dcmsr/libcmr/cid11.cc b/dcmsr/libcmr/cid11.cc
index a4088f2..0ea6597 100644
--- a/dcmsr/libcmr/cid11.cc
+++ b/dcmsr/libcmr/cid11.cc
@@ -5,8 +5,8 @@
*
* Source file for class CID11_RouteOfAdministration
*
- * Generated automatically from DICOM PS 3.16-2015c
- * File created on 2016-01-08 15:04:37 by J. Riesmeier
+ * Generated automatically from DICOM PS 3.16-2016b
+ * File created on 2016-04-06 16:26:32 by J. Riesmeier
*
*/
@@ -18,7 +18,7 @@
// general information on CID 11 (Route of Administration)
#define CONTEXT_GROUP_NUMBER "11"
-#define CONTEXT_GROUP_VERSION "20100608"
+#define CONTEXT_GROUP_VERSION "20160314"
#define CONTEXT_GROUP_UID "1.2.840.10008.6.1.9"
#define CONTEXT_GROUP_TYPE OFTrue /* extensible */
@@ -153,23 +153,27 @@ CID11_RouteOfAdministration::CodeList &CID11_RouteOfAdministration::getCodes()
Codes->insert(OFMake_pair(IntraArterialRoute, DSRBasicCodedEntry("G-D102", "SRT", "Intra-arterial route")));
Codes->insert(OFMake_pair(IntramuscularRoute, DSRBasicCodedEntry("G-D103", "SRT", "Intramuscular route")));
Codes->insert(OFMake_pair(SubcutaneousRoute, DSRBasicCodedEntry("G-D104", "SRT", "Subcutaneous route")));
- Codes->insert(OFMake_pair(IntracutaneousRoute, DSRBasicCodedEntry("G-D105", "SRT", "Intracutaneous route")));
+ Codes->insert(OFMake_pair(IntracutaneousRoute, DSRBasicCodedEntry("G-D17D", "SRT", "Intracutaneous route")));
Codes->insert(OFMake_pair(IntraperitonealRoute, DSRBasicCodedEntry("G-D106", "SRT", "Intraperitoneal route")));
Codes->insert(OFMake_pair(IntramedullaryRoute, DSRBasicCodedEntry("G-D107", "SRT", "Intramedullary route")));
Codes->insert(OFMake_pair(IntrathecalRoute, DSRBasicCodedEntry("G-D108", "SRT", "Intrathecal route")));
Codes->insert(OFMake_pair(IntraArticularRoute, DSRBasicCodedEntry("G-D109", "SRT", "Intra-articular route")));
- Codes->insert(OFMake_pair(IntraepithelialRoute, DSRBasicCodedEntry("G-D111", "SRT", "Intraepithelial route")));
+ Codes->insert(OFMake_pair(IntraepithelialRoute, DSRBasicCodedEntry("C38244", "NCIt", "Intraepithelial route")));
Codes->insert(OFMake_pair(TopicalRoute, DSRBasicCodedEntry("G-D112", "SRT", "Topical route")));
Codes->insert(OFMake_pair(OralRoute, DSRBasicCodedEntry("G-D140", "SRT", "Oral route")));
- Codes->insert(OFMake_pair(TransluminalRoute, DSRBasicCodedEntry("G-D142", "SRT", "Transluminal route")));
+ Codes->insert(OFMake_pair(TransluminalRoute, DSRBasicCodedEntry("C38306", "NCIt", "Transluminal route")));
Codes->insert(OFMake_pair(IntraluminalRoute, DSRBasicCodedEntry("G-D144", "SRT", "Intraluminal route")));
- Codes->insert(OFMake_pair(ExtraluminalRoute, DSRBasicCodedEntry("G-D146", "SRT", "Extraluminal route")));
- Codes->insert(OFMake_pair(ByInhalation, DSRBasicCodedEntry("G-D150", "SRT", "By inhalation")));
+ Codes->insert(OFMake_pair(ExtraluminalRoute, DSRBasicCodedEntry("C38213", "NCIt", "Extraluminal route")));
+ Codes->insert(OFMake_pair(ByInhalation, DSRBasicCodedEntry("R-40B32", "SRT", "By inhalation")));
Codes->insert(OFMake_pair(PerRectum, DSRBasicCodedEntry("G-D160", "SRT", "Per rectum")));
Codes->insert(OFMake_pair(VaginalRoute, DSRBasicCodedEntry("G-D164", "SRT", "Vaginal route")));
Codes->insert(OFMake_pair(IntracoronaryRoute, DSRBasicCodedEntry("G-D17C", "SRT", "Intracoronary route")));
Codes->insert(OFMake_pair(IntracardiacRoute, DSRBasicCodedEntry("G-D173", "SRT", "Intracardiac route")));
Codes->insert(OFMake_pair(IntraventricularRouteCardiac, DSRBasicCodedEntry("R-F2C86", "SRT", "Intraventricular route - cardiac")));
+ Codes->insert(OFMake_pair(RetroOrbitalRoute, DSRBasicCodedEntry("127070", "DCM", "Retro-orbital route")));
+ Codes->insert(OFMake_pair(NasalRoute, DSRBasicCodedEntry("G-D172", "SRT", "Nasal route")));
+ Codes->insert(OFMake_pair(IntradermalRoute, DSRBasicCodedEntry("G-D17D", "SRT", "Intradermal route")));
+ Codes->insert(OFMake_pair(IntratumorRoute, DSRBasicCodedEntry("R-F2CD4", "SRT", "Intratumor route")));
}
/* should never be NULL */
return *Codes;
diff --git a/dcmsr/libcmr/cid244.cc b/dcmsr/libcmr/cid244.cc
index 58618c5..f6affd9 100644
--- a/dcmsr/libcmr/cid244.cc
+++ b/dcmsr/libcmr/cid244.cc
@@ -5,8 +5,8 @@
*
* Source file for class CID244_Laterality
*
- * Generated automatically from DICOM PS 3.16-2015c
- * File created on 2016-01-08 15:04:44 by J. Riesmeier
+ * Generated automatically from DICOM PS 3.16-2016b
+ * File created on 2016-04-06 16:26:38 by J. Riesmeier
*
*/
diff --git a/dcmsr/libcmr/cid29.cc b/dcmsr/libcmr/cid29.cc
index debe234..770b2ac 100644
--- a/dcmsr/libcmr/cid29.cc
+++ b/dcmsr/libcmr/cid29.cc
@@ -5,8 +5,8 @@
*
* Source file for class CID29_AcquisitionModality
*
- * Generated automatically from DICOM PS 3.16-2015c
- * File created on 2016-01-08 15:04:39 by J. Riesmeier
+ * Generated automatically from DICOM PS 3.16-2016b
+ * File created on 2016-04-06 16:26:33 by J. Riesmeier
*
*/
diff --git a/dcmsr/libcmr/cid4020.cc b/dcmsr/libcmr/cid4020.cc
index 8cf0e72..e64f47d 100644
--- a/dcmsr/libcmr/cid4020.cc
+++ b/dcmsr/libcmr/cid4020.cc
@@ -5,8 +5,8 @@
*
* Source file for class CID4020_PETRadionuclide
*
- * Generated automatically from DICOM PS 3.16-2015c
- * File created on 2016-01-08 15:04:46 by J. Riesmeier
+ * Generated automatically from DICOM PS 3.16-2016b
+ * File created on 2016-04-06 16:26:40 by J. Riesmeier
*
*/
@@ -18,7 +18,7 @@
// general information on CID 4020 (PET Radionuclide)
#define CONTEXT_GROUP_NUMBER "4020"
-#define CONTEXT_GROUP_VERSION "20141110"
+#define CONTEXT_GROUP_VERSION "20160119"
#define CONTEXT_GROUP_UID "1.2.840.10008.6.1.304"
#define CONTEXT_GROUP_TYPE OFTrue /* extensible */
@@ -162,6 +162,7 @@ CID4020_PETRadionuclide::CodeList &CID4020_PETRadionuclide::getCodes()
Codes->insert(OFMake_pair(_51_Manganese, DSRBasicCodedEntry("126601", "DCM", "^51^Manganese")));
Codes->insert(OFMake_pair(_52_Iron, DSRBasicCodedEntry("C-130A1", "SRT", "^52^Iron")));
Codes->insert(OFMake_pair(_52_Manganese, DSRBasicCodedEntry("C-149A1", "SRT", "^52^Manganese")));
+ Codes->insert(OFMake_pair(_52m_Manganese, DSRBasicCodedEntry("126607", "DCM", "^52m^Manganese")));
Codes->insert(OFMake_pair(_60_Copper, DSRBasicCodedEntry("C-127A4", "SRT", "^60^Copper")));
Codes->insert(OFMake_pair(_61_Copper, DSRBasicCodedEntry("C-127A1", "SRT", "^61^Copper")));
Codes->insert(OFMake_pair(_62_Copper, DSRBasicCodedEntry("C-127A5", "SRT", "^62^Copper")));
diff --git a/dcmsr/libcmr/cid4021.cc b/dcmsr/libcmr/cid4021.cc
index 943d855..a64408e 100644
--- a/dcmsr/libcmr/cid4021.cc
+++ b/dcmsr/libcmr/cid4021.cc
@@ -5,8 +5,8 @@
*
* Source file for class CID4021_PETRadiopharmaceutical
*
- * Generated automatically from DICOM PS 3.16-2015c
- * File created on 2016-01-08 15:04:47 by J. Riesmeier
+ * Generated automatically from DICOM PS 3.16-2016b
+ * File created on 2016-04-06 16:26:42 by J. Riesmeier
*
*/
@@ -18,7 +18,7 @@
// general information on CID 4021 (PET Radiopharmaceutical)
#define CONTEXT_GROUP_NUMBER "4021"
-#define CONTEXT_GROUP_VERSION "20141110"
+#define CONTEXT_GROUP_VERSION "20160119"
#define CONTEXT_GROUP_UID "1.2.840.10008.6.1.305"
#define CONTEXT_GROUP_TYPE OFTrue /* extensible */
@@ -149,74 +149,108 @@ CID4021_PETRadiopharmaceutical::CodeList &CID4021_PETRadiopharmaceutical::getCod
/* create a new code list (should never fail) */
Codes = new CodeList();
/* and initialize it by adding the coded entries */
+ Codes->insert(OFMake_pair(_28H1_89Zr, DSRBasicCodedEntry("126752", "DCM", "28H1 ^89^Zr")));
Codes->insert(OFMake_pair(_2FA_F18, DSRBasicCodedEntry("126713", "DCM", "2FA F^18^")));
+ Codes->insert(OFMake_pair(_7D12_89Zr, DSRBasicCodedEntry("126751", "DCM", "7D12 ^89^Zr")));
+ Codes->insert(OFMake_pair(_7E11_89Zr, DSRBasicCodedEntry("126750", "DCM", "7E11 ^89^Zr")));
Codes->insert(OFMake_pair(Acetate_C11, DSRBasicCodedEntry("C-B1043", "SRT", "Acetate C^11^")));
+ Codes->insert(OFMake_pair(AGN150998_89Zr, DSRBasicCodedEntry("126729", "DCM", "AGN-150998 ^89^Zr")));
Codes->insert(OFMake_pair(Ammonia_N13, DSRBasicCodedEntry("C-B103C", "SRT", "Ammonia N^13^")));
+ Codes->insert(OFMake_pair(AntiB220_89Zr, DSRBasicCodedEntry("126754", "DCM", "Anti-B220 ^89^Zr")));
Codes->insert(OFMake_pair(ATSM_Cu60, DSRBasicCodedEntry("126700", "DCM", "ATSM Cu^60^")));
Codes->insert(OFMake_pair(ATSM_Cu61, DSRBasicCodedEntry("126701", "DCM", "ATSM Cu^61^")));
Codes->insert(OFMake_pair(ATSM_Cu62, DSRBasicCodedEntry("126702", "DCM", "ATSM Cu^62^")));
Codes->insert(OFMake_pair(ATSM_Cu64, DSRBasicCodedEntry("C-B07DB", "SRT", "ATSM Cu^64^")));
+ Codes->insert(OFMake_pair(Benralizumab_89Zr, DSRBasicCodedEntry("126722", "DCM", "Benralizumab ^89^Zr")));
Codes->insert(OFMake_pair(Bevacizumab_89Zr, DSRBasicCodedEntry("126516", "DCM", "Bevacizumab ^89^Zr")));
+ Codes->insert(OFMake_pair(Blinatumomab_89Zr, DSRBasicCodedEntry("126727", "DCM", "Blinatumomab ^89^Zr")));
+ Codes->insert(OFMake_pair(Brentuximab_89Zr, DSRBasicCodedEntry("126735", "DCM", "Brentuximab ^89^Zr")));
Codes->insert(OFMake_pair(Butanol_O15, DSRBasicCodedEntry("C-B07DC", "SRT", "Butanol O^15^")));
Codes->insert(OFMake_pair(CarbonDioxide_O15, DSRBasicCodedEntry("C-B103B", "SRT", "Carbon dioxide O^15^")));
Codes->insert(OFMake_pair(CarbonMonoxide_C11, DSRBasicCodedEntry("C-B1045", "SRT", "Carbon monoxide C^11^")));
Codes->insert(OFMake_pair(CarbonMonoxide_O15, DSRBasicCodedEntry("C-B103A", "SRT", "Carbon monoxide O^15^")));
Codes->insert(OFMake_pair(Carfentanil_C11, DSRBasicCodedEntry("C-B103F", "SRT", "Carfentanil C^11^")));
Codes->insert(OFMake_pair(Cetuximab_89Zr, DSRBasicCodedEntry("126513", "DCM", "Cetuximab ^89^Zr")));
- Codes->insert(OFMake_pair(Choline_C11, DSRBasicCodedEntry("126703", "DCM", "Choline C^11^")));
Codes->insert(OFMake_pair(CG250Fab2_89Zr, DSRBasicCodedEntry("126517", "DCM", "cG250-F(ab')(2) ^89^Zr")));
+ Codes->insert(OFMake_pair(Choline_C11, DSRBasicCodedEntry("126703", "DCM", "Choline C^11^")));
Codes->insert(OFMake_pair(CLR1404_I124, DSRBasicCodedEntry("126715", "DCM", "CLR1404 I^124^")));
Codes->insert(OFMake_pair(CLR1404_I131, DSRBasicCodedEntry("126716", "DCM", "CLR1404 I^131^")));
+ Codes->insert(OFMake_pair(CMAbU36_89Zr, DSRBasicCodedEntry("126746", "DCM", "cMAb U36 ^89^Zr")));
Codes->insert(OFMake_pair(CU36_89Zr, DSRBasicCodedEntry("126515", "DCM", "cU36 ^89^Zr")));
+ Codes->insert(OFMake_pair(DfFK2_89Zr, DSRBasicCodedEntry("126762", "DCM", "Df-[FK](2) ^89^Zr")));
+ Codes->insert(OFMake_pair(DfFK23PEG4_89Zr, DSRBasicCodedEntry("126763", "DCM", "Df-[FK](2)-3PEG(4) ^89^Zr")));
Codes->insert(OFMake_pair(DfCD45_89Zr, DSRBasicCodedEntry("126520", "DCM", "Df-CD45 ^89^Zr")));
+ Codes->insert(OFMake_pair(DfFK_89Zr, DSRBasicCodedEntry("126760", "DCM", "Df-FK ^89^Zr")));
+ Codes->insert(OFMake_pair(DfFKPEG3_89Zr, DSRBasicCodedEntry("126761", "DCM", "Df-FK-PEG(3) ^89^Zr")));
+ Codes->insert(OFMake_pair(DN30_89Zr, DSRBasicCodedEntry("126747", "DCM", "DN30 ^89^Zr")));
Codes->insert(OFMake_pair(E4G10_89Zr, DSRBasicCodedEntry("126519", "DCM", "E4G10 ^89^Zr")));
+ Codes->insert(OFMake_pair(Ecromeximab_89Zr, DSRBasicCodedEntry("126732", "DCM", "Ecromeximab ^89^Zr")));
Codes->insert(OFMake_pair(Edotreotide_Ga68, DSRBasicCodedEntry("C2713594", "UMLS", "Edotreotide Ga^68^")));
Codes->insert(OFMake_pair(EDTA_Ga68, DSRBasicCodedEntry("C-B07DD", "SRT", "EDTA Ga^68^")));
Codes->insert(OFMake_pair(Fallypride_C11, DSRBasicCodedEntry("126704", "DCM", "Fallypride C^11^")));
Codes->insert(OFMake_pair(Fallypride_F18, DSRBasicCodedEntry("126705", "DCM", "Fallypride F^18^")));
Codes->insert(OFMake_pair(FLB457_C11, DSRBasicCodedEntry("126706", "DCM", "FLB 457 C^11^")));
- Codes->insert(OFMake_pair(Flubatine_F18_126503, DSRBasicCodedEntry("126503", "DCM", "Flubatine F^18^")));
Codes->insert(OFMake_pair(Florbetaben_F18, DSRBasicCodedEntry("126501", "DCM", "Florbetaben F^18^")));
Codes->insert(OFMake_pair(Florbetapir_F18, DSRBasicCodedEntry("C-E0269", "SRT", "Florbetapir F^18^")));
+ Codes->insert(OFMake_pair(Flubatine_F18_126503, DSRBasicCodedEntry("126503", "DCM", "Flubatine F^18^")));
Codes->insert(OFMake_pair(Flubatine_F18_126712, DSRBasicCodedEntry("126712", "DCM", "Flubatine F^18^")));
Codes->insert(OFMake_pair(Fluciclatide_F18, DSRBasicCodedEntry("C-E0265", "SRT", "Fluciclatide F^18^")));
Codes->insert(OFMake_pair(Fluciclovine_F18, DSRBasicCodedEntry("C-E026A", "SRT", "Fluciclovine F^18^")));
Codes->insert(OFMake_pair(Flumazenil_C11, DSRBasicCodedEntry("C-B07DE", "SRT", "Flumazenil C^11^")));
Codes->insert(OFMake_pair(Flumazenil_F18, DSRBasicCodedEntry("C-B07DF", "SRT", "Flumazenil F^18^")));
- Codes->insert(OFMake_pair(FluoroestradiolFES_F18, DSRBasicCodedEntry("C1831937", "UMLS", "Fluoroestradiol (FES) F^18^")));
- Codes->insert(OFMake_pair(Fluoroetanidazole_F18, DSRBasicCodedEntry("C1541539", "UMLS", "Fluoroetanidazole F^18^")));
Codes->insert(OFMake_pair(Fluorethyltyrosin_F18, DSRBasicCodedEntry("C-B07E0", "SRT", "Fluorethyltyrosin F^18^")));
+ Codes->insert(OFMake_pair(Fluorobenzothiazole_F18, DSRBasicCodedEntry("C-B07E4", "SRT", "Fluorobenzothiazole F^18^")));
Codes->insert(OFMake_pair(Fluorocholine_F18, DSRBasicCodedEntry("C-E0273", "SRT", "Fluorocholine F^18^")));
Codes->insert(OFMake_pair(Fluorodeoxyglucose_F18, DSRBasicCodedEntry("C-B1031", "SRT", "Fluorodeoxyglucose F^18^")));
- Codes->insert(OFMake_pair(Fluoromisonidazole_F18, DSRBasicCodedEntry("C-B07E1", "SRT", "Fluoromisonidazole F^18^")));
+ Codes->insert(OFMake_pair(FluoroestradiolFES_F18, DSRBasicCodedEntry("C1831937", "UMLS", "Fluoroestradiol (FES) F^18^")));
+ Codes->insert(OFMake_pair(Fluoroetanidazole_F18, DSRBasicCodedEntry("C1541539", "UMLS", "Fluoroetanidazole F^18^")));
+ Codes->insert(OFMake_pair(FluoroLDopa_F18, DSRBasicCodedEntry("C-B1034", "SRT", "Fluoro-L-dopa F^18^")));
Codes->insert(OFMake_pair(Fluoromethane_F18, DSRBasicCodedEntry("C-B07E2", "SRT", "Fluoromethane F^18^")));
+ Codes->insert(OFMake_pair(Fluoromisonidazole_F18, DSRBasicCodedEntry("C-B07E1", "SRT", "Fluoromisonidazole F^18^")));
Codes->insert(OFMake_pair(FluoropropylDihydrotetrabenazineDTBZ_F18, DSRBasicCodedEntry("C2934038", "UMLS", "Fluoropropyl-dihydrotetrabenazine (DTBZ) F^18^")));
- Codes->insert(OFMake_pair(Fluorouracil_F18, DSRBasicCodedEntry("C-B07E3", "SRT", "Fluorouracil F^18^")));
- Codes->insert(OFMake_pair(Fluorobenzothiazole_F18, DSRBasicCodedEntry("C-B07E4", "SRT", "Fluorobenzothiazole F^18^")));
- Codes->insert(OFMake_pair(FluoroLDopa_F18, DSRBasicCodedEntry("C-B1034", "SRT", "Fluoro-L-dopa F^18^")));
Codes->insert(OFMake_pair(Fluorotriopride_F18, DSRBasicCodedEntry("126707", "DCM", "Fluorotriopride F^18^")));
+ Codes->insert(OFMake_pair(Fluorouracil_F18, DSRBasicCodedEntry("C-B07E3", "SRT", "Fluorouracil F^18^")));
Codes->insert(OFMake_pair(Flutemetamol_F18, DSRBasicCodedEntry("C-E0267", "SRT", "Flutemetamol F^18^")));
+ Codes->insert(OFMake_pair(Fresolimumab_89Zr, DSRBasicCodedEntry("126748", "DCM", "Fresolimumab ^89^Zr")));
+ Codes->insert(OFMake_pair(GA201_89Zr, DSRBasicCodedEntry("126731", "DCM", "GA201 ^89^Zr")));
Codes->insert(OFMake_pair(Germanium_Ge68, DSRBasicCodedEntry("C-B1046", "SRT", "Germanium Ge^68^")));
+ Codes->insert(OFMake_pair(GlembatumumabVedotin_89Zr, DSRBasicCodedEntry("126724", "DCM", "Glembatumumab vedotin ^89^Zr")));
Codes->insert(OFMake_pair(Glutamate_N13, DSRBasicCodedEntry("C-B103D", "SRT", "Glutamate N^13^")));
Codes->insert(OFMake_pair(Glutamine_C11, DSRBasicCodedEntry("126709", "DCM", "Glutamine C^11^")));
Codes->insert(OFMake_pair(Glutamine_C14, DSRBasicCodedEntry("126710", "DCM", "Glutamine C^14^")));
Codes->insert(OFMake_pair(Glutamine_F18, DSRBasicCodedEntry("126711", "DCM", "Glutamine F^18^")));
Codes->insert(OFMake_pair(ISO1_F18, DSRBasicCodedEntry("C2981788", "UMLS", "ISO-1 F^18^")));
Codes->insert(OFMake_pair(J591_89Zr, DSRBasicCodedEntry("126514", "DCM", "J591 ^89^Zr")));
+ Codes->insert(OFMake_pair(Margetuximab_89Zr, DSRBasicCodedEntry("126740", "DCM", "Margetuximab ^89^Zr")));
+ Codes->insert(OFMake_pair(MEDI551_89Zr, DSRBasicCodedEntry("126730", "DCM", "MEDI-551 ^89^Zr")));
Codes->insert(OFMake_pair(Mespiperone_C11, DSRBasicCodedEntry("C-B07E5", "SRT", "Mespiperone C^11^")));
Codes->insert(OFMake_pair(Methionine_C11, DSRBasicCodedEntry("C-B103E", "SRT", "Methionine C^11^")));
- Codes->insert(OFMake_pair(MonoclonalAntibody_I124, DSRBasicCodedEntry("C-B07E6", "SRT", "Monoclonal antibody I^124^")));
+ Codes->insert(OFMake_pair(Mogamulizumab_89Zr, DSRBasicCodedEntry("126738", "DCM", "Mogamulizumab ^89^Zr")));
Codes->insert(OFMake_pair(MonoclonalAntibodymAb_64Cu, DSRBasicCodedEntry("126510", "DCM", "Monoclonal Antibody (mAb) ^64^Cu")));
Codes->insert(OFMake_pair(MonoclonalAntibodymAb_89Zr, DSRBasicCodedEntry("126511", "DCM", "Monoclonal Antibody (mAb) ^89^Zr")));
+ Codes->insert(OFMake_pair(MonoclonalAntibody_I124, DSRBasicCodedEntry("C-B07E6", "SRT", "Monoclonal antibody I^124^")));
+ Codes->insert(OFMake_pair(NanocolloidalAlbumin_89Zr, DSRBasicCodedEntry("126753", "DCM", "Nanocolloidal albumin ^89^Zr")));
Codes->insert(OFMake_pair(Nifene_F18, DSRBasicCodedEntry("126714", "DCM", "Nifene F^18^")));
+ Codes->insert(OFMake_pair(Obinituzimab_89Zr, DSRBasicCodedEntry("126721", "DCM", "Obinituzimab ^89^Zr")));
+ Codes->insert(OFMake_pair(Ocaratuzumab_89Zr, DSRBasicCodedEntry("126723", "DCM", "Ocaratuzumab ^89^Zr")));
Codes->insert(OFMake_pair(Oxygen_O15, DSRBasicCodedEntry("C-B1038", "SRT", "Oxygen O^15^")));
Codes->insert(OFMake_pair(OxygenWater_O15, DSRBasicCodedEntry("C-B1039", "SRT", "Oxygen-water O^15^")));
Codes->insert(OFMake_pair(Palmitate_C11, DSRBasicCodedEntry("C-B1044", "SRT", "Palmitate C^11^")));
+ Codes->insert(OFMake_pair(Panitumumab_89Zr, DSRBasicCodedEntry("126736", "DCM", "Panitumumab ^89^Zr")));
+ Codes->insert(OFMake_pair(Pegdinetanib_89Zr, DSRBasicCodedEntry("126728", "DCM", "Pegdinetanib ^89^Zr")));
+ Codes->insert(OFMake_pair(PinatuzumabVedotin_89Zr, DSRBasicCodedEntry("126725", "DCM", "Pinatuzumab vedotin ^89^Zr")));
Codes->insert(OFMake_pair(PittsburghCompoundB_C11, DSRBasicCodedEntry("126500", "DCM", "Pittsburgh compound B C^11^")));
+ Codes->insert(OFMake_pair(PolatuzumabVedotin_89Zr, DSRBasicCodedEntry("126726", "DCM", "Polatuzumab vedotin ^89^Zr")));
Codes->insert(OFMake_pair(PTSM_Cu62, DSRBasicCodedEntry("C-B07E7", "SRT", "PTSM Cu^62^")));
Codes->insert(OFMake_pair(R1507_89Zr, DSRBasicCodedEntry("126518", "DCM", "R1507 ^89^Zr")));
Codes->insert(OFMake_pair(Raclopride_C11, DSRBasicCodedEntry("C-B1042", "SRT", "Raclopride C^11^")));
+ Codes->insert(OFMake_pair(Ranibizumab_89Zr, DSRBasicCodedEntry("126742", "DCM", "Ranibizumab ^89^Zr")));
+ Codes->insert(OFMake_pair(Rituximab_89Zr, DSRBasicCodedEntry("126737", "DCM", "Rituximab ^89^Zr")));
+ Codes->insert(OFMake_pair(RO5323441_89Zr, DSRBasicCodedEntry("126755", "DCM", "RO5323441 ^89^Zr")));
+ Codes->insert(OFMake_pair(RO542908_89Zr, DSRBasicCodedEntry("126756", "DCM", "RO542908 ^89^Zr")));
+ Codes->insert(OFMake_pair(Roledumab_89Zr, DSRBasicCodedEntry("126733", "DCM", "Roledumab ^89^Zr")));
Codes->insert(OFMake_pair(RubidiumChloride_Rb82, DSRBasicCodedEntry("C-B1037", "SRT", "Rubidium chloride Rb^82^")));
+ Codes->insert(OFMake_pair(SAR3419_89Zr, DSRBasicCodedEntry("126741", "DCM", "SAR3419 ^89^Zr")));
Codes->insert(OFMake_pair(SodiumFluoride_F18, DSRBasicCodedEntry("C-B1032", "SRT", "Sodium fluoride F^18^")));
Codes->insert(OFMake_pair(SodiumIodide_I124, DSRBasicCodedEntry("C-B07E8", "SRT", "Sodium iodide I^124^")));
Codes->insert(OFMake_pair(Sodium_Na22, DSRBasicCodedEntry("C-B1047", "SRT", "Sodium Na^22^")));
@@ -224,7 +258,10 @@ CID4021_PETRadiopharmaceutical::CodeList &CID4021_PETRadiopharmaceutical::getCod
Codes->insert(OFMake_pair(T807_F18, DSRBasicCodedEntry("126502", "DCM", "T807 F^18^")));
Codes->insert(OFMake_pair(ThymidineFLT_F18, DSRBasicCodedEntry("C-B1036", "SRT", "Thymidine (FLT) F^18^")));
Codes->insert(OFMake_pair(Trastuzumab_89Zr, DSRBasicCodedEntry("126512", "DCM", "Trastuzumab ^89^Zr")));
+ Codes->insert(OFMake_pair(TRC105_89Zr, DSRBasicCodedEntry("126749", "DCM", "TRC105 ^89^Zr")));
Codes->insert(OFMake_pair(Tyrosine3Octreotate_Ga68, DSRBasicCodedEntry("C1742831", "UMLS", "tyrosine-3-octreotate Ga^68^")));
+ Codes->insert(OFMake_pair(Ublituximab_89Zr, DSRBasicCodedEntry("126739", "DCM", "Ublituximab ^89^Zr")));
+ Codes->insert(OFMake_pair(XmAb5574_89Zr, DSRBasicCodedEntry("126734", "DCM", "XmAb5574 ^89^Zr")));
}
/* should never be NULL */
return *Codes;
diff --git a/dcmsr/libcmr/cid4031.cc b/dcmsr/libcmr/cid4031.cc
index 7440c62..5e9dfee 100644
--- a/dcmsr/libcmr/cid4031.cc
+++ b/dcmsr/libcmr/cid4031.cc
@@ -5,8 +5,8 @@
*
* Source file for class CID4031_CommonAnatomicRegions
*
- * Generated automatically from DICOM PS 3.16-2015c
- * File created on 2016-01-08 15:04:49 by J. Riesmeier
+ * Generated automatically from DICOM PS 3.16-2016b
+ * File created on 2016-04-06 16:26:44 by J. Riesmeier
*
*/
@@ -18,7 +18,7 @@
// general information on CID 4031 (Common Anatomic Regions)
#define CONTEXT_GROUP_NUMBER "4031"
-#define CONTEXT_GROUP_VERSION "20130617"
+#define CONTEXT_GROUP_VERSION "20160314"
#define CONTEXT_GROUP_UID "1.2.840.10008.6.1.308"
#define CONTEXT_GROUP_TYPE OFTrue /* extensible */
@@ -234,7 +234,7 @@ CID4031_CommonAnatomicRegions::CodeList &CID4031_CommonAnatomicRegions::getCodes
Codes->insert(OFMake_pair(Shoulder, DSRBasicCodedEntry("T-D2220", "SRT", "Shoulder")));
Codes->insert(OFMake_pair(Skull, DSRBasicCodedEntry("T-11100", "SRT", "Skull")));
Codes->insert(OFMake_pair(SmallIntestine, DSRBasicCodedEntry("T-58000", "SRT", "Small intestine")));
- Codes->insert(OFMake_pair(Spine, DSRBasicCodedEntry("T-D0146", "SRT", "Spine")));
+ Codes->insert(OFMake_pair(Spine, DSRBasicCodedEntry("T-D04FF", "SRT", "Spine")));
Codes->insert(OFMake_pair(SternoclavicularJoint, DSRBasicCodedEntry("T-15610", "SRT", "Sternoclavicular joint")));
Codes->insert(OFMake_pair(Sternum, DSRBasicCodedEntry("T-11210", "SRT", "Sternum")));
Codes->insert(OFMake_pair(Stomach, DSRBasicCodedEntry("T-57000", "SRT", "Stomach")));
@@ -249,7 +249,7 @@ CID4031_CommonAnatomicRegions::CodeList &CID4031_CommonAnatomicRegions::getCodes
Codes->insert(OFMake_pair(Trachea, DSRBasicCodedEntry("T-25000", "SRT", "Trachea")));
Codes->insert(OFMake_pair(UpperArm, DSRBasicCodedEntry("T-D8200", "SRT", "Upper arm")));
Codes->insert(OFMake_pair(UpperLimb, DSRBasicCodedEntry("T-D8000", "SRT", "Upper limb")));
- Codes->insert(OFMake_pair(UpperUrinaryTract, DSRBasicCodedEntry("T-70010", "SRT", "Upper urinary tract")));
+ Codes->insert(OFMake_pair(UpperUrinaryTract, DSRBasicCodedEntry("T-7000B", "SRT", "Upper urinary tract")));
Codes->insert(OFMake_pair(Ureter, DSRBasicCodedEntry("T-73000", "SRT", "Ureter")));
Codes->insert(OFMake_pair(Urethra, DSRBasicCodedEntry("T-75000", "SRT", "Urethra")));
Codes->insert(OFMake_pair(UterusAndFallopianTubes, DSRBasicCodedEntry("T-88920", "SRT", "Uterus and fallopian tubes")));
diff --git a/dcmsr/libcmr/cid42.cc b/dcmsr/libcmr/cid42.cc
index 35d336c..02c6ce3 100644
--- a/dcmsr/libcmr/cid42.cc
+++ b/dcmsr/libcmr/cid42.cc
@@ -5,8 +5,8 @@
*
* Source file for class CID42_NumericValueQualifier
*
- * Generated automatically from DICOM PS 3.16-2015c
- * File created on 2016-01-08 15:04:41 by J. Riesmeier
+ * Generated automatically from DICOM PS 3.16-2016b
+ * File created on 2016-04-06 16:26:35 by J. Riesmeier
*
*/
diff --git a/dcmsr/libcmr/cid6147.cc b/dcmsr/libcmr/cid6147.cc
index 476d940..14cdec8 100644
--- a/dcmsr/libcmr/cid6147.cc
+++ b/dcmsr/libcmr/cid6147.cc
@@ -5,8 +5,8 @@
*
* Source file for class CID6147_ResponseCriteria
*
- * Generated automatically from DICOM PS 3.16-2015c
- * File created on 2016-01-08 15:04:51 by J. Riesmeier
+ * Generated automatically from DICOM PS 3.16-2016b
+ * File created on 2016-04-06 16:26:45 by J. Riesmeier
*
*/
diff --git a/dcmsr/libcmr/cid7021.cc b/dcmsr/libcmr/cid7021.cc
index 356aff5..7680f03 100644
--- a/dcmsr/libcmr/cid7021.cc
+++ b/dcmsr/libcmr/cid7021.cc
@@ -5,8 +5,8 @@
*
* Source file for class CID7021_MeasurementReportDocumentTitles
*
- * Generated automatically from DICOM PS 3.16-2015c
- * File created on 2016-01-08 15:04:52 by J. Riesmeier
+ * Generated automatically from DICOM PS 3.16-2016b
+ * File created on 2016-04-06 16:26:47 by J. Riesmeier
*
*/
diff --git a/dcmsr/libcmr/cid7181.cc b/dcmsr/libcmr/cid7181.cc
index d42dc71..baf6763 100644
--- a/dcmsr/libcmr/cid7181.cc
+++ b/dcmsr/libcmr/cid7181.cc
@@ -5,8 +5,8 @@
*
* Source file for class CID7181_AbstractMultiDimensionalImageModelComponentUnits
*
- * Generated automatically from DICOM PS 3.16-2015c
- * File created on 2016-01-08 15:04:54 by J. Riesmeier
+ * Generated automatically from DICOM PS 3.16-2016b
+ * File created on 2016-04-06 16:26:49 by J. Riesmeier
*
*/
@@ -167,10 +167,11 @@ CID7181_AbstractMultiDimensionalImageModelComponentUnits::CodeList &CID7181_Abst
Codes->insert(OFMake_pair(CubicCentimeter, DSRBasicCodedEntry("cm3", "UCUM", "cubic centimeter")));
Codes->insert(OFMake_pair(CubicMillimeter, DSRBasicCodedEntry("mm3", "UCUM", "cubic millimeter")));
Codes->insert(OFMake_pair(CubicMicrometer, DSRBasicCodedEntry("um3", "UCUM", "cubic micrometer")));
- Codes->insert(OFMake_pair(StandardizedUptakeValueBodyWeight, DSRBasicCodedEntry("{SUVbw}g/ml", "UCUM", "Standardized Uptake Value body weight")));
- Codes->insert(OFMake_pair(StandardizedUptakeValueLeanBodyMass, DSRBasicCodedEntry("{SUVlbm}g/ml", "UCUM", "Standardized Uptake Value lean body mass")));
- Codes->insert(OFMake_pair(StandardizedUptakeValueBodySurfaceArea, DSRBasicCodedEntry("{SUVbsa}cm2/ml", "UCUM", "Standardized Uptake Value body surface area")));
- Codes->insert(OFMake_pair(StandardizedUptakeValueIdealBodyWeight, DSRBasicCodedEntry("{SUVibw}g/ml", "UCUM", "Standardized Uptake Value ideal body weight")));
+ Codes->insert(OFMake_pair(StandardizedUptakeValueBodyWeight, DSRBasicCodedEntry("g/ml{SUVbw}", "UCUM", "Standardized Uptake Value body weight")));
+ Codes->insert(OFMake_pair(StandardizedUptakeValueLeanBodyMassJames, DSRBasicCodedEntry("g/ml{SUVlbm}", "UCUM", "Standardized Uptake Value lean body mass (James)")));
+ Codes->insert(OFMake_pair(StandardizedUptakeValueLeanBodyMassJanma, DSRBasicCodedEntry("g/ml{SUVlbm(Janma)}", "UCUM", "Standardized Uptake Value lean body mass (Janma)")));
+ Codes->insert(OFMake_pair(StandardizedUptakeValueBodySurfaceArea, DSRBasicCodedEntry("cm2/ml{SUVbsa}", "UCUM", "Standardized Uptake Value body surface area")));
+ Codes->insert(OFMake_pair(StandardizedUptakeValueIdealBodyWeight, DSRBasicCodedEntry("g/ml{SUVibw}", "UCUM", "Standardized Uptake Value ideal body weight")));
Codes->insert(OFMake_pair(Counts, DSRBasicCodedEntry("{counts}", "UCUM", "Counts")));
Codes->insert(OFMake_pair(CountsPerSecond, DSRBasicCodedEntry("{counts}/s", "UCUM", "Counts per second")));
Codes->insert(OFMake_pair(ProportionalToCounts, DSRBasicCodedEntry("{propcounts}", "UCUM", "Proportional to counts")));
diff --git a/dcmsr/libcmr/cid7445.cc b/dcmsr/libcmr/cid7445.cc
index c69546e..035cdb5 100644
--- a/dcmsr/libcmr/cid7445.cc
+++ b/dcmsr/libcmr/cid7445.cc
@@ -5,8 +5,8 @@
*
* Source file for class CID7445_DeviceParticipatingRoles
*
- * Generated automatically from DICOM PS 3.16-2015c
- * File created on 2016-01-08 15:04:56 by J. Riesmeier
+ * Generated automatically from DICOM PS 3.16-2016b
+ * File created on 2016-04-06 16:26:51 by J. Riesmeier
*
*/
diff --git a/dcmsr/libcmr/cid7452.cc b/dcmsr/libcmr/cid7452.cc
index 69af1ab..a54cbfd 100644
--- a/dcmsr/libcmr/cid7452.cc
+++ b/dcmsr/libcmr/cid7452.cc
@@ -5,8 +5,8 @@
*
* Source file for class CID7452_OrganizationalRoles
*
- * Generated automatically from DICOM PS 3.16-2015c
- * File created on 2016-01-08 15:04:58 by J. Riesmeier
+ * Generated automatically from DICOM PS 3.16-2016b
+ * File created on 2016-04-06 16:26:53 by J. Riesmeier
*
*/
diff --git a/dcmsr/libcmr/cid7453.cc b/dcmsr/libcmr/cid7453.cc
index 18c6810..2d74874 100644
--- a/dcmsr/libcmr/cid7453.cc
+++ b/dcmsr/libcmr/cid7453.cc
@@ -5,8 +5,8 @@
*
* Source file for class CID7453_PerformingRoles
*
- * Generated automatically from DICOM PS 3.16-2015c
- * File created on 2016-01-08 15:04:59 by J. Riesmeier
+ * Generated automatically from DICOM PS 3.16-2016b
+ * File created on 2016-04-06 16:26:55 by J. Riesmeier
*
*/
diff --git a/dcmsr/libcmr/cid7464.cc b/dcmsr/libcmr/cid7464.cc
index e37280f..f0dd006 100644
--- a/dcmsr/libcmr/cid7464.cc
+++ b/dcmsr/libcmr/cid7464.cc
@@ -5,8 +5,8 @@
*
* Source file for class CID7464_GeneralRegionOfInterestMeasurementModifiers
*
- * Generated automatically from DICOM PS 3.16-2015c
- * File created on 2016-01-08 15:05:01 by J. Riesmeier
+ * Generated automatically from DICOM PS 3.16-2016b
+ * File created on 2016-04-06 16:26:57 by J. Riesmeier
*
*/
diff --git a/dcmsr/libcmr/cid7469.cc b/dcmsr/libcmr/cid7469.cc
index 877588b..e41b27c 100644
--- a/dcmsr/libcmr/cid7469.cc
+++ b/dcmsr/libcmr/cid7469.cc
@@ -5,8 +5,8 @@
*
* Source file for class CID7469_GenericIntensityAndSizeMeasurements
*
- * Generated automatically from DICOM PS 3.16-2015c
- * File created on 2016-01-08 15:05:03 by J. Riesmeier
+ * Generated automatically from DICOM PS 3.16-2016b
+ * File created on 2016-04-06 16:26:59 by J. Riesmeier
*
*/
@@ -149,7 +149,7 @@ CID7469_GenericIntensityAndSizeMeasurements::CodeList &CID7469_GenericIntensityA
/* create a new code list (should never fail) */
Codes = new CodeList();
/* and initialize it by adding the coded entries */
- Codes->insert(OFMake_pair(NAcetylaspartate, DSRBasicCodedEntry("F-6175A", "SRT", "N-acetylaspartate")));
+ Codes->insert(OFMake_pair(NAcetylaspartate, DSRBasicCodedEntry("F-65C50", "SRT", "N-acetylaspartate")));
Codes->insert(OFMake_pair(Citrate, DSRBasicCodedEntry("F-61080", "SRT", "Citrate")));
Codes->insert(OFMake_pair(Choline, DSRBasicCodedEntry("F-61620", "SRT", "Choline")));
Codes->insert(OFMake_pair(Creatine, DSRBasicCodedEntry("F-61380", "SRT", "Creatine")));
@@ -236,6 +236,7 @@ CID7469_GenericIntensityAndSizeMeasurements::CodeList &CID7469_GenericIntensityA
Codes->insert(OFMake_pair(FractionalOccupancySegmentation, DSRBasicCodedEntry("110855", "DCM", "Fractional Occupancy Segmentation")));
Codes->insert(OFMake_pair(R1, DSRBasicCodedEntry("126393", "DCM", "R1")));
Codes->insert(OFMake_pair(R2, DSRBasicCodedEntry("126394", "DCM", "R2")));
+ Codes->insert(OFMake_pair(MagnetizationTransferRatio, DSRBasicCodedEntry("113098", "DCM", "Magnetization Transfer Ratio")));
Codes->insert(OFMake_pair(Ktrans, DSRBasicCodedEntry("126312", "DCM", "Ktrans")));
Codes->insert(OFMake_pair(Kep, DSRBasicCodedEntry("126313", "DCM", "kep")));
Codes->insert(OFMake_pair(Ve, DSRBasicCodedEntry("126314", "DCM", "ve")));
@@ -251,6 +252,11 @@ CID7469_GenericIntensityAndSizeMeasurements::CodeList &CID7469_GenericIntensityA
Codes->insert(OFMake_pair(IAUC, DSRBasicCodedEntry("126320", "DCM", "IAUC")));
Codes->insert(OFMake_pair(IAUC60, DSRBasicCodedEntry("126321", "DCM", "IAUC60")));
Codes->insert(OFMake_pair(IAUC90, DSRBasicCodedEntry("126322", "DCM", "IAUC90")));
+ Codes->insert(OFMake_pair(IAUC180, DSRBasicCodedEntry("126323", "DCM", "IAUC180")));
+ Codes->insert(OFMake_pair(IAUCBN, DSRBasicCodedEntry("126324", "DCM", "IAUCBN")));
+ Codes->insert(OFMake_pair(IAUC60BN, DSRBasicCodedEntry("126325", "DCM", "IAUC60BN")));
+ Codes->insert(OFMake_pair(IAUC90BN, DSRBasicCodedEntry("126326", "DCM", "IAUC90BN")));
+ Codes->insert(OFMake_pair(IAUC180BN, DSRBasicCodedEntry("126327", "DCM", "IAUC180BN")));
Codes->insert(OFMake_pair(TimeOfPeakConcentration, DSRBasicCodedEntry("126370", "DCM", "Time of Peak Concentration")));
Codes->insert(OFMake_pair(TimeOfLeadingHalfPeakConcentration, DSRBasicCodedEntry("126372", "DCM", "Time of Leading Half-Peak Concentration")));
Codes->insert(OFMake_pair(BolusArrivalTime, DSRBasicCodedEntry("126371", "DCM", "Bolus Arrival Time")));
@@ -261,9 +267,10 @@ CID7469_GenericIntensityAndSizeMeasurements::CodeList &CID7469_GenericIntensityA
Codes->insert(OFMake_pair(StandardizedUptakeValue, DSRBasicCodedEntry("126400", "DCM", "Standardized Uptake Value")));
Codes->insert(OFMake_pair(SUVbw, DSRBasicCodedEntry("126401", "DCM", "SUVbw")));
Codes->insert(OFMake_pair(SUVlbm, DSRBasicCodedEntry("126402", "DCM", "SUVlbm")));
+ Codes->insert(OFMake_pair(SUVlbmJanma, DSRBasicCodedEntry("126405", "DCM", "SUVlbm(Janma)")));
Codes->insert(OFMake_pair(SUVbsa, DSRBasicCodedEntry("126403", "DCM", "SUVbsa")));
Codes->insert(OFMake_pair(SUVibw, DSRBasicCodedEntry("126404", "DCM", "SUVibw")));
- Codes->insert(OFMake_pair(Length, DSRBasicCodedEntry("G-A22A", "SRT", "Length")));
+ Codes->insert(OFMake_pair(Length, DSRBasicCodedEntry("G-D7FE", "SRT", "Length")));
Codes->insert(OFMake_pair(PathLength, DSRBasicCodedEntry("121211", "DCM", "Path length")));
Codes->insert(OFMake_pair(Distance, DSRBasicCodedEntry("121206", "DCM", "Distance")));
Codes->insert(OFMake_pair(Width, DSRBasicCodedEntry("G-A220", "SRT", "Width")));
diff --git a/dcmsr/libcmr/tid1001.cc b/dcmsr/libcmr/tid1001.cc
index 262c499..25c928b 100644
--- a/dcmsr/libcmr/tid1001.cc
+++ b/dcmsr/libcmr/tid1001.cc
@@ -15,6 +15,8 @@
#include "dcmtk/dcmsr/cmr/tid1001.h"
#include "dcmtk/dcmsr/codes/dcm.h"
+#include "dcmtk/dcmdata/dcuid.h"
+
// helper macros for checking the return value of API calls
#define CHECK_RESULT(call) if (result.good()) result = call
diff --git a/dcmsr/libcmr/tid1204.cc b/dcmsr/libcmr/tid1204.cc
index 6f38c0e..60b5421 100644
--- a/dcmsr/libcmr/tid1204.cc
+++ b/dcmsr/libcmr/tid1204.cc
@@ -15,6 +15,8 @@
#include "dcmtk/dcmsr/cmr/tid1204.h"
#include "dcmtk/dcmsr/codes/dcm.h"
+#include "dcmtk/dcmdata/dcuid.h"
+
// helper macros for checking the return value of API calls
#define CHECK_RESULT(call) if (result.good()) result = call
diff --git a/dcmsr/libcmr/tid1411.cc b/dcmsr/libcmr/tid1411.cc
index 2334a85..8975497 100644
--- a/dcmsr/libcmr/tid1411.cc
+++ b/dcmsr/libcmr/tid1411.cc
@@ -24,6 +24,7 @@
#include "dcmtk/dcmsr/codes/umls.h"
#include "dcmtk/dcmdata/dcdeftag.h"
+#include "dcmtk/dcmdata/dcuid.h"
// helper macros for checking the return value of API calls
diff --git a/dcmsr/libcmr/tid1500.cc b/dcmsr/libcmr/tid1500.cc
index 3c4b7b2..307911c 100644
--- a/dcmsr/libcmr/tid1500.cc
+++ b/dcmsr/libcmr/tid1500.cc
@@ -16,9 +16,10 @@
#include "dcmtk/dcmsr/cmr/logger.h"
#include "dcmtk/dcmsr/codes/dcm.h"
#include "dcmtk/dcmsr/codes/umls.h"
-
#include "dcmtk/dcmsr/dsrtpltn.h"
+#include "dcmtk/dcmdata/dcuid.h"
+
// helper macros for checking the return value of API calls
#define CHECK_RESULT(call) if (result.good()) result = call
diff --git a/dcmsr/libcmr/tid1600.cc b/dcmsr/libcmr/tid1600.cc
index f082ac9..13baa0b 100644
--- a/dcmsr/libcmr/tid1600.cc
+++ b/dcmsr/libcmr/tid1600.cc
@@ -22,9 +22,11 @@
#include "dcmtk/dcmsr/codes/dcm.h"
#include "dcmtk/dcmsr/codes/srt.h"
#include "dcmtk/dcmsr/codes/ucum.h"
-
#include "dcmtk/dcmsr/dsrdattn.h"
+#include "dcmtk/dcmdata/dcdeftag.h"
+#include "dcmtk/dcmdata/dcuid.h"
+
// helper macros for checking the return value of API calls
#define CHECK_RESULT(call) if (result.good()) result = call
@@ -310,7 +312,7 @@ OFCondition TID1600_ImageLibrary::setPETImageRadiopharmaceuticalStartDateTime(co
/* go to image library entry and check for expected modality */
OFCondition result = goAndCheckImageLibraryEntry(CODE_DCM_PositronEmissionTomography);
/* set content item value (and add a new content item if needed) */
- CHECK_RESULT(setStringContentItemFromValue(VT_DateTime, CODE_DCM_RadiopharmaceuticalStartTime /*DateTime*/, dateTime, "TID 1607 - Row 4", check));
+ CHECK_RESULT(setStringContentItemFromValue(VT_DateTime, CODE_DCM_RadiopharmaceuticalStartDateTime, dateTime, "TID 1607 - Row 4", check));
/* in case of error, reset cursor to stored node */
BAD_RESULT(setCursor(cursor));
return result;
@@ -325,7 +327,7 @@ OFCondition TID1600_ImageLibrary::setPETImageRadiopharmaceuticalStopDateTime(con
/* go to image library entry and check for expected modality */
OFCondition result = goAndCheckImageLibraryEntry(CODE_DCM_PositronEmissionTomography);
/* set content item value (and add a new content item if needed) */
- CHECK_RESULT(setStringContentItemFromValue(VT_DateTime, CODE_DCM_RadiopharmaceuticalStopTime /*DateTime*/, dateTime, "TID 1607 - Row 5", check));
+ CHECK_RESULT(setStringContentItemFromValue(VT_DateTime, CODE_DCM_RadiopharmaceuticalStopDateTime, dateTime, "TID 1607 - Row 5", check));
/* in case of error, reset cursor to stored node */
BAD_RESULT(setCursor(cursor));
return result;
@@ -673,9 +675,9 @@ OFCondition TID1600_ImageLibrary::addPositronEmissionTomographyDescriptors(DSRDo
/* TID 1607 (Image Library Entry Descriptors for PET) Row 3 */
CHECK_RESULT(addNumericContentItemFromDataset(tree, *item, DCM_RadionuclideHalfLife, 0 /*pos*/, CODE_SRT_HalfLifeOfRadiopharmaceutical, CODE_UCUM_s, "TID 1607 - Row 3", check));
/* TID 1607 (Image Library Entry Descriptors for PET) Row 4 */
- CHECK_RESULT(addStringContentItemFromDataset(tree, *item, DCM_RadiopharmaceuticalStartDateTime, 0 /*pos*/, VT_DateTime, CODE_DCM_RadiopharmaceuticalStartTime /*DateTime*/, "TID 1607 - Row 4", check));
+ CHECK_RESULT(addStringContentItemFromDataset(tree, *item, DCM_RadiopharmaceuticalStartDateTime, 0 /*pos*/, VT_DateTime, CODE_DCM_RadiopharmaceuticalStartDateTime, "TID 1607 - Row 4", check));
/* TID 1607 (Image Library Entry Descriptors for PET) Row 5 */
- CHECK_RESULT(addStringContentItemFromDataset(tree, *item, DCM_RadiopharmaceuticalStopDateTime, 0 /*pos*/, VT_DateTime, CODE_DCM_RadiopharmaceuticalStopTime /*DateTime*/, "TID 1607 - Row 5", check));
+ CHECK_RESULT(addStringContentItemFromDataset(tree, *item, DCM_RadiopharmaceuticalStopDateTime, 0 /*pos*/, VT_DateTime, CODE_DCM_RadiopharmaceuticalStopDateTime, "TID 1607 - Row 5", check));
/* TID 1607 (Image Library Entry Descriptors for PET) Row 6 */
CHECK_RESULT(addNumericContentItemFromDataset(tree, *item, DCM_RadiopharmaceuticalVolume, 0 /*pos*/, CODE_DCM_RadiopharmaceuticalVolume, CODE_UCUM_cm3 /*might change with a CP*/, "TID 1607 - Row 6", check));
/* TID 1607 (Image Library Entry Descriptors for PET) Row 7 */
diff --git a/dcmsr/libsrc/CMakeLists.txt b/dcmsr/libsrc/CMakeLists.txt
index 2e2e2bb..5c69202 100644
--- a/dcmsr/libsrc/CMakeLists.txt
+++ b/dcmsr/libsrc/CMakeLists.txt
@@ -1,5 +1,5 @@
# create library from source files
-DCMTK_ADD_LIBRARY(dcmsr dsrcitem dsrcodtn dsrcodvl dsrcomtn dsrcomvl dsrcontn dsrcsidl dsrdattn dsrdoc dsrdocst dsrdoctn dsrdoctr dsrdtitn dsrimgfr dsrimgse dsrimgtn dsrimgvl dsrnumtn dsrnumvl dsrpnmtn dsrposcn dsrrefin dsrreftn dsrscogr dsrsc3gr dsrscotn dsrsc3tn dsrscovl dsrsc3vl dsrsoprf dsrstrvl dsrtcodt dsrtcosp dsrtcotn dsrtcoto dsrtcovl dsrtextn dsrtimtn dsrtpltn dsrtree dsrtypes dsruidtn dsrwavch dsrwavtn dsrwavvl dsrxmlc dsrxmld dsriodcc dsrbascc dsrenhcc dsrcomcc dsrkeycc dsrma [...]
+DCMTK_ADD_LIBRARY(dcmsr dsrcitem dsrcodtn dsrcodvl dsrcomtn dsrcomvl dsrcontn dsrcsidl dsrdattn dsrdncsr dsrdoc dsrdocst dsrdoctn dsrdoctr dsrdtitn dsrimgfr dsrimgse dsrimgtn dsrimgvl dsrnumtn dsrnumvl dsrpnmtn dsrposcn dsrrefin dsrreftn dsrscogr dsrsc3gr dsrscotn dsrsc3tn dsrscovl dsrsc3vl dsrsoprf dsrstrvl dsrtcodt dsrtcosp dsrtcotn dsrtcoto dsrtcovl dsrtextn dsrtimtn dsrtpltn dsrtree dsrtypes dsruidtn dsrwavch dsrwavtn dsrwavvl dsrxmlc dsrxmld dsriodcc dsrbascc dsrenhcc dsrcomcc dsrke [...]
DCMTK_TARGET_LINK_MODULES(dcmsr ofstd oflog dcmdata dcmimgle dcmimage)
DCMTK_TARGET_LINK_LIBRARIES(dcmsr ${LIBXML_LIBS})
diff --git a/dcmsr/libsrc/Makefile.dep b/dcmsr/libsrc/Makefile.dep
index f1e61dc..c07a302 100644
--- a/dcmsr/libsrc/Makefile.dep
+++ b/dcmsr/libsrc/Makefile.dep
@@ -1,23 +1,30 @@
dsracqcc.o: dsracqcc.cc ../../config/include/dcmtk/config/osconfig.h \
../include/dcmtk/dcmsr/dsracqcc.h ../include/dcmtk/dcmsr/dsriodcc.h \
- ../include/dcmtk/dcmsr/dsrtypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctk.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
- ../../oflog/include/dcmtk/oflog/oflog.h \
- ../../oflog/include/dcmtk/oflog/logger.h \
- ../../oflog/include/dcmtk/oflog/config.h \
+ ../include/dcmtk/dcmsr/dsrtypes.h ../include/dcmtk/dcmsr/dsdefine.h \
../../ofstd/include/dcmtk/ofstd/ofdefine.h \
../../ofstd/include/dcmtk/ofstd/ofcast.h \
../../ofstd/include/dcmtk/ofstd/ofexport.h \
../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
+ ../../ofstd/include/dcmtk/ofstd/ofthread.h \
+ ../../ofstd/include/dcmtk/ofstd/oftypes.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstream.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstring.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcond.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
+ ../../oflog/include/dcmtk/oflog/oflog.h \
+ ../../oflog/include/dcmtk/oflog/logger.h \
+ ../../oflog/include/dcmtk/oflog/config.h \
../../oflog/include/dcmtk/oflog/config/defines.h \
../../oflog/include/dcmtk/oflog/helpers/threadcf.h \
../../oflog/include/dcmtk/oflog/loglevel.h \
../../ofstd/include/dcmtk/ofstd/ofvector.h \
- ../../ofstd/include/dcmtk/ofstd/oftypes.h \
- ../../ofstd/include/dcmtk/ofstd/ofstream.h \
../../oflog/include/dcmtk/oflog/tstring.h \
- ../../ofstd/include/dcmtk/ofstd/ofstring.h \
../../oflog/include/dcmtk/oflog/tchar.h \
../../oflog/include/dcmtk/oflog/spi/apndatch.h \
../../oflog/include/dcmtk/oflog/appender.h \
@@ -36,104 +43,46 @@ dsracqcc.o: dsracqcc.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofcmdln.h \
../../ofstd/include/dcmtk/ofstd/oflist.h \
../../ofstd/include/dcmtk/ofstd/ofconsol.h \
- ../../ofstd/include/dcmtk/ofstd/ofthread.h \
../../ofstd/include/dcmtk/ofstd/offile.h \
../../ofstd/include/dcmtk/ofstd/ofstd.h \
../../ofstd/include/dcmtk/ofstd/oftraits.h \
- ../../ofstd/include/dcmtk/ofstd/ofcond.h \
../../ofstd/include/dcmtk/ofstd/oflimits.h \
../../config/include/dcmtk/config/arith.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
- ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dctag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \
- ../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdict.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
../../dcmdata/include/dcmtk/dcmdata/dclist.h \
../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcmetinf.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicdir.h \
- ../../ofstd/include/dcmtk/ofstd/ofmap.h \
- ../../ofstd/include/dcmtk/ofstd/ofutil.h \
- ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdirrec.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrulup.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixseq.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcofsetl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrae.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvras.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
- ../../ofstd/include/dcmtk/ofstd/ofdate.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrds.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrdt.h \
- ../../ofstd/include/dcmtk/ofstd/ofdatime.h \
- ../../ofstd/include/dcmtk/ofstd/oftime.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrur.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlt.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrst.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvruc.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrut.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrobow.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixel.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpobw.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcovlay.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
- ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
- ../include/dcmtk/dcmsr/dsdefine.h
+ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h
dsrbascc.o: dsrbascc.cc ../../config/include/dcmtk/config/osconfig.h \
../include/dcmtk/dcmsr/dsrbascc.h ../include/dcmtk/dcmsr/dsriodcc.h \
- ../include/dcmtk/dcmsr/dsrtypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctk.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
- ../../oflog/include/dcmtk/oflog/oflog.h \
- ../../oflog/include/dcmtk/oflog/logger.h \
- ../../oflog/include/dcmtk/oflog/config.h \
+ ../include/dcmtk/dcmsr/dsrtypes.h ../include/dcmtk/dcmsr/dsdefine.h \
../../ofstd/include/dcmtk/ofstd/ofdefine.h \
../../ofstd/include/dcmtk/ofstd/ofcast.h \
../../ofstd/include/dcmtk/ofstd/ofexport.h \
../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
+ ../../ofstd/include/dcmtk/ofstd/ofthread.h \
+ ../../ofstd/include/dcmtk/ofstd/oftypes.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstream.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstring.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcond.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
+ ../../oflog/include/dcmtk/oflog/oflog.h \
+ ../../oflog/include/dcmtk/oflog/logger.h \
+ ../../oflog/include/dcmtk/oflog/config.h \
../../oflog/include/dcmtk/oflog/config/defines.h \
../../oflog/include/dcmtk/oflog/helpers/threadcf.h \
../../oflog/include/dcmtk/oflog/loglevel.h \
../../ofstd/include/dcmtk/ofstd/ofvector.h \
- ../../ofstd/include/dcmtk/ofstd/oftypes.h \
- ../../ofstd/include/dcmtk/ofstd/ofstream.h \
../../oflog/include/dcmtk/oflog/tstring.h \
- ../../ofstd/include/dcmtk/ofstd/ofstring.h \
../../oflog/include/dcmtk/oflog/tchar.h \
../../oflog/include/dcmtk/oflog/spi/apndatch.h \
../../oflog/include/dcmtk/oflog/appender.h \
@@ -152,104 +101,46 @@ dsrbascc.o: dsrbascc.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofcmdln.h \
../../ofstd/include/dcmtk/ofstd/oflist.h \
../../ofstd/include/dcmtk/ofstd/ofconsol.h \
- ../../ofstd/include/dcmtk/ofstd/ofthread.h \
../../ofstd/include/dcmtk/ofstd/offile.h \
../../ofstd/include/dcmtk/ofstd/ofstd.h \
../../ofstd/include/dcmtk/ofstd/oftraits.h \
- ../../ofstd/include/dcmtk/ofstd/ofcond.h \
../../ofstd/include/dcmtk/ofstd/oflimits.h \
../../config/include/dcmtk/config/arith.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
- ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dctag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \
- ../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdict.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
../../dcmdata/include/dcmtk/dcmdata/dclist.h \
../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcmetinf.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicdir.h \
- ../../ofstd/include/dcmtk/ofstd/ofmap.h \
- ../../ofstd/include/dcmtk/ofstd/ofutil.h \
- ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdirrec.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrulup.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixseq.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcofsetl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrae.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvras.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
- ../../ofstd/include/dcmtk/ofstd/ofdate.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrds.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrdt.h \
- ../../ofstd/include/dcmtk/ofstd/ofdatime.h \
- ../../ofstd/include/dcmtk/ofstd/oftime.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrur.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlt.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrst.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvruc.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrut.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrobow.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixel.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpobw.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcovlay.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
- ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
- ../include/dcmtk/dcmsr/dsdefine.h
+ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h
dsrc3dcc.o: dsrc3dcc.cc ../../config/include/dcmtk/config/osconfig.h \
../include/dcmtk/dcmsr/dsrc3dcc.h ../include/dcmtk/dcmsr/dsriodcc.h \
- ../include/dcmtk/dcmsr/dsrtypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctk.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
- ../../oflog/include/dcmtk/oflog/oflog.h \
- ../../oflog/include/dcmtk/oflog/logger.h \
- ../../oflog/include/dcmtk/oflog/config.h \
+ ../include/dcmtk/dcmsr/dsrtypes.h ../include/dcmtk/dcmsr/dsdefine.h \
../../ofstd/include/dcmtk/ofstd/ofdefine.h \
../../ofstd/include/dcmtk/ofstd/ofcast.h \
../../ofstd/include/dcmtk/ofstd/ofexport.h \
../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
+ ../../ofstd/include/dcmtk/ofstd/ofthread.h \
+ ../../ofstd/include/dcmtk/ofstd/oftypes.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstream.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstring.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcond.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
+ ../../oflog/include/dcmtk/oflog/oflog.h \
+ ../../oflog/include/dcmtk/oflog/logger.h \
+ ../../oflog/include/dcmtk/oflog/config.h \
../../oflog/include/dcmtk/oflog/config/defines.h \
../../oflog/include/dcmtk/oflog/helpers/threadcf.h \
../../oflog/include/dcmtk/oflog/loglevel.h \
../../ofstd/include/dcmtk/ofstd/ofvector.h \
- ../../ofstd/include/dcmtk/ofstd/oftypes.h \
- ../../ofstd/include/dcmtk/ofstd/ofstream.h \
../../oflog/include/dcmtk/oflog/tstring.h \
- ../../ofstd/include/dcmtk/ofstd/ofstring.h \
../../oflog/include/dcmtk/oflog/tchar.h \
../../oflog/include/dcmtk/oflog/spi/apndatch.h \
../../oflog/include/dcmtk/oflog/appender.h \
@@ -268,104 +159,46 @@ dsrc3dcc.o: dsrc3dcc.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofcmdln.h \
../../ofstd/include/dcmtk/ofstd/oflist.h \
../../ofstd/include/dcmtk/ofstd/ofconsol.h \
- ../../ofstd/include/dcmtk/ofstd/ofthread.h \
../../ofstd/include/dcmtk/ofstd/offile.h \
../../ofstd/include/dcmtk/ofstd/ofstd.h \
../../ofstd/include/dcmtk/ofstd/oftraits.h \
- ../../ofstd/include/dcmtk/ofstd/ofcond.h \
../../ofstd/include/dcmtk/ofstd/oflimits.h \
../../config/include/dcmtk/config/arith.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
- ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dctag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \
- ../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdict.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
../../dcmdata/include/dcmtk/dcmdata/dclist.h \
../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcmetinf.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicdir.h \
- ../../ofstd/include/dcmtk/ofstd/ofmap.h \
- ../../ofstd/include/dcmtk/ofstd/ofutil.h \
- ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdirrec.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrulup.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixseq.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcofsetl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrae.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvras.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
- ../../ofstd/include/dcmtk/ofstd/ofdate.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrds.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrdt.h \
- ../../ofstd/include/dcmtk/ofstd/ofdatime.h \
- ../../ofstd/include/dcmtk/ofstd/oftime.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrur.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlt.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrst.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvruc.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrut.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrobow.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixel.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpobw.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcovlay.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
- ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
- ../include/dcmtk/dcmsr/dsdefine.h
+ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h
dsrchecc.o: dsrchecc.cc ../../config/include/dcmtk/config/osconfig.h \
../include/dcmtk/dcmsr/dsrchecc.h ../include/dcmtk/dcmsr/dsriodcc.h \
- ../include/dcmtk/dcmsr/dsrtypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctk.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
- ../../oflog/include/dcmtk/oflog/oflog.h \
- ../../oflog/include/dcmtk/oflog/logger.h \
- ../../oflog/include/dcmtk/oflog/config.h \
+ ../include/dcmtk/dcmsr/dsrtypes.h ../include/dcmtk/dcmsr/dsdefine.h \
../../ofstd/include/dcmtk/ofstd/ofdefine.h \
../../ofstd/include/dcmtk/ofstd/ofcast.h \
../../ofstd/include/dcmtk/ofstd/ofexport.h \
../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
+ ../../ofstd/include/dcmtk/ofstd/ofthread.h \
+ ../../ofstd/include/dcmtk/ofstd/oftypes.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstream.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstring.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcond.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
+ ../../oflog/include/dcmtk/oflog/oflog.h \
+ ../../oflog/include/dcmtk/oflog/logger.h \
+ ../../oflog/include/dcmtk/oflog/config.h \
../../oflog/include/dcmtk/oflog/config/defines.h \
../../oflog/include/dcmtk/oflog/helpers/threadcf.h \
../../oflog/include/dcmtk/oflog/loglevel.h \
../../ofstd/include/dcmtk/ofstd/ofvector.h \
- ../../ofstd/include/dcmtk/ofstd/oftypes.h \
- ../../ofstd/include/dcmtk/ofstd/ofstream.h \
../../oflog/include/dcmtk/oflog/tstring.h \
- ../../ofstd/include/dcmtk/ofstd/ofstring.h \
../../oflog/include/dcmtk/oflog/tchar.h \
../../oflog/include/dcmtk/oflog/spi/apndatch.h \
../../oflog/include/dcmtk/oflog/appender.h \
@@ -384,103 +217,46 @@ dsrchecc.o: dsrchecc.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofcmdln.h \
../../ofstd/include/dcmtk/ofstd/oflist.h \
../../ofstd/include/dcmtk/ofstd/ofconsol.h \
- ../../ofstd/include/dcmtk/ofstd/ofthread.h \
../../ofstd/include/dcmtk/ofstd/offile.h \
../../ofstd/include/dcmtk/ofstd/ofstd.h \
../../ofstd/include/dcmtk/ofstd/oftraits.h \
- ../../ofstd/include/dcmtk/ofstd/ofcond.h \
../../ofstd/include/dcmtk/ofstd/oflimits.h \
../../config/include/dcmtk/config/arith.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
- ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dctag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \
- ../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdict.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
../../dcmdata/include/dcmtk/dcmdata/dclist.h \
../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcmetinf.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicdir.h \
- ../../ofstd/include/dcmtk/ofstd/ofmap.h \
- ../../ofstd/include/dcmtk/ofstd/ofutil.h \
- ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdirrec.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrulup.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixseq.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcofsetl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrae.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvras.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
- ../../ofstd/include/dcmtk/ofstd/ofdate.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrds.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrdt.h \
- ../../ofstd/include/dcmtk/ofstd/ofdatime.h \
- ../../ofstd/include/dcmtk/ofstd/oftime.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrur.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlt.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrst.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvruc.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrut.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrobow.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixel.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpobw.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcovlay.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
- ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
- ../include/dcmtk/dcmsr/dsdefine.h
+ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h
dsrcitem.o: dsrcitem.cc ../../config/include/dcmtk/config/osconfig.h \
../include/dcmtk/dcmsr/dsrcitem.h ../include/dcmtk/dcmsr/dsrtypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctk.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
- ../../oflog/include/dcmtk/oflog/oflog.h \
- ../../oflog/include/dcmtk/oflog/logger.h \
- ../../oflog/include/dcmtk/oflog/config.h \
+ ../include/dcmtk/dcmsr/dsdefine.h \
../../ofstd/include/dcmtk/ofstd/ofdefine.h \
../../ofstd/include/dcmtk/ofstd/ofcast.h \
../../ofstd/include/dcmtk/ofstd/ofexport.h \
../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
- ../../oflog/include/dcmtk/oflog/config/defines.h \
- ../../oflog/include/dcmtk/oflog/helpers/threadcf.h \
- ../../oflog/include/dcmtk/oflog/loglevel.h \
- ../../ofstd/include/dcmtk/ofstd/ofvector.h \
- ../../ofstd/include/dcmtk/ofstd/oftypes.h \
- ../../ofstd/include/dcmtk/ofstd/ofstream.h \
- ../../oflog/include/dcmtk/oflog/tstring.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
+ ../../ofstd/include/dcmtk/ofstd/ofthread.h \
+ ../../ofstd/include/dcmtk/ofstd/oftypes.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstream.h \
../../ofstd/include/dcmtk/ofstd/ofstring.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcond.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
+ ../../oflog/include/dcmtk/oflog/oflog.h \
+ ../../oflog/include/dcmtk/oflog/logger.h \
+ ../../oflog/include/dcmtk/oflog/config.h \
+ ../../oflog/include/dcmtk/oflog/config/defines.h \
+ ../../oflog/include/dcmtk/oflog/helpers/threadcf.h \
+ ../../oflog/include/dcmtk/oflog/loglevel.h \
+ ../../ofstd/include/dcmtk/ofstd/ofvector.h \
+ ../../oflog/include/dcmtk/oflog/tstring.h \
../../oflog/include/dcmtk/oflog/tchar.h \
../../oflog/include/dcmtk/oflog/spi/apndatch.h \
../../oflog/include/dcmtk/oflog/appender.h \
@@ -499,125 +275,73 @@ dsrcitem.o: dsrcitem.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofcmdln.h \
../../ofstd/include/dcmtk/ofstd/oflist.h \
../../ofstd/include/dcmtk/ofstd/ofconsol.h \
- ../../ofstd/include/dcmtk/ofstd/ofthread.h \
../../ofstd/include/dcmtk/ofstd/offile.h \
../../ofstd/include/dcmtk/ofstd/ofstd.h \
../../ofstd/include/dcmtk/ofstd/oftraits.h \
- ../../ofstd/include/dcmtk/ofstd/ofcond.h \
../../ofstd/include/dcmtk/ofstd/oflimits.h \
../../config/include/dcmtk/config/arith.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
- ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dctag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \
- ../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdict.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
../../dcmdata/include/dcmtk/dcmdata/dclist.h \
../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcmetinf.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicdir.h \
- ../../ofstd/include/dcmtk/ofstd/ofmap.h \
+ ../include/dcmtk/dcmsr/dsrdoctn.h ../include/dcmtk/dcmsr/dsrtree.h \
+ ../include/dcmtk/dcmsr/dsrtncsr.h ../include/dcmtk/dcmsr/dsrposcn.h \
+ ../include/dcmtk/dcmsr/dsrtnant.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstack.h \
../../ofstd/include/dcmtk/ofstd/ofutil.h \
../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdirrec.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrulup.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixseq.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcofsetl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrae.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvras.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
- ../../ofstd/include/dcmtk/ofstd/ofdate.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrds.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrdt.h \
- ../../ofstd/include/dcmtk/ofstd/ofdatime.h \
- ../../ofstd/include/dcmtk/ofstd/oftime.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrur.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlt.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrst.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvruc.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrut.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrobow.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixel.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpobw.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcovlay.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
- ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
- ../include/dcmtk/dcmsr/dsdefine.h ../include/dcmtk/dcmsr/dsrdoctn.h \
- ../include/dcmtk/dcmsr/dsrtree.h ../include/dcmtk/dcmsr/dsrtncsr.h \
- ../../ofstd/include/dcmtk/ofstd/ofstack.h \
- ../include/dcmtk/dcmsr/dsrposcn.h ../include/dcmtk/dcmsr/dsrtnant.h \
../include/dcmtk/dcmsr/dsrcodvl.h \
../../ofstd/include/dcmtk/ofstd/ofexbl.h \
- ../include/dcmtk/dcmsr/dsrnumvl.h ../include/dcmtk/dcmsr/dsrscovl.h \
- ../include/dcmtk/dcmsr/dsrscogr.h ../include/dcmtk/dcmsr/dsrtlist.h \
- ../include/dcmtk/dcmsr/dsrsc3vl.h ../include/dcmtk/dcmsr/dsrsc3gr.h \
- ../include/dcmtk/dcmsr/dsrtcovl.h ../include/dcmtk/dcmsr/dsrtcodt.h \
- ../include/dcmtk/dcmsr/dsrtcosp.h ../include/dcmtk/dcmsr/dsrtcoto.h \
- ../include/dcmtk/dcmsr/dsrcomvl.h ../include/dcmtk/dcmsr/dsrimgvl.h \
- ../include/dcmtk/dcmsr/dsrimgfr.h ../include/dcmtk/dcmsr/dsrimgse.h \
- ../include/dcmtk/dcmsr/dsrwavvl.h ../include/dcmtk/dcmsr/dsrwavch.h \
- ../include/dcmtk/dcmsr/dsrtextn.h ../include/dcmtk/dcmsr/dsrstrvl.h \
- ../include/dcmtk/dcmsr/dsrcodtn.h ../include/dcmtk/dcmsr/dsrnumtn.h \
- ../include/dcmtk/dcmsr/dsrdtitn.h ../include/dcmtk/dcmsr/dsrdattn.h \
- ../include/dcmtk/dcmsr/dsrtimtn.h ../include/dcmtk/dcmsr/dsruidtn.h \
- ../include/dcmtk/dcmsr/dsrpnmtn.h ../include/dcmtk/dcmsr/dsrscotn.h \
- ../include/dcmtk/dcmsr/dsrsc3tn.h ../include/dcmtk/dcmsr/dsrtcotn.h \
- ../include/dcmtk/dcmsr/dsrcomtn.h ../include/dcmtk/dcmsr/dsrimgtn.h \
- ../include/dcmtk/dcmsr/dsrwavtn.h ../include/dcmtk/dcmsr/dsrcontn.h \
- ../include/dcmtk/dcmsr/dsrreftn.h
+ ../include/dcmtk/dcmsr/dsrnumvl.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
+ ../include/dcmtk/dcmsr/dsrscovl.h ../include/dcmtk/dcmsr/dsrscogr.h \
+ ../include/dcmtk/dcmsr/dsrtlist.h ../include/dcmtk/dcmsr/dsrsc3vl.h \
+ ../include/dcmtk/dcmsr/dsrsc3gr.h ../include/dcmtk/dcmsr/dsrtcovl.h \
+ ../include/dcmtk/dcmsr/dsrtcodt.h ../include/dcmtk/dcmsr/dsrtcosp.h \
+ ../include/dcmtk/dcmsr/dsrtcoto.h ../include/dcmtk/dcmsr/dsrcomvl.h \
+ ../include/dcmtk/dcmsr/dsrimgvl.h ../include/dcmtk/dcmsr/dsrimgfr.h \
+ ../include/dcmtk/dcmsr/dsrimgse.h ../include/dcmtk/dcmsr/dsrwavvl.h \
+ ../include/dcmtk/dcmsr/dsrwavch.h ../include/dcmtk/dcmsr/dsrtextn.h \
+ ../include/dcmtk/dcmsr/dsrstrvl.h ../include/dcmtk/dcmsr/dsrcodtn.h \
+ ../include/dcmtk/dcmsr/dsrnumtn.h ../include/dcmtk/dcmsr/dsrdtitn.h \
+ ../include/dcmtk/dcmsr/dsrdattn.h ../include/dcmtk/dcmsr/dsrtimtn.h \
+ ../include/dcmtk/dcmsr/dsruidtn.h ../include/dcmtk/dcmsr/dsrpnmtn.h \
+ ../include/dcmtk/dcmsr/dsrscotn.h ../include/dcmtk/dcmsr/dsrsc3tn.h \
+ ../include/dcmtk/dcmsr/dsrtcotn.h ../include/dcmtk/dcmsr/dsrcomtn.h \
+ ../include/dcmtk/dcmsr/dsrimgtn.h ../include/dcmtk/dcmsr/dsrwavtn.h \
+ ../include/dcmtk/dcmsr/dsrcontn.h ../include/dcmtk/dcmsr/dsrreftn.h
dsrcodtn.o: dsrcodtn.cc ../../config/include/dcmtk/config/osconfig.h \
- ../include/dcmtk/dcmsr/dsrtypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctk.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
- ../../oflog/include/dcmtk/oflog/oflog.h \
- ../../oflog/include/dcmtk/oflog/logger.h \
- ../../oflog/include/dcmtk/oflog/config.h \
+ ../include/dcmtk/dcmsr/dsrtypes.h ../include/dcmtk/dcmsr/dsdefine.h \
../../ofstd/include/dcmtk/ofstd/ofdefine.h \
../../ofstd/include/dcmtk/ofstd/ofcast.h \
../../ofstd/include/dcmtk/ofstd/ofexport.h \
../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
+ ../../ofstd/include/dcmtk/ofstd/ofthread.h \
+ ../../ofstd/include/dcmtk/ofstd/oftypes.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstream.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstring.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcond.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
+ ../../oflog/include/dcmtk/oflog/oflog.h \
+ ../../oflog/include/dcmtk/oflog/logger.h \
+ ../../oflog/include/dcmtk/oflog/config.h \
../../oflog/include/dcmtk/oflog/config/defines.h \
../../oflog/include/dcmtk/oflog/helpers/threadcf.h \
../../oflog/include/dcmtk/oflog/loglevel.h \
../../ofstd/include/dcmtk/ofstd/ofvector.h \
- ../../ofstd/include/dcmtk/ofstd/oftypes.h \
- ../../ofstd/include/dcmtk/ofstd/ofstream.h \
../../oflog/include/dcmtk/oflog/tstring.h \
- ../../ofstd/include/dcmtk/ofstd/ofstring.h \
../../oflog/include/dcmtk/oflog/tchar.h \
../../oflog/include/dcmtk/oflog/spi/apndatch.h \
../../oflog/include/dcmtk/oflog/appender.h \
@@ -636,110 +360,55 @@ dsrcodtn.o: dsrcodtn.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofcmdln.h \
../../ofstd/include/dcmtk/ofstd/oflist.h \
../../ofstd/include/dcmtk/ofstd/ofconsol.h \
- ../../ofstd/include/dcmtk/ofstd/ofthread.h \
../../ofstd/include/dcmtk/ofstd/offile.h \
../../ofstd/include/dcmtk/ofstd/ofstd.h \
../../ofstd/include/dcmtk/ofstd/oftraits.h \
- ../../ofstd/include/dcmtk/ofstd/ofcond.h \
../../ofstd/include/dcmtk/ofstd/oflimits.h \
../../config/include/dcmtk/config/arith.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
- ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dctag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \
- ../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdict.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
../../dcmdata/include/dcmtk/dcmdata/dclist.h \
../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcmetinf.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicdir.h \
- ../../ofstd/include/dcmtk/ofstd/ofmap.h \
+ ../include/dcmtk/dcmsr/dsrcodtn.h ../include/dcmtk/dcmsr/dsrdoctn.h \
+ ../include/dcmtk/dcmsr/dsrtree.h ../include/dcmtk/dcmsr/dsrtncsr.h \
+ ../include/dcmtk/dcmsr/dsrposcn.h ../include/dcmtk/dcmsr/dsrtnant.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstack.h \
../../ofstd/include/dcmtk/ofstd/ofutil.h \
../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdirrec.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrulup.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixseq.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcofsetl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrae.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvras.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
- ../../ofstd/include/dcmtk/ofstd/ofdate.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrds.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrdt.h \
- ../../ofstd/include/dcmtk/ofstd/ofdatime.h \
- ../../ofstd/include/dcmtk/ofstd/oftime.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrur.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlt.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrst.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvruc.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrut.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrobow.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixel.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpobw.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcovlay.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
- ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
- ../include/dcmtk/dcmsr/dsdefine.h ../include/dcmtk/dcmsr/dsrcodtn.h \
- ../include/dcmtk/dcmsr/dsrdoctn.h ../include/dcmtk/dcmsr/dsrtree.h \
- ../include/dcmtk/dcmsr/dsrtncsr.h \
- ../../ofstd/include/dcmtk/ofstd/ofstack.h \
- ../include/dcmtk/dcmsr/dsrposcn.h ../include/dcmtk/dcmsr/dsrtnant.h \
../include/dcmtk/dcmsr/dsrcodvl.h \
../../ofstd/include/dcmtk/ofstd/ofexbl.h \
- ../include/dcmtk/dcmsr/dsrxmld.h ../include/dcmtk/dcmsr/dsrxmlc.h
+ ../include/dcmtk/dcmsr/dsrxmld.h ../include/dcmtk/dcmsr/dsrxmlc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h
dsrcodvl.o: dsrcodvl.cc ../../config/include/dcmtk/config/osconfig.h \
- ../include/dcmtk/dcmsr/dsrtypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctk.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
- ../../oflog/include/dcmtk/oflog/oflog.h \
- ../../oflog/include/dcmtk/oflog/logger.h \
- ../../oflog/include/dcmtk/oflog/config.h \
+ ../include/dcmtk/dcmsr/dsrtypes.h ../include/dcmtk/dcmsr/dsdefine.h \
../../ofstd/include/dcmtk/ofstd/ofdefine.h \
../../ofstd/include/dcmtk/ofstd/ofcast.h \
../../ofstd/include/dcmtk/ofstd/ofexport.h \
../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
+ ../../ofstd/include/dcmtk/ofstd/ofthread.h \
+ ../../ofstd/include/dcmtk/ofstd/oftypes.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstream.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstring.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcond.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
+ ../../oflog/include/dcmtk/oflog/oflog.h \
+ ../../oflog/include/dcmtk/oflog/logger.h \
+ ../../oflog/include/dcmtk/oflog/config.h \
../../oflog/include/dcmtk/oflog/config/defines.h \
../../oflog/include/dcmtk/oflog/helpers/threadcf.h \
../../oflog/include/dcmtk/oflog/loglevel.h \
../../ofstd/include/dcmtk/ofstd/ofvector.h \
- ../../ofstd/include/dcmtk/ofstd/oftypes.h \
- ../../ofstd/include/dcmtk/ofstd/ofstream.h \
../../oflog/include/dcmtk/oflog/tstring.h \
- ../../ofstd/include/dcmtk/ofstd/ofstring.h \
../../oflog/include/dcmtk/oflog/tchar.h \
../../oflog/include/dcmtk/oflog/spi/apndatch.h \
../../oflog/include/dcmtk/oflog/appender.h \
@@ -758,106 +427,62 @@ dsrcodvl.o: dsrcodvl.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofcmdln.h \
../../ofstd/include/dcmtk/ofstd/oflist.h \
../../ofstd/include/dcmtk/ofstd/ofconsol.h \
- ../../ofstd/include/dcmtk/ofstd/ofthread.h \
../../ofstd/include/dcmtk/ofstd/offile.h \
../../ofstd/include/dcmtk/ofstd/ofstd.h \
../../ofstd/include/dcmtk/ofstd/oftraits.h \
- ../../ofstd/include/dcmtk/ofstd/ofcond.h \
../../ofstd/include/dcmtk/ofstd/oflimits.h \
../../config/include/dcmtk/config/arith.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
- ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dctag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \
- ../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdict.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
../../dcmdata/include/dcmtk/dcmdata/dclist.h \
../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcmetinf.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicdir.h \
- ../../ofstd/include/dcmtk/ofstd/ofmap.h \
- ../../ofstd/include/dcmtk/ofstd/ofutil.h \
- ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdirrec.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrulup.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixseq.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcofsetl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrae.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvras.h \
+ ../include/dcmtk/dcmsr/dsrcodvl.h \
+ ../../ofstd/include/dcmtk/ofstd/ofexbl.h \
+ ../include/dcmtk/dcmsr/dsrxmld.h ../include/dcmtk/dcmsr/dsrxmlc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
- ../../ofstd/include/dcmtk/ofstd/ofdate.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrds.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrdt.h \
../../ofstd/include/dcmtk/ofstd/ofdatime.h \
+ ../../ofstd/include/dcmtk/ofstd/ofdate.h \
../../ofstd/include/dcmtk/ofstd/oftime.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrur.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlt.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrst.h \
../../dcmdata/include/dcmtk/dcmdata/dcvruc.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrut.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrobow.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixel.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpobw.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcovlay.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
- ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
- ../include/dcmtk/dcmsr/dsdefine.h ../include/dcmtk/dcmsr/dsrcodvl.h \
- ../../ofstd/include/dcmtk/ofstd/ofexbl.h \
- ../include/dcmtk/dcmsr/dsrxmld.h ../include/dcmtk/dcmsr/dsrxmlc.h
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrur.h
dsrcolcc.o: dsrcolcc.cc ../../config/include/dcmtk/config/osconfig.h \
../include/dcmtk/dcmsr/dsrcolcc.h ../include/dcmtk/dcmsr/dsriodcc.h \
- ../include/dcmtk/dcmsr/dsrtypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctk.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
- ../../oflog/include/dcmtk/oflog/oflog.h \
- ../../oflog/include/dcmtk/oflog/logger.h \
- ../../oflog/include/dcmtk/oflog/config.h \
+ ../include/dcmtk/dcmsr/dsrtypes.h ../include/dcmtk/dcmsr/dsdefine.h \
../../ofstd/include/dcmtk/ofstd/ofdefine.h \
../../ofstd/include/dcmtk/ofstd/ofcast.h \
../../ofstd/include/dcmtk/ofstd/ofexport.h \
../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
+ ../../ofstd/include/dcmtk/ofstd/ofthread.h \
+ ../../ofstd/include/dcmtk/ofstd/oftypes.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstream.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstring.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcond.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
+ ../../oflog/include/dcmtk/oflog/oflog.h \
+ ../../oflog/include/dcmtk/oflog/logger.h \
+ ../../oflog/include/dcmtk/oflog/config.h \
../../oflog/include/dcmtk/oflog/config/defines.h \
../../oflog/include/dcmtk/oflog/helpers/threadcf.h \
../../oflog/include/dcmtk/oflog/loglevel.h \
../../ofstd/include/dcmtk/ofstd/ofvector.h \
- ../../ofstd/include/dcmtk/ofstd/oftypes.h \
- ../../ofstd/include/dcmtk/ofstd/ofstream.h \
../../oflog/include/dcmtk/oflog/tstring.h \
- ../../ofstd/include/dcmtk/ofstd/ofstring.h \
../../oflog/include/dcmtk/oflog/tchar.h \
../../oflog/include/dcmtk/oflog/spi/apndatch.h \
../../oflog/include/dcmtk/oflog/appender.h \
@@ -876,104 +501,46 @@ dsrcolcc.o: dsrcolcc.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofcmdln.h \
../../ofstd/include/dcmtk/ofstd/oflist.h \
../../ofstd/include/dcmtk/ofstd/ofconsol.h \
- ../../ofstd/include/dcmtk/ofstd/ofthread.h \
../../ofstd/include/dcmtk/ofstd/offile.h \
../../ofstd/include/dcmtk/ofstd/ofstd.h \
../../ofstd/include/dcmtk/ofstd/oftraits.h \
- ../../ofstd/include/dcmtk/ofstd/ofcond.h \
../../ofstd/include/dcmtk/ofstd/oflimits.h \
../../config/include/dcmtk/config/arith.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
- ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dctag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \
- ../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdict.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
../../dcmdata/include/dcmtk/dcmdata/dclist.h \
../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcmetinf.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicdir.h \
- ../../ofstd/include/dcmtk/ofstd/ofmap.h \
- ../../ofstd/include/dcmtk/ofstd/ofutil.h \
- ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdirrec.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrulup.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixseq.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcofsetl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrae.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvras.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
- ../../ofstd/include/dcmtk/ofstd/ofdate.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrds.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrdt.h \
- ../../ofstd/include/dcmtk/ofstd/ofdatime.h \
- ../../ofstd/include/dcmtk/ofstd/oftime.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrur.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlt.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrst.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvruc.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrut.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrobow.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixel.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpobw.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcovlay.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
- ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
- ../include/dcmtk/dcmsr/dsdefine.h
+ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h
dsrcomcc.o: dsrcomcc.cc ../../config/include/dcmtk/config/osconfig.h \
../include/dcmtk/dcmsr/dsrcomcc.h ../include/dcmtk/dcmsr/dsriodcc.h \
- ../include/dcmtk/dcmsr/dsrtypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctk.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
- ../../oflog/include/dcmtk/oflog/oflog.h \
- ../../oflog/include/dcmtk/oflog/logger.h \
- ../../oflog/include/dcmtk/oflog/config.h \
+ ../include/dcmtk/dcmsr/dsrtypes.h ../include/dcmtk/dcmsr/dsdefine.h \
../../ofstd/include/dcmtk/ofstd/ofdefine.h \
../../ofstd/include/dcmtk/ofstd/ofcast.h \
../../ofstd/include/dcmtk/ofstd/ofexport.h \
../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
+ ../../ofstd/include/dcmtk/ofstd/ofthread.h \
+ ../../ofstd/include/dcmtk/ofstd/oftypes.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstream.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstring.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcond.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
+ ../../oflog/include/dcmtk/oflog/oflog.h \
+ ../../oflog/include/dcmtk/oflog/logger.h \
+ ../../oflog/include/dcmtk/oflog/config.h \
../../oflog/include/dcmtk/oflog/config/defines.h \
../../oflog/include/dcmtk/oflog/helpers/threadcf.h \
../../oflog/include/dcmtk/oflog/loglevel.h \
../../ofstd/include/dcmtk/ofstd/ofvector.h \
- ../../ofstd/include/dcmtk/ofstd/oftypes.h \
- ../../ofstd/include/dcmtk/ofstd/ofstream.h \
../../oflog/include/dcmtk/oflog/tstring.h \
- ../../ofstd/include/dcmtk/ofstd/ofstring.h \
../../oflog/include/dcmtk/oflog/tchar.h \
../../oflog/include/dcmtk/oflog/spi/apndatch.h \
../../oflog/include/dcmtk/oflog/appender.h \
@@ -992,103 +559,45 @@ dsrcomcc.o: dsrcomcc.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofcmdln.h \
../../ofstd/include/dcmtk/ofstd/oflist.h \
../../ofstd/include/dcmtk/ofstd/ofconsol.h \
- ../../ofstd/include/dcmtk/ofstd/ofthread.h \
../../ofstd/include/dcmtk/ofstd/offile.h \
../../ofstd/include/dcmtk/ofstd/ofstd.h \
../../ofstd/include/dcmtk/ofstd/oftraits.h \
- ../../ofstd/include/dcmtk/ofstd/ofcond.h \
../../ofstd/include/dcmtk/ofstd/oflimits.h \
../../config/include/dcmtk/config/arith.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
- ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dctag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \
- ../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdict.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
../../dcmdata/include/dcmtk/dcmdata/dclist.h \
../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcmetinf.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicdir.h \
- ../../ofstd/include/dcmtk/ofstd/ofmap.h \
- ../../ofstd/include/dcmtk/ofstd/ofutil.h \
- ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdirrec.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrulup.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixseq.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcofsetl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrae.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvras.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
- ../../ofstd/include/dcmtk/ofstd/ofdate.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrds.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrdt.h \
- ../../ofstd/include/dcmtk/ofstd/ofdatime.h \
- ../../ofstd/include/dcmtk/ofstd/oftime.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrur.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlt.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrst.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvruc.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrut.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrobow.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixel.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpobw.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcovlay.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
- ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
- ../include/dcmtk/dcmsr/dsdefine.h
+ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h
dsrcomtn.o: dsrcomtn.cc ../../config/include/dcmtk/config/osconfig.h \
- ../include/dcmtk/dcmsr/dsrtypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctk.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
- ../../oflog/include/dcmtk/oflog/oflog.h \
- ../../oflog/include/dcmtk/oflog/logger.h \
- ../../oflog/include/dcmtk/oflog/config.h \
+ ../include/dcmtk/dcmsr/dsrtypes.h ../include/dcmtk/dcmsr/dsdefine.h \
../../ofstd/include/dcmtk/ofstd/ofdefine.h \
../../ofstd/include/dcmtk/ofstd/ofcast.h \
../../ofstd/include/dcmtk/ofstd/ofexport.h \
../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
+ ../../ofstd/include/dcmtk/ofstd/ofthread.h \
+ ../../ofstd/include/dcmtk/ofstd/oftypes.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstream.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstring.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcond.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
+ ../../oflog/include/dcmtk/oflog/oflog.h \
+ ../../oflog/include/dcmtk/oflog/logger.h \
+ ../../oflog/include/dcmtk/oflog/config.h \
../../oflog/include/dcmtk/oflog/config/defines.h \
../../oflog/include/dcmtk/oflog/helpers/threadcf.h \
../../oflog/include/dcmtk/oflog/loglevel.h \
../../ofstd/include/dcmtk/ofstd/ofvector.h \
- ../../ofstd/include/dcmtk/ofstd/oftypes.h \
- ../../ofstd/include/dcmtk/ofstd/ofstream.h \
../../oflog/include/dcmtk/oflog/tstring.h \
- ../../ofstd/include/dcmtk/ofstd/ofstring.h \
../../oflog/include/dcmtk/oflog/tchar.h \
../../oflog/include/dcmtk/oflog/spi/apndatch.h \
../../oflog/include/dcmtk/oflog/appender.h \
@@ -1107,111 +616,57 @@ dsrcomtn.o: dsrcomtn.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofcmdln.h \
../../ofstd/include/dcmtk/ofstd/oflist.h \
../../ofstd/include/dcmtk/ofstd/ofconsol.h \
- ../../ofstd/include/dcmtk/ofstd/ofthread.h \
../../ofstd/include/dcmtk/ofstd/offile.h \
../../ofstd/include/dcmtk/ofstd/ofstd.h \
../../ofstd/include/dcmtk/ofstd/oftraits.h \
- ../../ofstd/include/dcmtk/ofstd/ofcond.h \
../../ofstd/include/dcmtk/ofstd/oflimits.h \
../../config/include/dcmtk/config/arith.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
- ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dctag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \
- ../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdict.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
../../dcmdata/include/dcmtk/dcmdata/dclist.h \
../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcmetinf.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicdir.h \
- ../../ofstd/include/dcmtk/ofstd/ofmap.h \
+ ../include/dcmtk/dcmsr/dsrcomtn.h ../include/dcmtk/dcmsr/dsrdoctn.h \
+ ../include/dcmtk/dcmsr/dsrtree.h ../include/dcmtk/dcmsr/dsrtncsr.h \
+ ../include/dcmtk/dcmsr/dsrposcn.h ../include/dcmtk/dcmsr/dsrtnant.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstack.h \
../../ofstd/include/dcmtk/ofstd/ofutil.h \
../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdirrec.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrulup.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixseq.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcofsetl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrae.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvras.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
- ../../ofstd/include/dcmtk/ofstd/ofdate.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrds.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrdt.h \
- ../../ofstd/include/dcmtk/ofstd/ofdatime.h \
- ../../ofstd/include/dcmtk/ofstd/oftime.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrur.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlt.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrst.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvruc.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrut.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrobow.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixel.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpobw.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcovlay.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
- ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
- ../include/dcmtk/dcmsr/dsdefine.h ../include/dcmtk/dcmsr/dsrcomtn.h \
- ../include/dcmtk/dcmsr/dsrdoctn.h ../include/dcmtk/dcmsr/dsrtree.h \
- ../include/dcmtk/dcmsr/dsrtncsr.h \
- ../../ofstd/include/dcmtk/ofstd/ofstack.h \
- ../include/dcmtk/dcmsr/dsrposcn.h ../include/dcmtk/dcmsr/dsrtnant.h \
../include/dcmtk/dcmsr/dsrcodvl.h \
../../ofstd/include/dcmtk/ofstd/ofexbl.h \
../include/dcmtk/dcmsr/dsrcomvl.h ../include/dcmtk/dcmsr/dsrxmld.h \
- ../include/dcmtk/dcmsr/dsrxmlc.h
+ ../include/dcmtk/dcmsr/dsrxmlc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h
dsrcomvl.o: dsrcomvl.cc ../../config/include/dcmtk/config/osconfig.h \
- ../include/dcmtk/dcmsr/dsrtypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctk.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
- ../../oflog/include/dcmtk/oflog/oflog.h \
- ../../oflog/include/dcmtk/oflog/logger.h \
- ../../oflog/include/dcmtk/oflog/config.h \
+ ../include/dcmtk/dcmsr/dsrtypes.h ../include/dcmtk/dcmsr/dsdefine.h \
../../ofstd/include/dcmtk/ofstd/ofdefine.h \
../../ofstd/include/dcmtk/ofstd/ofcast.h \
../../ofstd/include/dcmtk/ofstd/ofexport.h \
../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
+ ../../ofstd/include/dcmtk/ofstd/ofthread.h \
+ ../../ofstd/include/dcmtk/ofstd/oftypes.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstream.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstring.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcond.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
+ ../../oflog/include/dcmtk/oflog/oflog.h \
+ ../../oflog/include/dcmtk/oflog/logger.h \
+ ../../oflog/include/dcmtk/oflog/config.h \
../../oflog/include/dcmtk/oflog/config/defines.h \
../../oflog/include/dcmtk/oflog/helpers/threadcf.h \
../../oflog/include/dcmtk/oflog/loglevel.h \
../../ofstd/include/dcmtk/ofstd/ofvector.h \
- ../../ofstd/include/dcmtk/ofstd/oftypes.h \
- ../../ofstd/include/dcmtk/ofstd/ofstream.h \
../../oflog/include/dcmtk/oflog/tstring.h \
- ../../ofstd/include/dcmtk/ofstd/ofstring.h \
../../oflog/include/dcmtk/oflog/tchar.h \
../../oflog/include/dcmtk/oflog/spi/apndatch.h \
../../oflog/include/dcmtk/oflog/appender.h \
@@ -1230,104 +685,51 @@ dsrcomvl.o: dsrcomvl.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofcmdln.h \
../../ofstd/include/dcmtk/ofstd/oflist.h \
../../ofstd/include/dcmtk/ofstd/ofconsol.h \
- ../../ofstd/include/dcmtk/ofstd/ofthread.h \
../../ofstd/include/dcmtk/ofstd/offile.h \
../../ofstd/include/dcmtk/ofstd/ofstd.h \
../../ofstd/include/dcmtk/ofstd/oftraits.h \
- ../../ofstd/include/dcmtk/ofstd/ofcond.h \
../../ofstd/include/dcmtk/ofstd/oflimits.h \
../../config/include/dcmtk/config/arith.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
- ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dctag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \
- ../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdict.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
../../dcmdata/include/dcmtk/dcmdata/dclist.h \
../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcmetinf.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicdir.h \
- ../../ofstd/include/dcmtk/ofstd/ofmap.h \
- ../../ofstd/include/dcmtk/ofstd/ofutil.h \
- ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdirrec.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrulup.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixseq.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcofsetl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrae.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvras.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
- ../../ofstd/include/dcmtk/ofstd/ofdate.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrds.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrdt.h \
- ../../ofstd/include/dcmtk/ofstd/ofdatime.h \
- ../../ofstd/include/dcmtk/ofstd/oftime.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
+ ../include/dcmtk/dcmsr/dsrcomvl.h ../include/dcmtk/dcmsr/dsrxmld.h \
+ ../include/dcmtk/dcmsr/dsrxmlc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrur.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlt.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrst.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvruc.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrut.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrobow.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixel.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpobw.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcovlay.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
- ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
- ../include/dcmtk/dcmsr/dsdefine.h ../include/dcmtk/dcmsr/dsrcomvl.h \
- ../include/dcmtk/dcmsr/dsrxmld.h ../include/dcmtk/dcmsr/dsrxmlc.h
+ ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h
dsrcontn.o: dsrcontn.cc ../../config/include/dcmtk/config/osconfig.h \
- ../include/dcmtk/dcmsr/dsrtypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctk.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
- ../../oflog/include/dcmtk/oflog/oflog.h \
- ../../oflog/include/dcmtk/oflog/logger.h \
- ../../oflog/include/dcmtk/oflog/config.h \
+ ../include/dcmtk/dcmsr/dsrtypes.h ../include/dcmtk/dcmsr/dsdefine.h \
../../ofstd/include/dcmtk/ofstd/ofdefine.h \
../../ofstd/include/dcmtk/ofstd/ofcast.h \
../../ofstd/include/dcmtk/ofstd/ofexport.h \
../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
+ ../../ofstd/include/dcmtk/ofstd/ofthread.h \
+ ../../ofstd/include/dcmtk/ofstd/oftypes.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstream.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstring.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcond.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
+ ../../oflog/include/dcmtk/oflog/oflog.h \
+ ../../oflog/include/dcmtk/oflog/logger.h \
+ ../../oflog/include/dcmtk/oflog/config.h \
../../oflog/include/dcmtk/oflog/config/defines.h \
../../oflog/include/dcmtk/oflog/helpers/threadcf.h \
../../oflog/include/dcmtk/oflog/loglevel.h \
../../ofstd/include/dcmtk/ofstd/ofvector.h \
- ../../ofstd/include/dcmtk/ofstd/oftypes.h \
- ../../ofstd/include/dcmtk/ofstd/ofstream.h \
../../oflog/include/dcmtk/oflog/tstring.h \
- ../../ofstd/include/dcmtk/ofstd/ofstring.h \
../../oflog/include/dcmtk/oflog/tchar.h \
../../oflog/include/dcmtk/oflog/spi/apndatch.h \
../../oflog/include/dcmtk/oflog/appender.h \
@@ -1346,110 +748,56 @@ dsrcontn.o: dsrcontn.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofcmdln.h \
../../ofstd/include/dcmtk/ofstd/oflist.h \
../../ofstd/include/dcmtk/ofstd/ofconsol.h \
- ../../ofstd/include/dcmtk/ofstd/ofthread.h \
../../ofstd/include/dcmtk/ofstd/offile.h \
../../ofstd/include/dcmtk/ofstd/ofstd.h \
../../ofstd/include/dcmtk/ofstd/oftraits.h \
- ../../ofstd/include/dcmtk/ofstd/ofcond.h \
../../ofstd/include/dcmtk/ofstd/oflimits.h \
../../config/include/dcmtk/config/arith.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
- ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dctag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \
- ../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdict.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
../../dcmdata/include/dcmtk/dcmdata/dclist.h \
../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcmetinf.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicdir.h \
- ../../ofstd/include/dcmtk/ofstd/ofmap.h \
+ ../include/dcmtk/dcmsr/dsrcontn.h ../include/dcmtk/dcmsr/dsrdoctn.h \
+ ../include/dcmtk/dcmsr/dsrtree.h ../include/dcmtk/dcmsr/dsrtncsr.h \
+ ../include/dcmtk/dcmsr/dsrposcn.h ../include/dcmtk/dcmsr/dsrtnant.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstack.h \
../../ofstd/include/dcmtk/ofstd/ofutil.h \
../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdirrec.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrulup.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixseq.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcofsetl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrae.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvras.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
- ../../ofstd/include/dcmtk/ofstd/ofdate.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrds.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrdt.h \
- ../../ofstd/include/dcmtk/ofstd/ofdatime.h \
- ../../ofstd/include/dcmtk/ofstd/oftime.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrur.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlt.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrst.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvruc.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrut.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrobow.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixel.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpobw.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcovlay.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
- ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
- ../include/dcmtk/dcmsr/dsdefine.h ../include/dcmtk/dcmsr/dsrcontn.h \
- ../include/dcmtk/dcmsr/dsrdoctn.h ../include/dcmtk/dcmsr/dsrtree.h \
- ../include/dcmtk/dcmsr/dsrtncsr.h \
- ../../ofstd/include/dcmtk/ofstd/ofstack.h \
- ../include/dcmtk/dcmsr/dsrposcn.h ../include/dcmtk/dcmsr/dsrtnant.h \
../include/dcmtk/dcmsr/dsrcodvl.h \
../../ofstd/include/dcmtk/ofstd/ofexbl.h \
- ../include/dcmtk/dcmsr/dsrxmld.h ../include/dcmtk/dcmsr/dsrxmlc.h
+ ../include/dcmtk/dcmsr/dsrxmld.h ../include/dcmtk/dcmsr/dsrxmlc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h
dsrcsidl.o: dsrcsidl.cc ../../config/include/dcmtk/config/osconfig.h \
../include/dcmtk/dcmsr/dsrcsidl.h ../include/dcmtk/dcmsr/dsrtypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctk.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
- ../../oflog/include/dcmtk/oflog/oflog.h \
- ../../oflog/include/dcmtk/oflog/logger.h \
- ../../oflog/include/dcmtk/oflog/config.h \
+ ../include/dcmtk/dcmsr/dsdefine.h \
../../ofstd/include/dcmtk/ofstd/ofdefine.h \
../../ofstd/include/dcmtk/ofstd/ofcast.h \
../../ofstd/include/dcmtk/ofstd/ofexport.h \
../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
+ ../../ofstd/include/dcmtk/ofstd/ofthread.h \
+ ../../ofstd/include/dcmtk/ofstd/oftypes.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstream.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstring.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcond.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
+ ../../oflog/include/dcmtk/oflog/oflog.h \
+ ../../oflog/include/dcmtk/oflog/logger.h \
+ ../../oflog/include/dcmtk/oflog/config.h \
../../oflog/include/dcmtk/oflog/config/defines.h \
../../oflog/include/dcmtk/oflog/helpers/threadcf.h \
../../oflog/include/dcmtk/oflog/loglevel.h \
../../ofstd/include/dcmtk/ofstd/ofvector.h \
- ../../ofstd/include/dcmtk/ofstd/oftypes.h \
- ../../ofstd/include/dcmtk/ofstd/ofstream.h \
../../oflog/include/dcmtk/oflog/tstring.h \
- ../../ofstd/include/dcmtk/ofstd/ofstring.h \
../../oflog/include/dcmtk/oflog/tchar.h \
../../oflog/include/dcmtk/oflog/spi/apndatch.h \
../../oflog/include/dcmtk/oflog/appender.h \
@@ -1468,104 +816,56 @@ dsrcsidl.o: dsrcsidl.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofcmdln.h \
../../ofstd/include/dcmtk/ofstd/oflist.h \
../../ofstd/include/dcmtk/ofstd/ofconsol.h \
- ../../ofstd/include/dcmtk/ofstd/ofthread.h \
../../ofstd/include/dcmtk/ofstd/offile.h \
../../ofstd/include/dcmtk/ofstd/ofstd.h \
../../ofstd/include/dcmtk/ofstd/oftraits.h \
- ../../ofstd/include/dcmtk/ofstd/ofcond.h \
../../ofstd/include/dcmtk/ofstd/oflimits.h \
../../config/include/dcmtk/config/arith.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
- ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dctag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \
- ../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdict.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
../../dcmdata/include/dcmtk/dcmdata/dclist.h \
../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcmetinf.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicdir.h \
- ../../ofstd/include/dcmtk/ofstd/ofmap.h \
- ../../ofstd/include/dcmtk/ofstd/ofutil.h \
- ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdirrec.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrulup.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixseq.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcofsetl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrae.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvras.h \
+ ../include/dcmtk/dcmsr/dsrxmld.h ../include/dcmtk/dcmsr/dsrxmlc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
- ../../ofstd/include/dcmtk/ofstd/ofdate.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrds.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrdt.h \
- ../../ofstd/include/dcmtk/ofstd/ofdatime.h \
- ../../ofstd/include/dcmtk/ofstd/oftime.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrur.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlt.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrst.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvruc.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrut.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrobow.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixel.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpobw.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcovlay.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
- ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
- ../include/dcmtk/dcmsr/dsdefine.h ../include/dcmtk/dcmsr/dsrxmld.h \
- ../include/dcmtk/dcmsr/dsrxmlc.h
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h
dsrctpl.o: dsrctpl.cc ../../config/include/dcmtk/config/osconfig.h \
../include/dcmtk/dcmsr/dsrctpl.h ../include/dcmtk/dcmsr/dsrtypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctk.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
- ../../oflog/include/dcmtk/oflog/oflog.h \
- ../../oflog/include/dcmtk/oflog/logger.h \
- ../../oflog/include/dcmtk/oflog/config.h \
+ ../include/dcmtk/dcmsr/dsdefine.h \
../../ofstd/include/dcmtk/ofstd/ofdefine.h \
../../ofstd/include/dcmtk/ofstd/ofcast.h \
../../ofstd/include/dcmtk/ofstd/ofexport.h \
../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
+ ../../ofstd/include/dcmtk/ofstd/ofthread.h \
+ ../../ofstd/include/dcmtk/ofstd/oftypes.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstream.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstring.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcond.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
+ ../../oflog/include/dcmtk/oflog/oflog.h \
+ ../../oflog/include/dcmtk/oflog/logger.h \
+ ../../oflog/include/dcmtk/oflog/config.h \
../../oflog/include/dcmtk/oflog/config/defines.h \
../../oflog/include/dcmtk/oflog/helpers/threadcf.h \
../../oflog/include/dcmtk/oflog/loglevel.h \
../../ofstd/include/dcmtk/ofstd/ofvector.h \
- ../../ofstd/include/dcmtk/ofstd/oftypes.h \
- ../../ofstd/include/dcmtk/ofstd/ofstream.h \
../../oflog/include/dcmtk/oflog/tstring.h \
- ../../ofstd/include/dcmtk/ofstd/ofstring.h \
../../oflog/include/dcmtk/oflog/tchar.h \
../../oflog/include/dcmtk/oflog/spi/apndatch.h \
../../oflog/include/dcmtk/oflog/appender.h \
@@ -1584,119 +884,71 @@ dsrctpl.o: dsrctpl.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofcmdln.h \
../../ofstd/include/dcmtk/ofstd/oflist.h \
../../ofstd/include/dcmtk/ofstd/ofconsol.h \
- ../../ofstd/include/dcmtk/ofstd/ofthread.h \
../../ofstd/include/dcmtk/ofstd/offile.h \
../../ofstd/include/dcmtk/ofstd/ofstd.h \
../../ofstd/include/dcmtk/ofstd/oftraits.h \
- ../../ofstd/include/dcmtk/ofstd/ofcond.h \
../../ofstd/include/dcmtk/ofstd/oflimits.h \
../../config/include/dcmtk/config/arith.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
- ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dctag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \
- ../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdict.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
../../dcmdata/include/dcmtk/dcmdata/dclist.h \
../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcmetinf.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicdir.h \
- ../../ofstd/include/dcmtk/ofstd/ofmap.h \
+ ../include/dcmtk/dcmsr/dsrdoctn.h ../include/dcmtk/dcmsr/dsrtree.h \
+ ../include/dcmtk/dcmsr/dsrtncsr.h ../include/dcmtk/dcmsr/dsrposcn.h \
+ ../include/dcmtk/dcmsr/dsrtnant.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstack.h \
../../ofstd/include/dcmtk/ofstd/ofutil.h \
../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdirrec.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrulup.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixseq.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcofsetl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrae.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvras.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
- ../../ofstd/include/dcmtk/ofstd/ofdate.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrds.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrdt.h \
- ../../ofstd/include/dcmtk/ofstd/ofdatime.h \
- ../../ofstd/include/dcmtk/ofstd/oftime.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrur.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlt.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrst.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvruc.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrut.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrobow.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixel.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpobw.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcovlay.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
- ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
- ../include/dcmtk/dcmsr/dsdefine.h ../include/dcmtk/dcmsr/dsrdoctn.h \
- ../include/dcmtk/dcmsr/dsrtree.h ../include/dcmtk/dcmsr/dsrtncsr.h \
- ../../ofstd/include/dcmtk/ofstd/ofstack.h \
- ../include/dcmtk/dcmsr/dsrposcn.h ../include/dcmtk/dcmsr/dsrtnant.h \
../include/dcmtk/dcmsr/dsrcodvl.h \
../../ofstd/include/dcmtk/ofstd/ofexbl.h \
- ../include/dcmtk/dcmsr/dsrdocst.h ../include/dcmtk/dcmsr/dsrcitem.h \
- ../include/dcmtk/dcmsr/dsrnumvl.h ../include/dcmtk/dcmsr/dsrscovl.h \
- ../include/dcmtk/dcmsr/dsrscogr.h ../include/dcmtk/dcmsr/dsrtlist.h \
- ../include/dcmtk/dcmsr/dsrsc3vl.h ../include/dcmtk/dcmsr/dsrsc3gr.h \
- ../include/dcmtk/dcmsr/dsrtcovl.h ../include/dcmtk/dcmsr/dsrtcodt.h \
- ../include/dcmtk/dcmsr/dsrtcosp.h ../include/dcmtk/dcmsr/dsrtcoto.h \
- ../include/dcmtk/dcmsr/dsrcomvl.h ../include/dcmtk/dcmsr/dsrimgvl.h \
- ../include/dcmtk/dcmsr/dsrimgfr.h ../include/dcmtk/dcmsr/dsrimgse.h \
- ../include/dcmtk/dcmsr/dsrwavvl.h ../include/dcmtk/dcmsr/dsrwavch.h \
- ../../ofstd/include/dcmtk/ofstd/ofmem.h
+ ../include/dcmtk/dcmsr/dsrdncsr.h ../include/dcmtk/dcmsr/dsrdocst.h \
+ ../include/dcmtk/dcmsr/dsrcitem.h ../include/dcmtk/dcmsr/dsrnumvl.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
+ ../include/dcmtk/dcmsr/dsrscovl.h ../include/dcmtk/dcmsr/dsrscogr.h \
+ ../include/dcmtk/dcmsr/dsrtlist.h ../include/dcmtk/dcmsr/dsrsc3vl.h \
+ ../include/dcmtk/dcmsr/dsrsc3gr.h ../include/dcmtk/dcmsr/dsrtcovl.h \
+ ../include/dcmtk/dcmsr/dsrtcodt.h ../include/dcmtk/dcmsr/dsrtcosp.h \
+ ../include/dcmtk/dcmsr/dsrtcoto.h ../include/dcmtk/dcmsr/dsrcomvl.h \
+ ../include/dcmtk/dcmsr/dsrimgvl.h ../include/dcmtk/dcmsr/dsrimgfr.h \
+ ../include/dcmtk/dcmsr/dsrimgse.h ../include/dcmtk/dcmsr/dsrwavvl.h \
+ ../include/dcmtk/dcmsr/dsrwavch.h \
+ ../../ofstd/include/dcmtk/ofstd/ofmem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h
dsrctxgr.o: dsrctxgr.cc ../../config/include/dcmtk/config/osconfig.h \
../include/dcmtk/dcmsr/dsrctxgr.h ../include/dcmtk/dcmsr/dsrcodvl.h \
- ../include/dcmtk/dcmsr/dsrtypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctk.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
- ../../oflog/include/dcmtk/oflog/oflog.h \
- ../../oflog/include/dcmtk/oflog/logger.h \
- ../../oflog/include/dcmtk/oflog/config.h \
+ ../include/dcmtk/dcmsr/dsrtypes.h ../include/dcmtk/dcmsr/dsdefine.h \
../../ofstd/include/dcmtk/ofstd/ofdefine.h \
../../ofstd/include/dcmtk/ofstd/ofcast.h \
../../ofstd/include/dcmtk/ofstd/ofexport.h \
../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
+ ../../ofstd/include/dcmtk/ofstd/ofthread.h \
+ ../../ofstd/include/dcmtk/ofstd/oftypes.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstream.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstring.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcond.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
+ ../../oflog/include/dcmtk/oflog/oflog.h \
+ ../../oflog/include/dcmtk/oflog/logger.h \
+ ../../oflog/include/dcmtk/oflog/config.h \
../../oflog/include/dcmtk/oflog/config/defines.h \
../../oflog/include/dcmtk/oflog/helpers/threadcf.h \
../../oflog/include/dcmtk/oflog/loglevel.h \
../../ofstd/include/dcmtk/ofstd/ofvector.h \
- ../../ofstd/include/dcmtk/ofstd/oftypes.h \
- ../../ofstd/include/dcmtk/ofstd/ofstream.h \
../../oflog/include/dcmtk/oflog/tstring.h \
- ../../ofstd/include/dcmtk/ofstd/ofstring.h \
../../oflog/include/dcmtk/oflog/tchar.h \
../../oflog/include/dcmtk/oflog/spi/apndatch.h \
../../oflog/include/dcmtk/oflog/appender.h \
@@ -1715,104 +967,46 @@ dsrctxgr.o: dsrctxgr.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofcmdln.h \
../../ofstd/include/dcmtk/ofstd/oflist.h \
../../ofstd/include/dcmtk/ofstd/ofconsol.h \
- ../../ofstd/include/dcmtk/ofstd/ofthread.h \
../../ofstd/include/dcmtk/ofstd/offile.h \
../../ofstd/include/dcmtk/ofstd/ofstd.h \
../../ofstd/include/dcmtk/ofstd/oftraits.h \
- ../../ofstd/include/dcmtk/ofstd/ofcond.h \
../../ofstd/include/dcmtk/ofstd/oflimits.h \
../../config/include/dcmtk/config/arith.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
- ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dctag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \
- ../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdict.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
../../dcmdata/include/dcmtk/dcmdata/dclist.h \
../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcmetinf.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicdir.h \
- ../../ofstd/include/dcmtk/ofstd/ofmap.h \
- ../../ofstd/include/dcmtk/ofstd/ofutil.h \
- ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdirrec.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrulup.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixseq.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcofsetl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrae.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvras.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
- ../../ofstd/include/dcmtk/ofstd/ofdate.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrds.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrdt.h \
- ../../ofstd/include/dcmtk/ofstd/ofdatime.h \
- ../../ofstd/include/dcmtk/ofstd/oftime.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrur.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlt.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrst.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvruc.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrut.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrobow.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixel.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpobw.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcovlay.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
- ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
- ../include/dcmtk/dcmsr/dsdefine.h \
../../ofstd/include/dcmtk/ofstd/ofexbl.h
dsrdattn.o: dsrdattn.cc ../../config/include/dcmtk/config/osconfig.h \
- ../include/dcmtk/dcmsr/dsrtypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctk.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
- ../../oflog/include/dcmtk/oflog/oflog.h \
- ../../oflog/include/dcmtk/oflog/logger.h \
- ../../oflog/include/dcmtk/oflog/config.h \
+ ../include/dcmtk/dcmsr/dsrtypes.h ../include/dcmtk/dcmsr/dsdefine.h \
../../ofstd/include/dcmtk/ofstd/ofdefine.h \
../../ofstd/include/dcmtk/ofstd/ofcast.h \
../../ofstd/include/dcmtk/ofstd/ofexport.h \
../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
+ ../../ofstd/include/dcmtk/ofstd/ofthread.h \
+ ../../ofstd/include/dcmtk/ofstd/oftypes.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstream.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstring.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcond.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
+ ../../oflog/include/dcmtk/oflog/oflog.h \
+ ../../oflog/include/dcmtk/oflog/logger.h \
+ ../../oflog/include/dcmtk/oflog/config.h \
../../oflog/include/dcmtk/oflog/config/defines.h \
../../oflog/include/dcmtk/oflog/helpers/threadcf.h \
../../oflog/include/dcmtk/oflog/loglevel.h \
../../ofstd/include/dcmtk/ofstd/ofvector.h \
- ../../ofstd/include/dcmtk/ofstd/oftypes.h \
- ../../ofstd/include/dcmtk/ofstd/ofstream.h \
../../oflog/include/dcmtk/oflog/tstring.h \
- ../../ofstd/include/dcmtk/ofstd/ofstring.h \
../../oflog/include/dcmtk/oflog/tchar.h \
../../oflog/include/dcmtk/oflog/spi/apndatch.h \
../../oflog/include/dcmtk/oflog/appender.h \
@@ -1831,113 +1025,60 @@ dsrdattn.o: dsrdattn.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofcmdln.h \
../../ofstd/include/dcmtk/ofstd/oflist.h \
../../ofstd/include/dcmtk/ofstd/ofconsol.h \
- ../../ofstd/include/dcmtk/ofstd/ofthread.h \
../../ofstd/include/dcmtk/ofstd/offile.h \
../../ofstd/include/dcmtk/ofstd/ofstd.h \
../../ofstd/include/dcmtk/ofstd/oftraits.h \
- ../../ofstd/include/dcmtk/ofstd/ofcond.h \
../../ofstd/include/dcmtk/ofstd/oflimits.h \
../../config/include/dcmtk/config/arith.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
- ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dctag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \
- ../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdict.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
../../dcmdata/include/dcmtk/dcmdata/dclist.h \
../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcmetinf.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicdir.h \
- ../../ofstd/include/dcmtk/ofstd/ofmap.h \
+ ../include/dcmtk/dcmsr/dsrdattn.h ../include/dcmtk/dcmsr/dsrdoctn.h \
+ ../include/dcmtk/dcmsr/dsrtree.h ../include/dcmtk/dcmsr/dsrtncsr.h \
+ ../include/dcmtk/dcmsr/dsrposcn.h ../include/dcmtk/dcmsr/dsrtnant.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstack.h \
../../ofstd/include/dcmtk/ofstd/ofutil.h \
../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdirrec.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrulup.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixseq.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcofsetl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrae.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvras.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
- ../../ofstd/include/dcmtk/ofstd/ofdate.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrds.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrdt.h \
- ../../ofstd/include/dcmtk/ofstd/ofdatime.h \
- ../../ofstd/include/dcmtk/ofstd/oftime.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrur.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlt.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrst.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvruc.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrut.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrobow.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixel.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpobw.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcovlay.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
- ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
- ../include/dcmtk/dcmsr/dsdefine.h ../include/dcmtk/dcmsr/dsrdattn.h \
- ../include/dcmtk/dcmsr/dsrdoctn.h ../include/dcmtk/dcmsr/dsrtree.h \
- ../include/dcmtk/dcmsr/dsrtncsr.h \
- ../../ofstd/include/dcmtk/ofstd/ofstack.h \
- ../include/dcmtk/dcmsr/dsrposcn.h ../include/dcmtk/dcmsr/dsrtnant.h \
../include/dcmtk/dcmsr/dsrcodvl.h \
../../ofstd/include/dcmtk/ofstd/ofexbl.h \
../include/dcmtk/dcmsr/dsrstrvl.h ../include/dcmtk/dcmsr/dsrxmld.h \
- ../include/dcmtk/dcmsr/dsrxmlc.h
-dsrdoc.o: dsrdoc.cc ../../config/include/dcmtk/config/osconfig.h \
- ../include/dcmtk/dcmsr/dsrdoc.h ../include/dcmtk/dcmsr/dsrdoctr.h \
- ../include/dcmtk/dcmsr/dsrdocst.h ../include/dcmtk/dcmsr/dsrtree.h \
- ../include/dcmtk/dcmsr/dsrtypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctk.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
- ../../oflog/include/dcmtk/oflog/oflog.h \
- ../../oflog/include/dcmtk/oflog/logger.h \
- ../../oflog/include/dcmtk/oflog/config.h \
+ ../include/dcmtk/dcmsr/dsrxmlc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
+ ../../ofstd/include/dcmtk/ofstd/ofdate.h
+dsrdncsr.o: dsrdncsr.cc ../../config/include/dcmtk/config/osconfig.h \
+ ../include/dcmtk/dcmsr/dsrdncsr.h ../include/dcmtk/dcmsr/dsdefine.h \
../../ofstd/include/dcmtk/ofstd/ofdefine.h \
../../ofstd/include/dcmtk/ofstd/ofcast.h \
../../ofstd/include/dcmtk/ofstd/ofexport.h \
../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
+ ../include/dcmtk/dcmsr/dsrtncsr.h ../include/dcmtk/dcmsr/dsrtypes.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
+ ../../ofstd/include/dcmtk/ofstd/ofthread.h \
+ ../../ofstd/include/dcmtk/ofstd/oftypes.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstream.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstring.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcond.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
+ ../../oflog/include/dcmtk/oflog/oflog.h \
+ ../../oflog/include/dcmtk/oflog/logger.h \
+ ../../oflog/include/dcmtk/oflog/config.h \
../../oflog/include/dcmtk/oflog/config/defines.h \
../../oflog/include/dcmtk/oflog/helpers/threadcf.h \
../../oflog/include/dcmtk/oflog/loglevel.h \
../../ofstd/include/dcmtk/ofstd/ofvector.h \
- ../../ofstd/include/dcmtk/ofstd/oftypes.h \
- ../../ofstd/include/dcmtk/ofstd/ofstream.h \
../../oflog/include/dcmtk/oflog/tstring.h \
- ../../ofstd/include/dcmtk/ofstd/ofstring.h \
../../oflog/include/dcmtk/oflog/tchar.h \
../../oflog/include/dcmtk/oflog/spi/apndatch.h \
../../oflog/include/dcmtk/oflog/appender.h \
@@ -1956,89 +1097,32 @@ dsrdoc.o: dsrdoc.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofcmdln.h \
../../ofstd/include/dcmtk/ofstd/oflist.h \
../../ofstd/include/dcmtk/ofstd/ofconsol.h \
- ../../ofstd/include/dcmtk/ofstd/ofthread.h \
../../ofstd/include/dcmtk/ofstd/offile.h \
../../ofstd/include/dcmtk/ofstd/ofstd.h \
../../ofstd/include/dcmtk/ofstd/oftraits.h \
- ../../ofstd/include/dcmtk/ofstd/ofcond.h \
../../ofstd/include/dcmtk/ofstd/oflimits.h \
../../config/include/dcmtk/config/arith.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
- ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dctag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \
- ../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdict.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
../../dcmdata/include/dcmtk/dcmdata/dclist.h \
../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcmetinf.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicdir.h \
- ../../ofstd/include/dcmtk/ofstd/ofmap.h \
+ ../include/dcmtk/dcmsr/dsrposcn.h ../include/dcmtk/dcmsr/dsrtnant.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstack.h \
+ ../include/dcmtk/dcmsr/dsrdoctn.h ../include/dcmtk/dcmsr/dsrtree.h \
../../ofstd/include/dcmtk/ofstd/ofutil.h \
../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdirrec.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrulup.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixseq.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcofsetl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrae.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvras.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
- ../../ofstd/include/dcmtk/ofstd/ofdate.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrds.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrdt.h \
- ../../ofstd/include/dcmtk/ofstd/ofdatime.h \
- ../../ofstd/include/dcmtk/ofstd/oftime.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrur.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlt.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrst.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvruc.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrut.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrobow.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixel.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpobw.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcovlay.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
- ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
- ../include/dcmtk/dcmsr/dsdefine.h ../include/dcmtk/dcmsr/dsrtncsr.h \
- ../../ofstd/include/dcmtk/ofstd/ofstack.h \
- ../include/dcmtk/dcmsr/dsrposcn.h ../include/dcmtk/dcmsr/dsrtnant.h \
- ../include/dcmtk/dcmsr/dsrdoctn.h ../include/dcmtk/dcmsr/dsrcodvl.h \
+ ../include/dcmtk/dcmsr/dsrcodvl.h \
../../ofstd/include/dcmtk/ofstd/ofexbl.h \
+ ../include/dcmtk/dcmsr/dsrtpltn.h ../include/dcmtk/dcmsr/dsrstpl.h \
+ ../include/dcmtk/dcmsr/dsrdoctr.h ../include/dcmtk/dcmsr/dsrdocst.h \
../include/dcmtk/dcmsr/dsrcitem.h ../include/dcmtk/dcmsr/dsrnumvl.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
../include/dcmtk/dcmsr/dsrscovl.h ../include/dcmtk/dcmsr/dsrscogr.h \
../include/dcmtk/dcmsr/dsrtlist.h ../include/dcmtk/dcmsr/dsrsc3vl.h \
../include/dcmtk/dcmsr/dsrsc3gr.h ../include/dcmtk/dcmsr/dsrtcovl.h \
@@ -2047,33 +1131,35 @@ dsrdoc.o: dsrdoc.cc ../../config/include/dcmtk/config/osconfig.h \
../include/dcmtk/dcmsr/dsrimgvl.h ../include/dcmtk/dcmsr/dsrimgfr.h \
../include/dcmtk/dcmsr/dsrimgse.h ../include/dcmtk/dcmsr/dsrwavvl.h \
../include/dcmtk/dcmsr/dsrwavch.h \
- ../../ofstd/include/dcmtk/ofstd/ofmem.h ../include/dcmtk/dcmsr/dsrrtpl.h \
- ../include/dcmtk/dcmsr/dsrctpl.h ../include/dcmtk/dcmsr/dsrsoprf.h \
- ../include/dcmtk/dcmsr/dsrrefin.h ../include/dcmtk/dcmsr/dsrcsidl.h \
- ../include/dcmtk/dcmsr/dsrxmld.h ../include/dcmtk/dcmsr/dsrxmlc.h \
- ../include/dcmtk/dcmsr/dsrpnmtn.h ../include/dcmtk/dcmsr/dsrstrvl.h \
- ../include/dcmtk/dcmsr/dsrdattn.h ../include/dcmtk/dcmsr/dsrdtitn.h \
- ../include/dcmtk/dcmsr/dsrtimtn.h
-dsrdocst.o: dsrdocst.cc ../../config/include/dcmtk/config/osconfig.h \
+ ../../ofstd/include/dcmtk/ofstd/ofmem.h ../include/dcmtk/dcmsr/dsrctpl.h
+dsrdoc.o: dsrdoc.cc ../../config/include/dcmtk/config/osconfig.h \
+ ../include/dcmtk/dcmsr/dsrdoc.h ../include/dcmtk/dcmsr/dsrdoctr.h \
../include/dcmtk/dcmsr/dsrdocst.h ../include/dcmtk/dcmsr/dsrtree.h \
- ../include/dcmtk/dcmsr/dsrtypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctk.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
- ../../oflog/include/dcmtk/oflog/oflog.h \
- ../../oflog/include/dcmtk/oflog/logger.h \
- ../../oflog/include/dcmtk/oflog/config.h \
+ ../include/dcmtk/dcmsr/dsrtypes.h ../include/dcmtk/dcmsr/dsdefine.h \
../../ofstd/include/dcmtk/ofstd/ofdefine.h \
../../ofstd/include/dcmtk/ofstd/ofcast.h \
../../ofstd/include/dcmtk/ofstd/ofexport.h \
../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
+ ../../ofstd/include/dcmtk/ofstd/ofthread.h \
+ ../../ofstd/include/dcmtk/ofstd/oftypes.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstream.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstring.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcond.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
+ ../../oflog/include/dcmtk/oflog/oflog.h \
+ ../../oflog/include/dcmtk/oflog/logger.h \
+ ../../oflog/include/dcmtk/oflog/config.h \
../../oflog/include/dcmtk/oflog/config/defines.h \
../../oflog/include/dcmtk/oflog/helpers/threadcf.h \
../../oflog/include/dcmtk/oflog/loglevel.h \
../../ofstd/include/dcmtk/ofstd/ofvector.h \
- ../../ofstd/include/dcmtk/ofstd/oftypes.h \
- ../../ofstd/include/dcmtk/ofstd/ofstream.h \
../../oflog/include/dcmtk/oflog/tstring.h \
- ../../ofstd/include/dcmtk/ofstd/ofstring.h \
../../oflog/include/dcmtk/oflog/tchar.h \
../../oflog/include/dcmtk/oflog/spi/apndatch.h \
../../oflog/include/dcmtk/oflog/appender.h \
@@ -2092,89 +1178,31 @@ dsrdocst.o: dsrdocst.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofcmdln.h \
../../ofstd/include/dcmtk/ofstd/oflist.h \
../../ofstd/include/dcmtk/ofstd/ofconsol.h \
- ../../ofstd/include/dcmtk/ofstd/ofthread.h \
../../ofstd/include/dcmtk/ofstd/offile.h \
../../ofstd/include/dcmtk/ofstd/ofstd.h \
../../ofstd/include/dcmtk/ofstd/oftraits.h \
- ../../ofstd/include/dcmtk/ofstd/ofcond.h \
../../ofstd/include/dcmtk/ofstd/oflimits.h \
../../config/include/dcmtk/config/arith.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
- ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dctag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \
- ../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdict.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
../../dcmdata/include/dcmtk/dcmdata/dclist.h \
../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcmetinf.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicdir.h \
- ../../ofstd/include/dcmtk/ofstd/ofmap.h \
+ ../include/dcmtk/dcmsr/dsrtncsr.h ../include/dcmtk/dcmsr/dsrposcn.h \
+ ../include/dcmtk/dcmsr/dsrtnant.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstack.h \
../../ofstd/include/dcmtk/ofstd/ofutil.h \
../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdirrec.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrulup.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixseq.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcofsetl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrae.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvras.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
- ../../ofstd/include/dcmtk/ofstd/ofdate.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrds.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrdt.h \
- ../../ofstd/include/dcmtk/ofstd/ofdatime.h \
- ../../ofstd/include/dcmtk/ofstd/oftime.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrur.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlt.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrst.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvruc.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrut.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrobow.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixel.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpobw.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcovlay.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
- ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
- ../include/dcmtk/dcmsr/dsdefine.h ../include/dcmtk/dcmsr/dsrtncsr.h \
- ../../ofstd/include/dcmtk/ofstd/ofstack.h \
- ../include/dcmtk/dcmsr/dsrposcn.h ../include/dcmtk/dcmsr/dsrtnant.h \
../include/dcmtk/dcmsr/dsrdoctn.h ../include/dcmtk/dcmsr/dsrcodvl.h \
../../ofstd/include/dcmtk/ofstd/ofexbl.h \
- ../include/dcmtk/dcmsr/dsrcitem.h ../include/dcmtk/dcmsr/dsrnumvl.h \
+ ../include/dcmtk/dcmsr/dsrdncsr.h ../include/dcmtk/dcmsr/dsrcitem.h \
+ ../include/dcmtk/dcmsr/dsrnumvl.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
../include/dcmtk/dcmsr/dsrscovl.h ../include/dcmtk/dcmsr/dsrscogr.h \
../include/dcmtk/dcmsr/dsrtlist.h ../include/dcmtk/dcmsr/dsrsc3vl.h \
../include/dcmtk/dcmsr/dsrsc3gr.h ../include/dcmtk/dcmsr/dsrtcovl.h \
@@ -2183,31 +1211,56 @@ dsrdocst.o: dsrdocst.cc ../../config/include/dcmtk/config/osconfig.h \
../include/dcmtk/dcmsr/dsrimgvl.h ../include/dcmtk/dcmsr/dsrimgfr.h \
../include/dcmtk/dcmsr/dsrimgse.h ../include/dcmtk/dcmsr/dsrwavvl.h \
../include/dcmtk/dcmsr/dsrwavch.h \
- ../../ofstd/include/dcmtk/ofstd/ofmem.h \
- ../include/dcmtk/dcmsr/dsrcontn.h ../include/dcmtk/dcmsr/dsrreftn.h \
- ../include/dcmtk/dcmsr/dsrtpltn.h ../include/dcmtk/dcmsr/dsrstpl.h \
- ../include/dcmtk/dcmsr/dsrdoctr.h ../include/dcmtk/dcmsr/dsrctpl.h \
- ../include/dcmtk/dcmsr/dsriodcc.h
-dsrdoctn.o: dsrdoctn.cc ../../config/include/dcmtk/config/osconfig.h \
- ../include/dcmtk/dcmsr/dsrdoctn.h ../include/dcmtk/dcmsr/dsrtree.h \
- ../include/dcmtk/dcmsr/dsrtypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctk.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
- ../../oflog/include/dcmtk/oflog/oflog.h \
- ../../oflog/include/dcmtk/oflog/logger.h \
- ../../oflog/include/dcmtk/oflog/config.h \
+ ../../ofstd/include/dcmtk/ofstd/ofmem.h ../include/dcmtk/dcmsr/dsrrtpl.h \
+ ../include/dcmtk/dcmsr/dsrctpl.h ../include/dcmtk/dcmsr/dsrsoprf.h \
+ ../include/dcmtk/dcmsr/dsrrefin.h ../include/dcmtk/dcmsr/dsrcsidl.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
+ ../../ofstd/include/dcmtk/ofstd/ofdate.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
+ ../../ofstd/include/dcmtk/ofstd/oftime.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
+ ../include/dcmtk/dcmsr/dsrxmld.h ../include/dcmtk/dcmsr/dsrxmlc.h \
+ ../include/dcmtk/dcmsr/dsrpnmtn.h ../include/dcmtk/dcmsr/dsrstrvl.h \
+ ../include/dcmtk/dcmsr/dsrdattn.h ../include/dcmtk/dcmsr/dsrdtitn.h \
+ ../include/dcmtk/dcmsr/dsrtimtn.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrdt.h \
+ ../../ofstd/include/dcmtk/ofstd/ofdatime.h
+dsrdocst.o: dsrdocst.cc ../../config/include/dcmtk/config/osconfig.h \
+ ../include/dcmtk/dcmsr/dsrdocst.h ../include/dcmtk/dcmsr/dsrtree.h \
+ ../include/dcmtk/dcmsr/dsrtypes.h ../include/dcmtk/dcmsr/dsdefine.h \
../../ofstd/include/dcmtk/ofstd/ofdefine.h \
../../ofstd/include/dcmtk/ofstd/ofcast.h \
../../ofstd/include/dcmtk/ofstd/ofexport.h \
../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
+ ../../ofstd/include/dcmtk/ofstd/ofthread.h \
+ ../../ofstd/include/dcmtk/ofstd/oftypes.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstream.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstring.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcond.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
+ ../../oflog/include/dcmtk/oflog/oflog.h \
+ ../../oflog/include/dcmtk/oflog/logger.h \
+ ../../oflog/include/dcmtk/oflog/config.h \
../../oflog/include/dcmtk/oflog/config/defines.h \
../../oflog/include/dcmtk/oflog/helpers/threadcf.h \
../../oflog/include/dcmtk/oflog/loglevel.h \
../../ofstd/include/dcmtk/ofstd/ofvector.h \
- ../../ofstd/include/dcmtk/ofstd/oftypes.h \
- ../../ofstd/include/dcmtk/ofstd/ofstream.h \
../../oflog/include/dcmtk/oflog/tstring.h \
- ../../ofstd/include/dcmtk/ofstd/ofstring.h \
../../oflog/include/dcmtk/oflog/tchar.h \
../../oflog/include/dcmtk/oflog/spi/apndatch.h \
../../oflog/include/dcmtk/oflog/appender.h \
@@ -2226,111 +1279,71 @@ dsrdoctn.o: dsrdoctn.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofcmdln.h \
../../ofstd/include/dcmtk/ofstd/oflist.h \
../../ofstd/include/dcmtk/ofstd/ofconsol.h \
- ../../ofstd/include/dcmtk/ofstd/ofthread.h \
../../ofstd/include/dcmtk/ofstd/offile.h \
../../ofstd/include/dcmtk/ofstd/ofstd.h \
../../ofstd/include/dcmtk/ofstd/oftraits.h \
- ../../ofstd/include/dcmtk/ofstd/ofcond.h \
../../ofstd/include/dcmtk/ofstd/oflimits.h \
../../config/include/dcmtk/config/arith.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
- ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dctag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \
- ../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdict.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
../../dcmdata/include/dcmtk/dcmdata/dclist.h \
../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcmetinf.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicdir.h \
- ../../ofstd/include/dcmtk/ofstd/ofmap.h \
+ ../include/dcmtk/dcmsr/dsrtncsr.h ../include/dcmtk/dcmsr/dsrposcn.h \
+ ../include/dcmtk/dcmsr/dsrtnant.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstack.h \
../../ofstd/include/dcmtk/ofstd/ofutil.h \
../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdirrec.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrulup.h \
+ ../include/dcmtk/dcmsr/dsrdoctn.h ../include/dcmtk/dcmsr/dsrcodvl.h \
+ ../../ofstd/include/dcmtk/ofstd/ofexbl.h \
+ ../include/dcmtk/dcmsr/dsrdncsr.h ../include/dcmtk/dcmsr/dsrcitem.h \
+ ../include/dcmtk/dcmsr/dsrnumvl.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixseq.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcofsetl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrae.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvras.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
- ../../ofstd/include/dcmtk/ofstd/ofdate.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrds.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrdt.h \
- ../../ofstd/include/dcmtk/ofstd/ofdatime.h \
- ../../ofstd/include/dcmtk/ofstd/oftime.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrur.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlt.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrst.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvruc.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrut.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrobow.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixel.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpobw.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcovlay.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
- ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
- ../include/dcmtk/dcmsr/dsdefine.h ../include/dcmtk/dcmsr/dsrtncsr.h \
- ../../ofstd/include/dcmtk/ofstd/ofstack.h \
- ../include/dcmtk/dcmsr/dsrposcn.h ../include/dcmtk/dcmsr/dsrtnant.h \
- ../include/dcmtk/dcmsr/dsrcodvl.h \
- ../../ofstd/include/dcmtk/ofstd/ofexbl.h \
- ../include/dcmtk/dcmsr/dsrdtitn.h ../include/dcmtk/dcmsr/dsrstrvl.h \
- ../include/dcmtk/dcmsr/dsrxmld.h ../include/dcmtk/dcmsr/dsrxmlc.h \
+ ../include/dcmtk/dcmsr/dsrscovl.h ../include/dcmtk/dcmsr/dsrscogr.h \
+ ../include/dcmtk/dcmsr/dsrtlist.h ../include/dcmtk/dcmsr/dsrsc3vl.h \
+ ../include/dcmtk/dcmsr/dsrsc3gr.h ../include/dcmtk/dcmsr/dsrtcovl.h \
+ ../include/dcmtk/dcmsr/dsrtcodt.h ../include/dcmtk/dcmsr/dsrtcosp.h \
+ ../include/dcmtk/dcmsr/dsrtcoto.h ../include/dcmtk/dcmsr/dsrcomvl.h \
+ ../include/dcmtk/dcmsr/dsrimgvl.h ../include/dcmtk/dcmsr/dsrimgfr.h \
+ ../include/dcmtk/dcmsr/dsrimgse.h ../include/dcmtk/dcmsr/dsrwavvl.h \
+ ../include/dcmtk/dcmsr/dsrwavch.h \
+ ../../ofstd/include/dcmtk/ofstd/ofmem.h \
+ ../include/dcmtk/dcmsr/dsrcontn.h ../include/dcmtk/dcmsr/dsrreftn.h \
+ ../include/dcmtk/dcmsr/dsrtpltn.h ../include/dcmtk/dcmsr/dsrstpl.h \
+ ../include/dcmtk/dcmsr/dsrdoctr.h ../include/dcmtk/dcmsr/dsrctpl.h \
../include/dcmtk/dcmsr/dsriodcc.h
-dsrdoctr.o: dsrdoctr.cc ../../config/include/dcmtk/config/osconfig.h \
- ../include/dcmtk/dcmsr/dsrdoctr.h ../include/dcmtk/dcmsr/dsrdocst.h \
- ../include/dcmtk/dcmsr/dsrtree.h ../include/dcmtk/dcmsr/dsrtypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctk.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
- ../../oflog/include/dcmtk/oflog/oflog.h \
- ../../oflog/include/dcmtk/oflog/logger.h \
- ../../oflog/include/dcmtk/oflog/config.h \
+dsrdoctn.o: dsrdoctn.cc ../../config/include/dcmtk/config/osconfig.h \
+ ../include/dcmtk/dcmsr/dsrdoctn.h ../include/dcmtk/dcmsr/dsrtree.h \
+ ../include/dcmtk/dcmsr/dsrtypes.h ../include/dcmtk/dcmsr/dsdefine.h \
../../ofstd/include/dcmtk/ofstd/ofdefine.h \
../../ofstd/include/dcmtk/ofstd/ofcast.h \
../../ofstd/include/dcmtk/ofstd/ofexport.h \
../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
+ ../../ofstd/include/dcmtk/ofstd/ofthread.h \
+ ../../ofstd/include/dcmtk/ofstd/oftypes.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstream.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstring.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcond.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
+ ../../oflog/include/dcmtk/oflog/oflog.h \
+ ../../oflog/include/dcmtk/oflog/logger.h \
+ ../../oflog/include/dcmtk/oflog/config.h \
../../oflog/include/dcmtk/oflog/config/defines.h \
../../oflog/include/dcmtk/oflog/helpers/threadcf.h \
../../oflog/include/dcmtk/oflog/loglevel.h \
../../ofstd/include/dcmtk/ofstd/ofvector.h \
- ../../ofstd/include/dcmtk/ofstd/oftypes.h \
- ../../ofstd/include/dcmtk/ofstd/ofstream.h \
../../oflog/include/dcmtk/oflog/tstring.h \
- ../../ofstd/include/dcmtk/ofstd/ofstring.h \
../../oflog/include/dcmtk/oflog/tchar.h \
../../oflog/include/dcmtk/oflog/spi/apndatch.h \
../../oflog/include/dcmtk/oflog/appender.h \
@@ -2349,89 +1362,110 @@ dsrdoctr.o: dsrdoctr.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofcmdln.h \
../../ofstd/include/dcmtk/ofstd/oflist.h \
../../ofstd/include/dcmtk/ofstd/ofconsol.h \
- ../../ofstd/include/dcmtk/ofstd/ofthread.h \
../../ofstd/include/dcmtk/ofstd/offile.h \
../../ofstd/include/dcmtk/ofstd/ofstd.h \
../../ofstd/include/dcmtk/ofstd/oftraits.h \
- ../../ofstd/include/dcmtk/ofstd/ofcond.h \
../../ofstd/include/dcmtk/ofstd/oflimits.h \
../../config/include/dcmtk/config/arith.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
- ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dctag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \
- ../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdict.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
../../dcmdata/include/dcmtk/dcmdata/dclist.h \
../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcmetinf.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicdir.h \
- ../../ofstd/include/dcmtk/ofstd/ofmap.h \
+ ../include/dcmtk/dcmsr/dsrtncsr.h ../include/dcmtk/dcmsr/dsrposcn.h \
+ ../include/dcmtk/dcmsr/dsrtnant.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstack.h \
../../ofstd/include/dcmtk/ofstd/ofutil.h \
../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdirrec.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrulup.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixseq.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcofsetl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrae.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvras.h \
+ ../include/dcmtk/dcmsr/dsrcodvl.h \
+ ../../ofstd/include/dcmtk/ofstd/ofexbl.h \
+ ../include/dcmtk/dcmsr/dsrdncsr.h ../include/dcmtk/dcmsr/dsrdtitn.h \
+ ../include/dcmtk/dcmsr/dsrstrvl.h ../include/dcmtk/dcmsr/dsrxmld.h \
+ ../include/dcmtk/dcmsr/dsrxmlc.h ../include/dcmtk/dcmsr/dsriodcc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
- ../../ofstd/include/dcmtk/ofstd/ofdate.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrds.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrdt.h \
../../ofstd/include/dcmtk/ofstd/ofdatime.h \
+ ../../ofstd/include/dcmtk/ofstd/ofdate.h \
../../ofstd/include/dcmtk/ofstd/oftime.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrur.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlt.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrst.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvruc.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrut.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrobow.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixel.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpobw.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcovlay.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
- ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
- ../include/dcmtk/dcmsr/dsdefine.h ../include/dcmtk/dcmsr/dsrtncsr.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h
+dsrdoctr.o: dsrdoctr.cc ../../config/include/dcmtk/config/osconfig.h \
+ ../include/dcmtk/dcmsr/dsrdoctr.h ../include/dcmtk/dcmsr/dsrdocst.h \
+ ../include/dcmtk/dcmsr/dsrtree.h ../include/dcmtk/dcmsr/dsrtypes.h \
+ ../include/dcmtk/dcmsr/dsdefine.h \
+ ../../ofstd/include/dcmtk/ofstd/ofdefine.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcast.h \
+ ../../ofstd/include/dcmtk/ofstd/ofexport.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
+ ../../ofstd/include/dcmtk/ofstd/ofthread.h \
+ ../../ofstd/include/dcmtk/ofstd/oftypes.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstream.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstring.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcond.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
+ ../../oflog/include/dcmtk/oflog/oflog.h \
+ ../../oflog/include/dcmtk/oflog/logger.h \
+ ../../oflog/include/dcmtk/oflog/config.h \
+ ../../oflog/include/dcmtk/oflog/config/defines.h \
+ ../../oflog/include/dcmtk/oflog/helpers/threadcf.h \
+ ../../oflog/include/dcmtk/oflog/loglevel.h \
+ ../../ofstd/include/dcmtk/ofstd/ofvector.h \
+ ../../oflog/include/dcmtk/oflog/tstring.h \
+ ../../oflog/include/dcmtk/oflog/tchar.h \
+ ../../oflog/include/dcmtk/oflog/spi/apndatch.h \
+ ../../oflog/include/dcmtk/oflog/appender.h \
+ ../../ofstd/include/dcmtk/ofstd/ofaptr.h \
+ ../../oflog/include/dcmtk/oflog/layout.h \
+ ../../oflog/include/dcmtk/oflog/streams.h \
+ ../../oflog/include/dcmtk/oflog/helpers/pointer.h \
+ ../../oflog/include/dcmtk/oflog/thread/syncprim.h \
+ ../../oflog/include/dcmtk/oflog/spi/filter.h \
+ ../../oflog/include/dcmtk/oflog/helpers/lockfile.h \
+ ../../oflog/include/dcmtk/oflog/spi/logfact.h \
+ ../../oflog/include/dcmtk/oflog/logmacro.h \
+ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \
+ ../../oflog/include/dcmtk/oflog/tracelog.h \
+ ../../ofstd/include/dcmtk/ofstd/ofconapp.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \
+ ../../ofstd/include/dcmtk/ofstd/oflist.h \
+ ../../ofstd/include/dcmtk/ofstd/ofconsol.h \
+ ../../ofstd/include/dcmtk/ofstd/offile.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstd.h \
+ ../../ofstd/include/dcmtk/ofstd/oftraits.h \
+ ../../ofstd/include/dcmtk/ofstd/oflimits.h \
+ ../../config/include/dcmtk/config/arith.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
+ ../include/dcmtk/dcmsr/dsrtncsr.h ../include/dcmtk/dcmsr/dsrposcn.h \
+ ../include/dcmtk/dcmsr/dsrtnant.h \
../../ofstd/include/dcmtk/ofstd/ofstack.h \
- ../include/dcmtk/dcmsr/dsrposcn.h ../include/dcmtk/dcmsr/dsrtnant.h \
+ ../../ofstd/include/dcmtk/ofstd/ofutil.h \
+ ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
../include/dcmtk/dcmsr/dsrdoctn.h ../include/dcmtk/dcmsr/dsrcodvl.h \
../../ofstd/include/dcmtk/ofstd/ofexbl.h \
- ../include/dcmtk/dcmsr/dsrcitem.h ../include/dcmtk/dcmsr/dsrnumvl.h \
+ ../include/dcmtk/dcmsr/dsrdncsr.h ../include/dcmtk/dcmsr/dsrcitem.h \
+ ../include/dcmtk/dcmsr/dsrnumvl.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
../include/dcmtk/dcmsr/dsrscovl.h ../include/dcmtk/dcmsr/dsrscogr.h \
../include/dcmtk/dcmsr/dsrtlist.h ../include/dcmtk/dcmsr/dsrsc3vl.h \
../include/dcmtk/dcmsr/dsrsc3gr.h ../include/dcmtk/dcmsr/dsrtcovl.h \
@@ -2443,26 +1477,35 @@ dsrdoctr.o: dsrdoctr.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofmem.h \
../include/dcmtk/dcmsr/dsrcontn.h ../include/dcmtk/dcmsr/dsrreftn.h \
../include/dcmtk/dcmsr/dsrxmld.h ../include/dcmtk/dcmsr/dsrxmlc.h \
- ../include/dcmtk/dcmsr/dsriodcc.h
+ ../include/dcmtk/dcmsr/dsriodcc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h
dsrdtitn.o: dsrdtitn.cc ../../config/include/dcmtk/config/osconfig.h \
- ../include/dcmtk/dcmsr/dsrtypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctk.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
- ../../oflog/include/dcmtk/oflog/oflog.h \
- ../../oflog/include/dcmtk/oflog/logger.h \
- ../../oflog/include/dcmtk/oflog/config.h \
+ ../include/dcmtk/dcmsr/dsrtypes.h ../include/dcmtk/dcmsr/dsdefine.h \
../../ofstd/include/dcmtk/ofstd/ofdefine.h \
../../ofstd/include/dcmtk/ofstd/ofcast.h \
../../ofstd/include/dcmtk/ofstd/ofexport.h \
../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
+ ../../ofstd/include/dcmtk/ofstd/ofthread.h \
+ ../../ofstd/include/dcmtk/ofstd/oftypes.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstream.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstring.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcond.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
+ ../../oflog/include/dcmtk/oflog/oflog.h \
+ ../../oflog/include/dcmtk/oflog/logger.h \
+ ../../oflog/include/dcmtk/oflog/config.h \
../../oflog/include/dcmtk/oflog/config/defines.h \
../../oflog/include/dcmtk/oflog/helpers/threadcf.h \
../../oflog/include/dcmtk/oflog/loglevel.h \
../../ofstd/include/dcmtk/ofstd/ofvector.h \
- ../../ofstd/include/dcmtk/ofstd/oftypes.h \
- ../../ofstd/include/dcmtk/ofstd/ofstream.h \
../../oflog/include/dcmtk/oflog/tstring.h \
- ../../ofstd/include/dcmtk/ofstd/ofstring.h \
../../oflog/include/dcmtk/oflog/tchar.h \
../../oflog/include/dcmtk/oflog/spi/apndatch.h \
../../oflog/include/dcmtk/oflog/appender.h \
@@ -2481,112 +1524,62 @@ dsrdtitn.o: dsrdtitn.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofcmdln.h \
../../ofstd/include/dcmtk/ofstd/oflist.h \
../../ofstd/include/dcmtk/ofstd/ofconsol.h \
- ../../ofstd/include/dcmtk/ofstd/ofthread.h \
../../ofstd/include/dcmtk/ofstd/offile.h \
../../ofstd/include/dcmtk/ofstd/ofstd.h \
../../ofstd/include/dcmtk/ofstd/oftraits.h \
- ../../ofstd/include/dcmtk/ofstd/ofcond.h \
../../ofstd/include/dcmtk/ofstd/oflimits.h \
../../config/include/dcmtk/config/arith.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
- ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dctag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \
- ../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdict.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
../../dcmdata/include/dcmtk/dcmdata/dclist.h \
../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcmetinf.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicdir.h \
- ../../ofstd/include/dcmtk/ofstd/ofmap.h \
+ ../include/dcmtk/dcmsr/dsrdtitn.h ../include/dcmtk/dcmsr/dsrdoctn.h \
+ ../include/dcmtk/dcmsr/dsrtree.h ../include/dcmtk/dcmsr/dsrtncsr.h \
+ ../include/dcmtk/dcmsr/dsrposcn.h ../include/dcmtk/dcmsr/dsrtnant.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstack.h \
../../ofstd/include/dcmtk/ofstd/ofutil.h \
../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdirrec.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrulup.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixseq.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcofsetl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrae.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvras.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
- ../../ofstd/include/dcmtk/ofstd/ofdate.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrds.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrdt.h \
- ../../ofstd/include/dcmtk/ofstd/ofdatime.h \
- ../../ofstd/include/dcmtk/ofstd/oftime.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrur.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlt.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrst.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvruc.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrut.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrobow.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixel.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpobw.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcovlay.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
- ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
- ../include/dcmtk/dcmsr/dsdefine.h ../include/dcmtk/dcmsr/dsrdtitn.h \
- ../include/dcmtk/dcmsr/dsrdoctn.h ../include/dcmtk/dcmsr/dsrtree.h \
- ../include/dcmtk/dcmsr/dsrtncsr.h \
- ../../ofstd/include/dcmtk/ofstd/ofstack.h \
- ../include/dcmtk/dcmsr/dsrposcn.h ../include/dcmtk/dcmsr/dsrtnant.h \
../include/dcmtk/dcmsr/dsrcodvl.h \
../../ofstd/include/dcmtk/ofstd/ofexbl.h \
../include/dcmtk/dcmsr/dsrstrvl.h ../include/dcmtk/dcmsr/dsrxmld.h \
- ../include/dcmtk/dcmsr/dsrxmlc.h
+ ../include/dcmtk/dcmsr/dsrxmlc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrdt.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
+ ../../ofstd/include/dcmtk/ofstd/ofdatime.h \
+ ../../ofstd/include/dcmtk/ofstd/ofdate.h \
+ ../../ofstd/include/dcmtk/ofstd/oftime.h
dsrenhcc.o: dsrenhcc.cc ../../config/include/dcmtk/config/osconfig.h \
../include/dcmtk/dcmsr/dsrenhcc.h ../include/dcmtk/dcmsr/dsriodcc.h \
- ../include/dcmtk/dcmsr/dsrtypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctk.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
- ../../oflog/include/dcmtk/oflog/oflog.h \
- ../../oflog/include/dcmtk/oflog/logger.h \
- ../../oflog/include/dcmtk/oflog/config.h \
+ ../include/dcmtk/dcmsr/dsrtypes.h ../include/dcmtk/dcmsr/dsdefine.h \
../../ofstd/include/dcmtk/ofstd/ofdefine.h \
../../ofstd/include/dcmtk/ofstd/ofcast.h \
../../ofstd/include/dcmtk/ofstd/ofexport.h \
../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
+ ../../ofstd/include/dcmtk/ofstd/ofthread.h \
+ ../../ofstd/include/dcmtk/ofstd/oftypes.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstream.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstring.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcond.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
+ ../../oflog/include/dcmtk/oflog/oflog.h \
+ ../../oflog/include/dcmtk/oflog/logger.h \
+ ../../oflog/include/dcmtk/oflog/config.h \
../../oflog/include/dcmtk/oflog/config/defines.h \
../../oflog/include/dcmtk/oflog/helpers/threadcf.h \
../../oflog/include/dcmtk/oflog/loglevel.h \
../../ofstd/include/dcmtk/ofstd/ofvector.h \
- ../../ofstd/include/dcmtk/ofstd/oftypes.h \
- ../../ofstd/include/dcmtk/ofstd/ofstream.h \
../../oflog/include/dcmtk/oflog/tstring.h \
- ../../ofstd/include/dcmtk/ofstd/ofstring.h \
../../oflog/include/dcmtk/oflog/tchar.h \
../../oflog/include/dcmtk/oflog/spi/apndatch.h \
../../oflog/include/dcmtk/oflog/appender.h \
@@ -2605,103 +1598,46 @@ dsrenhcc.o: dsrenhcc.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofcmdln.h \
../../ofstd/include/dcmtk/ofstd/oflist.h \
../../ofstd/include/dcmtk/ofstd/ofconsol.h \
- ../../ofstd/include/dcmtk/ofstd/ofthread.h \
../../ofstd/include/dcmtk/ofstd/offile.h \
../../ofstd/include/dcmtk/ofstd/ofstd.h \
../../ofstd/include/dcmtk/ofstd/oftraits.h \
- ../../ofstd/include/dcmtk/ofstd/ofcond.h \
../../ofstd/include/dcmtk/ofstd/oflimits.h \
../../config/include/dcmtk/config/arith.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
- ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dctag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \
- ../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdict.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
../../dcmdata/include/dcmtk/dcmdata/dclist.h \
../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcmetinf.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicdir.h \
- ../../ofstd/include/dcmtk/ofstd/ofmap.h \
- ../../ofstd/include/dcmtk/ofstd/ofutil.h \
- ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdirrec.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrulup.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixseq.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcofsetl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrae.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvras.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
- ../../ofstd/include/dcmtk/ofstd/ofdate.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrds.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrdt.h \
- ../../ofstd/include/dcmtk/ofstd/ofdatime.h \
- ../../ofstd/include/dcmtk/ofstd/oftime.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrur.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlt.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrst.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvruc.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrut.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrobow.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixel.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpobw.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcovlay.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
- ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
- ../include/dcmtk/dcmsr/dsdefine.h
+ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h
dsrimgfr.o: dsrimgfr.cc ../../config/include/dcmtk/config/osconfig.h \
../include/dcmtk/dcmsr/dsrimgfr.h ../include/dcmtk/dcmsr/dsrtypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctk.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
- ../../oflog/include/dcmtk/oflog/oflog.h \
- ../../oflog/include/dcmtk/oflog/logger.h \
- ../../oflog/include/dcmtk/oflog/config.h \
+ ../include/dcmtk/dcmsr/dsdefine.h \
../../ofstd/include/dcmtk/ofstd/ofdefine.h \
../../ofstd/include/dcmtk/ofstd/ofcast.h \
../../ofstd/include/dcmtk/ofstd/ofexport.h \
../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
+ ../../ofstd/include/dcmtk/ofstd/ofthread.h \
+ ../../ofstd/include/dcmtk/ofstd/oftypes.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstream.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstring.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcond.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
+ ../../oflog/include/dcmtk/oflog/oflog.h \
+ ../../oflog/include/dcmtk/oflog/logger.h \
+ ../../oflog/include/dcmtk/oflog/config.h \
../../oflog/include/dcmtk/oflog/config/defines.h \
../../oflog/include/dcmtk/oflog/helpers/threadcf.h \
../../oflog/include/dcmtk/oflog/loglevel.h \
../../ofstd/include/dcmtk/ofstd/ofvector.h \
- ../../ofstd/include/dcmtk/ofstd/oftypes.h \
- ../../ofstd/include/dcmtk/ofstd/ofstream.h \
../../oflog/include/dcmtk/oflog/tstring.h \
- ../../ofstd/include/dcmtk/ofstd/ofstring.h \
../../oflog/include/dcmtk/oflog/tchar.h \
../../oflog/include/dcmtk/oflog/spi/apndatch.h \
../../oflog/include/dcmtk/oflog/appender.h \
@@ -2720,103 +1656,50 @@ dsrimgfr.o: dsrimgfr.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofcmdln.h \
../../ofstd/include/dcmtk/ofstd/oflist.h \
../../ofstd/include/dcmtk/ofstd/ofconsol.h \
- ../../ofstd/include/dcmtk/ofstd/ofthread.h \
../../ofstd/include/dcmtk/ofstd/offile.h \
../../ofstd/include/dcmtk/ofstd/ofstd.h \
../../ofstd/include/dcmtk/ofstd/oftraits.h \
- ../../ofstd/include/dcmtk/ofstd/ofcond.h \
../../ofstd/include/dcmtk/ofstd/oflimits.h \
../../config/include/dcmtk/config/arith.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
- ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dctag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \
- ../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdict.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
../../dcmdata/include/dcmtk/dcmdata/dclist.h \
../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcmetinf.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicdir.h \
- ../../ofstd/include/dcmtk/ofstd/ofmap.h \
- ../../ofstd/include/dcmtk/ofstd/ofutil.h \
- ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdirrec.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrulup.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixseq.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcofsetl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrae.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvras.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
- ../../ofstd/include/dcmtk/ofstd/ofdate.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrds.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrdt.h \
- ../../ofstd/include/dcmtk/ofstd/ofdatime.h \
- ../../ofstd/include/dcmtk/ofstd/oftime.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrur.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlt.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrst.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvruc.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrut.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrobow.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixel.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpobw.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcovlay.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
- ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
- ../include/dcmtk/dcmsr/dsdefine.h ../include/dcmtk/dcmsr/dsrtlist.h
-dsrimgse.o: dsrimgse.cc ../../config/include/dcmtk/config/osconfig.h \
- ../include/dcmtk/dcmsr/dsrimgse.h ../include/dcmtk/dcmsr/dsrtypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctk.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
- ../../oflog/include/dcmtk/oflog/oflog.h \
- ../../oflog/include/dcmtk/oflog/logger.h \
- ../../oflog/include/dcmtk/oflog/config.h \
+ ../include/dcmtk/dcmsr/dsrtlist.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h
+dsrimgse.o: dsrimgse.cc ../../config/include/dcmtk/config/osconfig.h \
+ ../include/dcmtk/dcmsr/dsrimgse.h ../include/dcmtk/dcmsr/dsrtypes.h \
+ ../include/dcmtk/dcmsr/dsdefine.h \
../../ofstd/include/dcmtk/ofstd/ofdefine.h \
../../ofstd/include/dcmtk/ofstd/ofcast.h \
../../ofstd/include/dcmtk/ofstd/ofexport.h \
../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
+ ../../ofstd/include/dcmtk/ofstd/ofthread.h \
+ ../../ofstd/include/dcmtk/ofstd/oftypes.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstream.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstring.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcond.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
+ ../../oflog/include/dcmtk/oflog/oflog.h \
+ ../../oflog/include/dcmtk/oflog/logger.h \
+ ../../oflog/include/dcmtk/oflog/config.h \
../../oflog/include/dcmtk/oflog/config/defines.h \
../../oflog/include/dcmtk/oflog/helpers/threadcf.h \
../../oflog/include/dcmtk/oflog/loglevel.h \
../../ofstd/include/dcmtk/ofstd/ofvector.h \
- ../../ofstd/include/dcmtk/ofstd/oftypes.h \
- ../../ofstd/include/dcmtk/ofstd/ofstream.h \
../../oflog/include/dcmtk/oflog/tstring.h \
- ../../ofstd/include/dcmtk/ofstd/ofstring.h \
../../oflog/include/dcmtk/oflog/tchar.h \
../../oflog/include/dcmtk/oflog/spi/apndatch.h \
../../oflog/include/dcmtk/oflog/appender.h \
@@ -2835,103 +1718,48 @@ dsrimgse.o: dsrimgse.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofcmdln.h \
../../ofstd/include/dcmtk/ofstd/oflist.h \
../../ofstd/include/dcmtk/ofstd/ofconsol.h \
- ../../ofstd/include/dcmtk/ofstd/ofthread.h \
../../ofstd/include/dcmtk/ofstd/offile.h \
../../ofstd/include/dcmtk/ofstd/ofstd.h \
../../ofstd/include/dcmtk/ofstd/oftraits.h \
- ../../ofstd/include/dcmtk/ofstd/ofcond.h \
../../ofstd/include/dcmtk/ofstd/oflimits.h \
../../config/include/dcmtk/config/arith.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
- ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dctag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \
- ../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdict.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
../../dcmdata/include/dcmtk/dcmdata/dclist.h \
../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcmetinf.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicdir.h \
- ../../ofstd/include/dcmtk/ofstd/ofmap.h \
- ../../ofstd/include/dcmtk/ofstd/ofutil.h \
- ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdirrec.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrulup.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixseq.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcofsetl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrae.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvras.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
- ../../ofstd/include/dcmtk/ofstd/ofdate.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrds.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrdt.h \
- ../../ofstd/include/dcmtk/ofstd/ofdatime.h \
- ../../ofstd/include/dcmtk/ofstd/oftime.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrur.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlt.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrst.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvruc.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrut.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrobow.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixel.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpobw.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcovlay.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
- ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
- ../include/dcmtk/dcmsr/dsdefine.h ../include/dcmtk/dcmsr/dsrtlist.h
+ ../include/dcmtk/dcmsr/dsrtlist.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h
dsrimgtn.o: dsrimgtn.cc ../../config/include/dcmtk/config/osconfig.h \
- ../include/dcmtk/dcmsr/dsrtypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctk.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
- ../../oflog/include/dcmtk/oflog/oflog.h \
- ../../oflog/include/dcmtk/oflog/logger.h \
- ../../oflog/include/dcmtk/oflog/config.h \
+ ../include/dcmtk/dcmsr/dsrtypes.h ../include/dcmtk/dcmsr/dsdefine.h \
../../ofstd/include/dcmtk/ofstd/ofdefine.h \
../../ofstd/include/dcmtk/ofstd/ofcast.h \
../../ofstd/include/dcmtk/ofstd/ofexport.h \
../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
+ ../../ofstd/include/dcmtk/ofstd/ofthread.h \
+ ../../ofstd/include/dcmtk/ofstd/oftypes.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstream.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstring.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcond.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
+ ../../oflog/include/dcmtk/oflog/oflog.h \
+ ../../oflog/include/dcmtk/oflog/logger.h \
+ ../../oflog/include/dcmtk/oflog/config.h \
../../oflog/include/dcmtk/oflog/config/defines.h \
../../oflog/include/dcmtk/oflog/helpers/threadcf.h \
../../oflog/include/dcmtk/oflog/loglevel.h \
../../ofstd/include/dcmtk/ofstd/ofvector.h \
- ../../ofstd/include/dcmtk/ofstd/oftypes.h \
- ../../ofstd/include/dcmtk/ofstd/ofstream.h \
../../oflog/include/dcmtk/oflog/tstring.h \
- ../../ofstd/include/dcmtk/ofstd/ofstring.h \
../../oflog/include/dcmtk/oflog/tchar.h \
../../oflog/include/dcmtk/oflog/spi/apndatch.h \
../../oflog/include/dcmtk/oflog/appender.h \
@@ -2950,113 +1778,59 @@ dsrimgtn.o: dsrimgtn.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofcmdln.h \
../../ofstd/include/dcmtk/ofstd/oflist.h \
../../ofstd/include/dcmtk/ofstd/ofconsol.h \
- ../../ofstd/include/dcmtk/ofstd/ofthread.h \
../../ofstd/include/dcmtk/ofstd/offile.h \
../../ofstd/include/dcmtk/ofstd/ofstd.h \
../../ofstd/include/dcmtk/ofstd/oftraits.h \
- ../../ofstd/include/dcmtk/ofstd/ofcond.h \
../../ofstd/include/dcmtk/ofstd/oflimits.h \
../../config/include/dcmtk/config/arith.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
- ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dctag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \
- ../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdict.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
../../dcmdata/include/dcmtk/dcmdata/dclist.h \
../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcmetinf.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicdir.h \
- ../../ofstd/include/dcmtk/ofstd/ofmap.h \
+ ../include/dcmtk/dcmsr/dsrimgtn.h ../include/dcmtk/dcmsr/dsrdoctn.h \
+ ../include/dcmtk/dcmsr/dsrtree.h ../include/dcmtk/dcmsr/dsrtncsr.h \
+ ../include/dcmtk/dcmsr/dsrposcn.h ../include/dcmtk/dcmsr/dsrtnant.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstack.h \
../../ofstd/include/dcmtk/ofstd/ofutil.h \
../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdirrec.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrulup.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixseq.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcofsetl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrae.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvras.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
- ../../ofstd/include/dcmtk/ofstd/ofdate.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrds.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrdt.h \
- ../../ofstd/include/dcmtk/ofstd/ofdatime.h \
- ../../ofstd/include/dcmtk/ofstd/oftime.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrur.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlt.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrst.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvruc.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrut.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrobow.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixel.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpobw.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcovlay.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
- ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
- ../include/dcmtk/dcmsr/dsdefine.h ../include/dcmtk/dcmsr/dsrimgtn.h \
- ../include/dcmtk/dcmsr/dsrdoctn.h ../include/dcmtk/dcmsr/dsrtree.h \
- ../include/dcmtk/dcmsr/dsrtncsr.h \
- ../../ofstd/include/dcmtk/ofstd/ofstack.h \
- ../include/dcmtk/dcmsr/dsrposcn.h ../include/dcmtk/dcmsr/dsrtnant.h \
../include/dcmtk/dcmsr/dsrcodvl.h \
../../ofstd/include/dcmtk/ofstd/ofexbl.h \
../include/dcmtk/dcmsr/dsrimgvl.h ../include/dcmtk/dcmsr/dsrcomvl.h \
../include/dcmtk/dcmsr/dsrimgfr.h ../include/dcmtk/dcmsr/dsrtlist.h \
../include/dcmtk/dcmsr/dsrimgse.h ../include/dcmtk/dcmsr/dsrxmld.h \
- ../include/dcmtk/dcmsr/dsrxmlc.h
+ ../include/dcmtk/dcmsr/dsrxmlc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h
dsrimgvl.o: dsrimgvl.cc ../../config/include/dcmtk/config/osconfig.h \
../include/dcmtk/dcmsr/dsrimgvl.h ../include/dcmtk/dcmsr/dsrtypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctk.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
- ../../oflog/include/dcmtk/oflog/oflog.h \
- ../../oflog/include/dcmtk/oflog/logger.h \
- ../../oflog/include/dcmtk/oflog/config.h \
+ ../include/dcmtk/dcmsr/dsdefine.h \
../../ofstd/include/dcmtk/ofstd/ofdefine.h \
../../ofstd/include/dcmtk/ofstd/ofcast.h \
../../ofstd/include/dcmtk/ofstd/ofexport.h \
../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
+ ../../ofstd/include/dcmtk/ofstd/ofthread.h \
+ ../../ofstd/include/dcmtk/ofstd/oftypes.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstream.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstring.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcond.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
+ ../../oflog/include/dcmtk/oflog/oflog.h \
+ ../../oflog/include/dcmtk/oflog/logger.h \
+ ../../oflog/include/dcmtk/oflog/config.h \
../../oflog/include/dcmtk/oflog/config/defines.h \
../../oflog/include/dcmtk/oflog/helpers/threadcf.h \
../../oflog/include/dcmtk/oflog/loglevel.h \
../../ofstd/include/dcmtk/ofstd/ofvector.h \
- ../../ofstd/include/dcmtk/ofstd/oftypes.h \
- ../../ofstd/include/dcmtk/ofstd/ofstream.h \
../../oflog/include/dcmtk/oflog/tstring.h \
- ../../ofstd/include/dcmtk/ofstd/ofstring.h \
../../oflog/include/dcmtk/oflog/tchar.h \
../../oflog/include/dcmtk/oflog/spi/apndatch.h \
../../oflog/include/dcmtk/oflog/appender.h \
@@ -3075,91 +1849,27 @@ dsrimgvl.o: dsrimgvl.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofcmdln.h \
../../ofstd/include/dcmtk/ofstd/oflist.h \
../../ofstd/include/dcmtk/ofstd/ofconsol.h \
- ../../ofstd/include/dcmtk/ofstd/ofthread.h \
../../ofstd/include/dcmtk/ofstd/offile.h \
../../ofstd/include/dcmtk/ofstd/ofstd.h \
../../ofstd/include/dcmtk/ofstd/oftraits.h \
- ../../ofstd/include/dcmtk/ofstd/ofcond.h \
../../ofstd/include/dcmtk/ofstd/oflimits.h \
../../config/include/dcmtk/config/arith.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
- ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dctag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \
- ../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdict.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
../../dcmdata/include/dcmtk/dcmdata/dclist.h \
../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcmetinf.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicdir.h \
- ../../ofstd/include/dcmtk/ofstd/ofmap.h \
- ../../ofstd/include/dcmtk/ofstd/ofutil.h \
- ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdirrec.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrulup.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixseq.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcofsetl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrae.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvras.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
- ../../ofstd/include/dcmtk/ofstd/ofdate.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrds.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrdt.h \
- ../../ofstd/include/dcmtk/ofstd/ofdatime.h \
- ../../ofstd/include/dcmtk/ofstd/oftime.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrur.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlt.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrst.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvruc.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrut.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrobow.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixel.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpobw.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcovlay.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
- ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
- ../include/dcmtk/dcmsr/dsdefine.h ../include/dcmtk/dcmsr/dsrcomvl.h \
- ../include/dcmtk/dcmsr/dsrimgfr.h ../include/dcmtk/dcmsr/dsrtlist.h \
- ../include/dcmtk/dcmsr/dsrimgse.h ../include/dcmtk/dcmsr/dsrxmld.h \
- ../include/dcmtk/dcmsr/dsrxmlc.h \
+ ../include/dcmtk/dcmsr/dsrcomvl.h ../include/dcmtk/dcmsr/dsrimgfr.h \
+ ../include/dcmtk/dcmsr/dsrtlist.h ../include/dcmtk/dcmsr/dsrimgse.h \
+ ../include/dcmtk/dcmsr/dsrxmld.h ../include/dcmtk/dcmsr/dsrxmlc.h \
../../dcmimgle/include/dcmtk/dcmimgle/dcmimage.h \
../../dcmimgle/include/dcmtk/dcmimgle/dimoimg.h \
../../dcmimgle/include/dcmtk/dcmimgle/diimage.h \
../../dcmdata/include/dcmtk/dcmdata/dcfcache.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
../../dcmimgle/include/dcmtk/dcmimgle/diovlay.h \
../../dcmimgle/include/dcmtk/dcmimgle/diobjcou.h \
../../dcmimgle/include/dcmtk/dcmimgle/didefine.h \
@@ -3177,27 +1887,36 @@ dsrimgvl.o: dsrimgvl.cc ../../config/include/dcmtk/config/osconfig.h \
../../dcmimgle/include/dcmtk/dcmimgle/diregbas.h \
../../dcmimage/include/dcmtk/dcmimage/dicdefin.h \
../../dcmimage/include/dcmtk/dcmimage/diquant.h \
- ../../dcmimage/include/dcmtk/dcmimage/diqttype.h
+ ../../dcmimage/include/dcmtk/dcmimage/diqttype.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h
dsrimpcc.o: dsrimpcc.cc ../../config/include/dcmtk/config/osconfig.h \
../include/dcmtk/dcmsr/dsrimpcc.h ../include/dcmtk/dcmsr/dsriodcc.h \
- ../include/dcmtk/dcmsr/dsrtypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctk.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
- ../../oflog/include/dcmtk/oflog/oflog.h \
- ../../oflog/include/dcmtk/oflog/logger.h \
- ../../oflog/include/dcmtk/oflog/config.h \
+ ../include/dcmtk/dcmsr/dsrtypes.h ../include/dcmtk/dcmsr/dsdefine.h \
../../ofstd/include/dcmtk/ofstd/ofdefine.h \
../../ofstd/include/dcmtk/ofstd/ofcast.h \
../../ofstd/include/dcmtk/ofstd/ofexport.h \
../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
+ ../../ofstd/include/dcmtk/ofstd/ofthread.h \
+ ../../ofstd/include/dcmtk/ofstd/oftypes.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstream.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstring.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcond.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
+ ../../oflog/include/dcmtk/oflog/oflog.h \
+ ../../oflog/include/dcmtk/oflog/logger.h \
+ ../../oflog/include/dcmtk/oflog/config.h \
../../oflog/include/dcmtk/oflog/config/defines.h \
../../oflog/include/dcmtk/oflog/helpers/threadcf.h \
../../oflog/include/dcmtk/oflog/loglevel.h \
../../ofstd/include/dcmtk/ofstd/ofvector.h \
- ../../ofstd/include/dcmtk/ofstd/oftypes.h \
- ../../ofstd/include/dcmtk/ofstd/ofstream.h \
../../oflog/include/dcmtk/oflog/tstring.h \
- ../../ofstd/include/dcmtk/ofstd/ofstring.h \
../../oflog/include/dcmtk/oflog/tchar.h \
../../oflog/include/dcmtk/oflog/spi/apndatch.h \
../../oflog/include/dcmtk/oflog/appender.h \
@@ -3216,103 +1935,46 @@ dsrimpcc.o: dsrimpcc.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofcmdln.h \
../../ofstd/include/dcmtk/ofstd/oflist.h \
../../ofstd/include/dcmtk/ofstd/ofconsol.h \
- ../../ofstd/include/dcmtk/ofstd/ofthread.h \
../../ofstd/include/dcmtk/ofstd/offile.h \
../../ofstd/include/dcmtk/ofstd/ofstd.h \
../../ofstd/include/dcmtk/ofstd/oftraits.h \
- ../../ofstd/include/dcmtk/ofstd/ofcond.h \
../../ofstd/include/dcmtk/ofstd/oflimits.h \
../../config/include/dcmtk/config/arith.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
- ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dctag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \
- ../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdict.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
- ../../dcmdata/include/dcmtk/dcmdata/dclist.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcmetinf.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicdir.h \
- ../../ofstd/include/dcmtk/ofstd/ofmap.h \
- ../../ofstd/include/dcmtk/ofstd/ofutil.h \
- ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdirrec.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrulup.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixseq.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcofsetl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrae.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvras.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
- ../../ofstd/include/dcmtk/ofstd/ofdate.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrds.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrdt.h \
- ../../ofstd/include/dcmtk/ofstd/ofdatime.h \
- ../../ofstd/include/dcmtk/ofstd/oftime.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrur.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlt.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrst.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvruc.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrut.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrobow.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixel.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpobw.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcovlay.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
- ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
- ../include/dcmtk/dcmsr/dsdefine.h
+ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h
dsriodcc.o: dsriodcc.cc ../../config/include/dcmtk/config/osconfig.h \
../include/dcmtk/dcmsr/dsriodcc.h ../include/dcmtk/dcmsr/dsrtypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctk.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
- ../../oflog/include/dcmtk/oflog/oflog.h \
- ../../oflog/include/dcmtk/oflog/logger.h \
- ../../oflog/include/dcmtk/oflog/config.h \
+ ../include/dcmtk/dcmsr/dsdefine.h \
../../ofstd/include/dcmtk/ofstd/ofdefine.h \
../../ofstd/include/dcmtk/ofstd/ofcast.h \
../../ofstd/include/dcmtk/ofstd/ofexport.h \
../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
+ ../../ofstd/include/dcmtk/ofstd/ofthread.h \
+ ../../ofstd/include/dcmtk/ofstd/oftypes.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstream.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstring.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcond.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
+ ../../oflog/include/dcmtk/oflog/oflog.h \
+ ../../oflog/include/dcmtk/oflog/logger.h \
+ ../../oflog/include/dcmtk/oflog/config.h \
../../oflog/include/dcmtk/oflog/config/defines.h \
../../oflog/include/dcmtk/oflog/helpers/threadcf.h \
../../oflog/include/dcmtk/oflog/loglevel.h \
../../ofstd/include/dcmtk/ofstd/ofvector.h \
- ../../ofstd/include/dcmtk/ofstd/oftypes.h \
- ../../ofstd/include/dcmtk/ofstd/ofstream.h \
../../oflog/include/dcmtk/oflog/tstring.h \
- ../../ofstd/include/dcmtk/ofstd/ofstring.h \
../../oflog/include/dcmtk/oflog/tchar.h \
../../oflog/include/dcmtk/oflog/spi/apndatch.h \
../../oflog/include/dcmtk/oflog/appender.h \
@@ -3331,104 +1993,46 @@ dsriodcc.o: dsriodcc.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofcmdln.h \
../../ofstd/include/dcmtk/ofstd/oflist.h \
../../ofstd/include/dcmtk/ofstd/ofconsol.h \
- ../../ofstd/include/dcmtk/ofstd/ofthread.h \
../../ofstd/include/dcmtk/ofstd/offile.h \
../../ofstd/include/dcmtk/ofstd/ofstd.h \
../../ofstd/include/dcmtk/ofstd/oftraits.h \
- ../../ofstd/include/dcmtk/ofstd/ofcond.h \
../../ofstd/include/dcmtk/ofstd/oflimits.h \
../../config/include/dcmtk/config/arith.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
- ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dctag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \
- ../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdict.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
../../dcmdata/include/dcmtk/dcmdata/dclist.h \
../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcmetinf.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicdir.h \
- ../../ofstd/include/dcmtk/ofstd/ofmap.h \
- ../../ofstd/include/dcmtk/ofstd/ofutil.h \
- ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdirrec.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrulup.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixseq.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcofsetl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrae.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvras.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
- ../../ofstd/include/dcmtk/ofstd/ofdate.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrds.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrdt.h \
- ../../ofstd/include/dcmtk/ofstd/ofdatime.h \
- ../../ofstd/include/dcmtk/ofstd/oftime.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrur.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlt.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrst.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvruc.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrut.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrobow.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixel.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpobw.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcovlay.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
- ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
- ../include/dcmtk/dcmsr/dsdefine.h
+ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h
dsrkeycc.o: dsrkeycc.cc ../../config/include/dcmtk/config/osconfig.h \
../include/dcmtk/dcmsr/dsrkeycc.h ../include/dcmtk/dcmsr/dsriodcc.h \
- ../include/dcmtk/dcmsr/dsrtypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctk.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
- ../../oflog/include/dcmtk/oflog/oflog.h \
- ../../oflog/include/dcmtk/oflog/logger.h \
- ../../oflog/include/dcmtk/oflog/config.h \
+ ../include/dcmtk/dcmsr/dsrtypes.h ../include/dcmtk/dcmsr/dsdefine.h \
../../ofstd/include/dcmtk/ofstd/ofdefine.h \
../../ofstd/include/dcmtk/ofstd/ofcast.h \
../../ofstd/include/dcmtk/ofstd/ofexport.h \
../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
+ ../../ofstd/include/dcmtk/ofstd/ofthread.h \
+ ../../ofstd/include/dcmtk/ofstd/oftypes.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstream.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstring.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcond.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
+ ../../oflog/include/dcmtk/oflog/oflog.h \
+ ../../oflog/include/dcmtk/oflog/logger.h \
+ ../../oflog/include/dcmtk/oflog/config.h \
../../oflog/include/dcmtk/oflog/config/defines.h \
../../oflog/include/dcmtk/oflog/helpers/threadcf.h \
../../oflog/include/dcmtk/oflog/loglevel.h \
../../ofstd/include/dcmtk/ofstd/ofvector.h \
- ../../ofstd/include/dcmtk/ofstd/oftypes.h \
- ../../ofstd/include/dcmtk/ofstd/ofstream.h \
../../oflog/include/dcmtk/oflog/tstring.h \
- ../../ofstd/include/dcmtk/ofstd/ofstring.h \
../../oflog/include/dcmtk/oflog/tchar.h \
../../oflog/include/dcmtk/oflog/spi/apndatch.h \
../../oflog/include/dcmtk/oflog/appender.h \
@@ -3447,104 +2051,46 @@ dsrkeycc.o: dsrkeycc.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofcmdln.h \
../../ofstd/include/dcmtk/ofstd/oflist.h \
../../ofstd/include/dcmtk/ofstd/ofconsol.h \
- ../../ofstd/include/dcmtk/ofstd/ofthread.h \
../../ofstd/include/dcmtk/ofstd/offile.h \
../../ofstd/include/dcmtk/ofstd/ofstd.h \
../../ofstd/include/dcmtk/ofstd/oftraits.h \
- ../../ofstd/include/dcmtk/ofstd/ofcond.h \
../../ofstd/include/dcmtk/ofstd/oflimits.h \
../../config/include/dcmtk/config/arith.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
- ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dctag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \
- ../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdict.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
../../dcmdata/include/dcmtk/dcmdata/dclist.h \
../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcmetinf.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicdir.h \
- ../../ofstd/include/dcmtk/ofstd/ofmap.h \
- ../../ofstd/include/dcmtk/ofstd/ofutil.h \
- ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdirrec.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrulup.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixseq.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcofsetl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrae.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvras.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
- ../../ofstd/include/dcmtk/ofstd/ofdate.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrds.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrdt.h \
- ../../ofstd/include/dcmtk/ofstd/ofdatime.h \
- ../../ofstd/include/dcmtk/ofstd/oftime.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrur.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlt.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrst.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvruc.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrut.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrobow.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixel.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpobw.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcovlay.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
- ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
- ../include/dcmtk/dcmsr/dsdefine.h
+ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h
dsrmaccc.o: dsrmaccc.cc ../../config/include/dcmtk/config/osconfig.h \
../include/dcmtk/dcmsr/dsrmaccc.h ../include/dcmtk/dcmsr/dsriodcc.h \
- ../include/dcmtk/dcmsr/dsrtypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctk.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
- ../../oflog/include/dcmtk/oflog/oflog.h \
- ../../oflog/include/dcmtk/oflog/logger.h \
- ../../oflog/include/dcmtk/oflog/config.h \
+ ../include/dcmtk/dcmsr/dsrtypes.h ../include/dcmtk/dcmsr/dsdefine.h \
../../ofstd/include/dcmtk/ofstd/ofdefine.h \
../../ofstd/include/dcmtk/ofstd/ofcast.h \
../../ofstd/include/dcmtk/ofstd/ofexport.h \
../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
+ ../../ofstd/include/dcmtk/ofstd/ofthread.h \
+ ../../ofstd/include/dcmtk/ofstd/oftypes.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstream.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstring.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcond.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
+ ../../oflog/include/dcmtk/oflog/oflog.h \
+ ../../oflog/include/dcmtk/oflog/logger.h \
+ ../../oflog/include/dcmtk/oflog/config.h \
../../oflog/include/dcmtk/oflog/config/defines.h \
../../oflog/include/dcmtk/oflog/helpers/threadcf.h \
../../oflog/include/dcmtk/oflog/loglevel.h \
../../ofstd/include/dcmtk/ofstd/ofvector.h \
- ../../ofstd/include/dcmtk/ofstd/oftypes.h \
- ../../ofstd/include/dcmtk/ofstd/ofstream.h \
../../oflog/include/dcmtk/oflog/tstring.h \
- ../../ofstd/include/dcmtk/ofstd/ofstring.h \
../../oflog/include/dcmtk/oflog/tchar.h \
../../oflog/include/dcmtk/oflog/spi/apndatch.h \
../../oflog/include/dcmtk/oflog/appender.h \
@@ -3563,104 +2109,46 @@ dsrmaccc.o: dsrmaccc.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofcmdln.h \
../../ofstd/include/dcmtk/ofstd/oflist.h \
../../ofstd/include/dcmtk/ofstd/ofconsol.h \
- ../../ofstd/include/dcmtk/ofstd/ofthread.h \
../../ofstd/include/dcmtk/ofstd/offile.h \
../../ofstd/include/dcmtk/ofstd/ofstd.h \
../../ofstd/include/dcmtk/ofstd/oftraits.h \
- ../../ofstd/include/dcmtk/ofstd/ofcond.h \
../../ofstd/include/dcmtk/ofstd/oflimits.h \
../../config/include/dcmtk/config/arith.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
- ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dctag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \
- ../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdict.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
../../dcmdata/include/dcmtk/dcmdata/dclist.h \
../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcmetinf.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicdir.h \
- ../../ofstd/include/dcmtk/ofstd/ofmap.h \
- ../../ofstd/include/dcmtk/ofstd/ofutil.h \
- ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdirrec.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrulup.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixseq.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcofsetl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrae.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvras.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
- ../../ofstd/include/dcmtk/ofstd/ofdate.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrds.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrdt.h \
- ../../ofstd/include/dcmtk/ofstd/ofdatime.h \
- ../../ofstd/include/dcmtk/ofstd/oftime.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrur.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlt.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrst.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvruc.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrut.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrobow.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixel.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpobw.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcovlay.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
- ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
- ../include/dcmtk/dcmsr/dsdefine.h
+ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h
dsrmamcc.o: dsrmamcc.cc ../../config/include/dcmtk/config/osconfig.h \
../include/dcmtk/dcmsr/dsrmamcc.h ../include/dcmtk/dcmsr/dsriodcc.h \
- ../include/dcmtk/dcmsr/dsrtypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctk.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
- ../../oflog/include/dcmtk/oflog/oflog.h \
- ../../oflog/include/dcmtk/oflog/logger.h \
- ../../oflog/include/dcmtk/oflog/config.h \
+ ../include/dcmtk/dcmsr/dsrtypes.h ../include/dcmtk/dcmsr/dsdefine.h \
../../ofstd/include/dcmtk/ofstd/ofdefine.h \
../../ofstd/include/dcmtk/ofstd/ofcast.h \
../../ofstd/include/dcmtk/ofstd/ofexport.h \
../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
+ ../../ofstd/include/dcmtk/ofstd/ofthread.h \
+ ../../ofstd/include/dcmtk/ofstd/oftypes.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstream.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstring.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcond.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
+ ../../oflog/include/dcmtk/oflog/oflog.h \
+ ../../oflog/include/dcmtk/oflog/logger.h \
+ ../../oflog/include/dcmtk/oflog/config.h \
../../oflog/include/dcmtk/oflog/config/defines.h \
../../oflog/include/dcmtk/oflog/helpers/threadcf.h \
../../oflog/include/dcmtk/oflog/loglevel.h \
../../ofstd/include/dcmtk/ofstd/ofvector.h \
- ../../ofstd/include/dcmtk/ofstd/oftypes.h \
- ../../ofstd/include/dcmtk/ofstd/ofstream.h \
../../oflog/include/dcmtk/oflog/tstring.h \
- ../../ofstd/include/dcmtk/ofstd/ofstring.h \
../../oflog/include/dcmtk/oflog/tchar.h \
../../oflog/include/dcmtk/oflog/spi/apndatch.h \
../../oflog/include/dcmtk/oflog/appender.h \
@@ -3679,103 +2167,45 @@ dsrmamcc.o: dsrmamcc.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofcmdln.h \
../../ofstd/include/dcmtk/ofstd/oflist.h \
../../ofstd/include/dcmtk/ofstd/ofconsol.h \
- ../../ofstd/include/dcmtk/ofstd/ofthread.h \
../../ofstd/include/dcmtk/ofstd/offile.h \
../../ofstd/include/dcmtk/ofstd/ofstd.h \
../../ofstd/include/dcmtk/ofstd/oftraits.h \
- ../../ofstd/include/dcmtk/ofstd/ofcond.h \
../../ofstd/include/dcmtk/ofstd/oflimits.h \
../../config/include/dcmtk/config/arith.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
- ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dctag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \
- ../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdict.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
../../dcmdata/include/dcmtk/dcmdata/dclist.h \
../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcmetinf.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicdir.h \
- ../../ofstd/include/dcmtk/ofstd/ofmap.h \
- ../../ofstd/include/dcmtk/ofstd/ofutil.h \
- ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdirrec.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrulup.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixseq.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcofsetl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrae.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvras.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
- ../../ofstd/include/dcmtk/ofstd/ofdate.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrds.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrdt.h \
- ../../ofstd/include/dcmtk/ofstd/ofdatime.h \
- ../../ofstd/include/dcmtk/ofstd/oftime.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrur.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlt.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrst.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvruc.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrut.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrobow.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixel.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpobw.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcovlay.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
- ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
- ../include/dcmtk/dcmsr/dsdefine.h
+ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h
dsrnumtn.o: dsrnumtn.cc ../../config/include/dcmtk/config/osconfig.h \
- ../include/dcmtk/dcmsr/dsrtypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctk.h \
+ ../include/dcmtk/dcmsr/dsrtypes.h ../include/dcmtk/dcmsr/dsdefine.h \
+ ../../ofstd/include/dcmtk/ofstd/ofdefine.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcast.h \
+ ../../ofstd/include/dcmtk/ofstd/ofexport.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
+ ../../ofstd/include/dcmtk/ofstd/ofthread.h \
+ ../../ofstd/include/dcmtk/ofstd/oftypes.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstream.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstring.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcond.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
../../oflog/include/dcmtk/oflog/oflog.h \
../../oflog/include/dcmtk/oflog/logger.h \
../../oflog/include/dcmtk/oflog/config.h \
- ../../ofstd/include/dcmtk/ofstd/ofdefine.h \
- ../../ofstd/include/dcmtk/ofstd/ofcast.h \
- ../../ofstd/include/dcmtk/ofstd/ofexport.h \
- ../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
../../oflog/include/dcmtk/oflog/config/defines.h \
../../oflog/include/dcmtk/oflog/helpers/threadcf.h \
../../oflog/include/dcmtk/oflog/loglevel.h \
../../ofstd/include/dcmtk/ofstd/ofvector.h \
- ../../ofstd/include/dcmtk/ofstd/oftypes.h \
- ../../ofstd/include/dcmtk/ofstd/ofstream.h \
../../oflog/include/dcmtk/oflog/tstring.h \
- ../../ofstd/include/dcmtk/ofstd/ofstring.h \
../../oflog/include/dcmtk/oflog/tchar.h \
../../oflog/include/dcmtk/oflog/spi/apndatch.h \
../../oflog/include/dcmtk/oflog/appender.h \
@@ -3794,111 +2224,58 @@ dsrnumtn.o: dsrnumtn.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofcmdln.h \
../../ofstd/include/dcmtk/ofstd/oflist.h \
../../ofstd/include/dcmtk/ofstd/ofconsol.h \
- ../../ofstd/include/dcmtk/ofstd/ofthread.h \
../../ofstd/include/dcmtk/ofstd/offile.h \
../../ofstd/include/dcmtk/ofstd/ofstd.h \
../../ofstd/include/dcmtk/ofstd/oftraits.h \
- ../../ofstd/include/dcmtk/ofstd/ofcond.h \
../../ofstd/include/dcmtk/ofstd/oflimits.h \
../../config/include/dcmtk/config/arith.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
- ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dctag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \
- ../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdict.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
../../dcmdata/include/dcmtk/dcmdata/dclist.h \
../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcmetinf.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicdir.h \
- ../../ofstd/include/dcmtk/ofstd/ofmap.h \
+ ../include/dcmtk/dcmsr/dsrnumtn.h ../include/dcmtk/dcmsr/dsrdoctn.h \
+ ../include/dcmtk/dcmsr/dsrtree.h ../include/dcmtk/dcmsr/dsrtncsr.h \
+ ../include/dcmtk/dcmsr/dsrposcn.h ../include/dcmtk/dcmsr/dsrtnant.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstack.h \
../../ofstd/include/dcmtk/ofstd/ofutil.h \
../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdirrec.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrulup.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixseq.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcofsetl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrae.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvras.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
- ../../ofstd/include/dcmtk/ofstd/ofdate.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrds.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrdt.h \
- ../../ofstd/include/dcmtk/ofstd/ofdatime.h \
- ../../ofstd/include/dcmtk/ofstd/oftime.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrur.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlt.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrst.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvruc.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrut.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrobow.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixel.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpobw.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcovlay.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
- ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
- ../include/dcmtk/dcmsr/dsdefine.h ../include/dcmtk/dcmsr/dsrnumtn.h \
- ../include/dcmtk/dcmsr/dsrdoctn.h ../include/dcmtk/dcmsr/dsrtree.h \
- ../include/dcmtk/dcmsr/dsrtncsr.h \
- ../../ofstd/include/dcmtk/ofstd/ofstack.h \
- ../include/dcmtk/dcmsr/dsrposcn.h ../include/dcmtk/dcmsr/dsrtnant.h \
../include/dcmtk/dcmsr/dsrcodvl.h \
../../ofstd/include/dcmtk/ofstd/ofexbl.h \
- ../include/dcmtk/dcmsr/dsrnumvl.h ../include/dcmtk/dcmsr/dsrxmld.h \
- ../include/dcmtk/dcmsr/dsrxmlc.h
+ ../include/dcmtk/dcmsr/dsrnumvl.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
+ ../include/dcmtk/dcmsr/dsrxmld.h ../include/dcmtk/dcmsr/dsrxmlc.h
dsrnumvl.o: dsrnumvl.cc ../../config/include/dcmtk/config/osconfig.h \
- ../include/dcmtk/dcmsr/dsrtypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctk.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
- ../../oflog/include/dcmtk/oflog/oflog.h \
- ../../oflog/include/dcmtk/oflog/logger.h \
- ../../oflog/include/dcmtk/oflog/config.h \
+ ../include/dcmtk/dcmsr/dsrtypes.h ../include/dcmtk/dcmsr/dsdefine.h \
../../ofstd/include/dcmtk/ofstd/ofdefine.h \
../../ofstd/include/dcmtk/ofstd/ofcast.h \
../../ofstd/include/dcmtk/ofstd/ofexport.h \
../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
+ ../../ofstd/include/dcmtk/ofstd/ofthread.h \
+ ../../ofstd/include/dcmtk/ofstd/oftypes.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstream.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstring.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcond.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
+ ../../oflog/include/dcmtk/oflog/oflog.h \
+ ../../oflog/include/dcmtk/oflog/logger.h \
+ ../../oflog/include/dcmtk/oflog/config.h \
../../oflog/include/dcmtk/oflog/config/defines.h \
../../oflog/include/dcmtk/oflog/helpers/threadcf.h \
../../oflog/include/dcmtk/oflog/loglevel.h \
../../ofstd/include/dcmtk/ofstd/ofvector.h \
- ../../ofstd/include/dcmtk/ofstd/oftypes.h \
- ../../ofstd/include/dcmtk/ofstd/ofstream.h \
../../oflog/include/dcmtk/oflog/tstring.h \
- ../../ofstd/include/dcmtk/ofstd/ofstring.h \
../../oflog/include/dcmtk/oflog/tchar.h \
../../oflog/include/dcmtk/oflog/spi/apndatch.h \
../../oflog/include/dcmtk/oflog/appender.h \
@@ -3917,106 +2294,54 @@ dsrnumvl.o: dsrnumvl.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofcmdln.h \
../../ofstd/include/dcmtk/ofstd/oflist.h \
../../ofstd/include/dcmtk/ofstd/ofconsol.h \
- ../../ofstd/include/dcmtk/ofstd/ofthread.h \
../../ofstd/include/dcmtk/ofstd/offile.h \
../../ofstd/include/dcmtk/ofstd/ofstd.h \
../../ofstd/include/dcmtk/ofstd/oftraits.h \
- ../../ofstd/include/dcmtk/ofstd/ofcond.h \
../../ofstd/include/dcmtk/ofstd/oflimits.h \
../../config/include/dcmtk/config/arith.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
- ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dctag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \
- ../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdict.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
../../dcmdata/include/dcmtk/dcmdata/dclist.h \
../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcmetinf.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicdir.h \
- ../../ofstd/include/dcmtk/ofstd/ofmap.h \
- ../../ofstd/include/dcmtk/ofstd/ofutil.h \
- ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdirrec.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrulup.h \
+ ../include/dcmtk/dcmsr/dsrnumvl.h ../include/dcmtk/dcmsr/dsrcodvl.h \
+ ../../ofstd/include/dcmtk/ofstd/ofexbl.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixseq.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcofsetl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrae.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvras.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
- ../../ofstd/include/dcmtk/ofstd/ofdate.h \
+ ../include/dcmtk/dcmsr/dsrxmld.h ../include/dcmtk/dcmsr/dsrxmlc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrds.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrdt.h \
- ../../ofstd/include/dcmtk/ofstd/ofdatime.h \
- ../../ofstd/include/dcmtk/ofstd/oftime.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrur.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlt.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrst.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvruc.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrut.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrobow.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixel.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpobw.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcovlay.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
- ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
- ../include/dcmtk/dcmsr/dsdefine.h ../include/dcmtk/dcmsr/dsrnumvl.h \
- ../include/dcmtk/dcmsr/dsrcodvl.h \
- ../../ofstd/include/dcmtk/ofstd/ofexbl.h \
- ../include/dcmtk/dcmsr/dsrxmld.h ../include/dcmtk/dcmsr/dsrxmlc.h
+ ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h
dsrpnmtn.o: dsrpnmtn.cc ../../config/include/dcmtk/config/osconfig.h \
- ../include/dcmtk/dcmsr/dsrtypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctk.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
- ../../oflog/include/dcmtk/oflog/oflog.h \
- ../../oflog/include/dcmtk/oflog/logger.h \
- ../../oflog/include/dcmtk/oflog/config.h \
+ ../include/dcmtk/dcmsr/dsrtypes.h ../include/dcmtk/dcmsr/dsdefine.h \
../../ofstd/include/dcmtk/ofstd/ofdefine.h \
../../ofstd/include/dcmtk/ofstd/ofcast.h \
../../ofstd/include/dcmtk/ofstd/ofexport.h \
../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
+ ../../ofstd/include/dcmtk/ofstd/ofthread.h \
+ ../../ofstd/include/dcmtk/ofstd/oftypes.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstream.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstring.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcond.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
+ ../../oflog/include/dcmtk/oflog/oflog.h \
+ ../../oflog/include/dcmtk/oflog/logger.h \
+ ../../oflog/include/dcmtk/oflog/config.h \
../../oflog/include/dcmtk/oflog/config/defines.h \
../../oflog/include/dcmtk/oflog/helpers/threadcf.h \
../../oflog/include/dcmtk/oflog/loglevel.h \
../../ofstd/include/dcmtk/ofstd/ofvector.h \
- ../../ofstd/include/dcmtk/ofstd/oftypes.h \
- ../../ofstd/include/dcmtk/ofstd/ofstream.h \
../../oflog/include/dcmtk/oflog/tstring.h \
- ../../ofstd/include/dcmtk/ofstd/ofstring.h \
../../oflog/include/dcmtk/oflog/tchar.h \
../../oflog/include/dcmtk/oflog/spi/apndatch.h \
../../oflog/include/dcmtk/oflog/appender.h \
@@ -4035,104 +2360,52 @@ dsrpnmtn.o: dsrpnmtn.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofcmdln.h \
../../ofstd/include/dcmtk/ofstd/oflist.h \
../../ofstd/include/dcmtk/ofstd/ofconsol.h \
- ../../ofstd/include/dcmtk/ofstd/ofthread.h \
../../ofstd/include/dcmtk/ofstd/offile.h \
../../ofstd/include/dcmtk/ofstd/ofstd.h \
../../ofstd/include/dcmtk/ofstd/oftraits.h \
- ../../ofstd/include/dcmtk/ofstd/ofcond.h \
../../ofstd/include/dcmtk/ofstd/oflimits.h \
../../config/include/dcmtk/config/arith.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
- ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dctag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \
- ../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdict.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
../../dcmdata/include/dcmtk/dcmdata/dclist.h \
../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcmetinf.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicdir.h \
- ../../ofstd/include/dcmtk/ofstd/ofmap.h \
+ ../include/dcmtk/dcmsr/dsrpnmtn.h ../include/dcmtk/dcmsr/dsrdoctn.h \
+ ../include/dcmtk/dcmsr/dsrtree.h ../include/dcmtk/dcmsr/dsrtncsr.h \
+ ../include/dcmtk/dcmsr/dsrposcn.h ../include/dcmtk/dcmsr/dsrtnant.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstack.h \
../../ofstd/include/dcmtk/ofstd/ofutil.h \
../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdirrec.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrulup.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixseq.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcofsetl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrae.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvras.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
- ../../ofstd/include/dcmtk/ofstd/ofdate.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrds.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrdt.h \
- ../../ofstd/include/dcmtk/ofstd/ofdatime.h \
- ../../ofstd/include/dcmtk/ofstd/oftime.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrur.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlt.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrst.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvruc.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrut.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrobow.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixel.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpobw.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcovlay.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
- ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
- ../include/dcmtk/dcmsr/dsdefine.h ../include/dcmtk/dcmsr/dsrpnmtn.h \
- ../include/dcmtk/dcmsr/dsrdoctn.h ../include/dcmtk/dcmsr/dsrtree.h \
- ../include/dcmtk/dcmsr/dsrtncsr.h \
- ../../ofstd/include/dcmtk/ofstd/ofstack.h \
- ../include/dcmtk/dcmsr/dsrposcn.h ../include/dcmtk/dcmsr/dsrtnant.h \
../include/dcmtk/dcmsr/dsrcodvl.h \
../../ofstd/include/dcmtk/ofstd/ofexbl.h \
../include/dcmtk/dcmsr/dsrstrvl.h ../include/dcmtk/dcmsr/dsrxmld.h \
- ../include/dcmtk/dcmsr/dsrxmlc.h
+ ../include/dcmtk/dcmsr/dsrxmlc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h
dsrposcn.o: dsrposcn.cc ../../config/include/dcmtk/config/osconfig.h \
- ../include/dcmtk/dcmsr/dsrposcn.h \
- ../../ofstd/include/dcmtk/ofstd/ofstring.h \
- ../../ofstd/include/dcmtk/ofstd/oftypes.h \
+ ../include/dcmtk/dcmsr/dsrposcn.h ../include/dcmtk/dcmsr/dsdefine.h \
../../ofstd/include/dcmtk/ofstd/ofdefine.h \
../../ofstd/include/dcmtk/ofstd/ofcast.h \
../../ofstd/include/dcmtk/ofstd/ofexport.h \
../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstring.h \
+ ../../ofstd/include/dcmtk/ofstd/oftypes.h \
../../ofstd/include/dcmtk/ofstd/ofstream.h \
../../ofstd/include/dcmtk/ofstd/oflist.h \
- ../include/dcmtk/dcmsr/dsdefine.h ../include/dcmtk/dcmsr/dsrtypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctk.h \
+ ../include/dcmtk/dcmsr/dsrtypes.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
+ ../../ofstd/include/dcmtk/ofstd/ofthread.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcond.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
../../oflog/include/dcmtk/oflog/oflog.h \
../../oflog/include/dcmtk/oflog/logger.h \
@@ -4159,103 +2432,46 @@ dsrposcn.o: dsrposcn.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofconapp.h \
../../ofstd/include/dcmtk/ofstd/ofcmdln.h \
../../ofstd/include/dcmtk/ofstd/ofconsol.h \
- ../../ofstd/include/dcmtk/ofstd/ofthread.h \
../../ofstd/include/dcmtk/ofstd/offile.h \
../../ofstd/include/dcmtk/ofstd/ofstd.h \
../../ofstd/include/dcmtk/ofstd/oftraits.h \
- ../../ofstd/include/dcmtk/ofstd/ofcond.h \
../../ofstd/include/dcmtk/ofstd/oflimits.h \
../../config/include/dcmtk/config/arith.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
- ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dctag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \
- ../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdict.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
../../dcmdata/include/dcmtk/dcmdata/dclist.h \
../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcmetinf.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicdir.h \
- ../../ofstd/include/dcmtk/ofstd/ofmap.h \
- ../../ofstd/include/dcmtk/ofstd/ofutil.h \
- ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdirrec.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrulup.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixseq.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcofsetl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrae.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvras.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
- ../../ofstd/include/dcmtk/ofstd/ofdate.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrds.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrdt.h \
- ../../ofstd/include/dcmtk/ofstd/ofdatime.h \
- ../../ofstd/include/dcmtk/ofstd/oftime.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrur.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlt.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrst.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvruc.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrut.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrobow.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixel.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpobw.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcovlay.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
- ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h
+ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h
dsrprocc.o: dsrprocc.cc ../../config/include/dcmtk/config/osconfig.h \
../include/dcmtk/dcmsr/dsrprocc.h ../include/dcmtk/dcmsr/dsriodcc.h \
- ../include/dcmtk/dcmsr/dsrtypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctk.h \
+ ../include/dcmtk/dcmsr/dsrtypes.h ../include/dcmtk/dcmsr/dsdefine.h \
+ ../../ofstd/include/dcmtk/ofstd/ofdefine.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcast.h \
+ ../../ofstd/include/dcmtk/ofstd/ofexport.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
+ ../../ofstd/include/dcmtk/ofstd/ofthread.h \
+ ../../ofstd/include/dcmtk/ofstd/oftypes.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstream.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstring.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcond.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
../../oflog/include/dcmtk/oflog/oflog.h \
../../oflog/include/dcmtk/oflog/logger.h \
../../oflog/include/dcmtk/oflog/config.h \
- ../../ofstd/include/dcmtk/ofstd/ofdefine.h \
- ../../ofstd/include/dcmtk/ofstd/ofcast.h \
- ../../ofstd/include/dcmtk/ofstd/ofexport.h \
- ../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
../../oflog/include/dcmtk/oflog/config/defines.h \
../../oflog/include/dcmtk/oflog/helpers/threadcf.h \
../../oflog/include/dcmtk/oflog/loglevel.h \
../../ofstd/include/dcmtk/ofstd/ofvector.h \
- ../../ofstd/include/dcmtk/ofstd/oftypes.h \
- ../../ofstd/include/dcmtk/ofstd/ofstream.h \
../../oflog/include/dcmtk/oflog/tstring.h \
- ../../ofstd/include/dcmtk/ofstd/ofstring.h \
../../oflog/include/dcmtk/oflog/tchar.h \
../../oflog/include/dcmtk/oflog/spi/apndatch.h \
../../oflog/include/dcmtk/oflog/appender.h \
@@ -4274,103 +2490,46 @@ dsrprocc.o: dsrprocc.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofcmdln.h \
../../ofstd/include/dcmtk/ofstd/oflist.h \
../../ofstd/include/dcmtk/ofstd/ofconsol.h \
- ../../ofstd/include/dcmtk/ofstd/ofthread.h \
../../ofstd/include/dcmtk/ofstd/offile.h \
../../ofstd/include/dcmtk/ofstd/ofstd.h \
../../ofstd/include/dcmtk/ofstd/oftraits.h \
- ../../ofstd/include/dcmtk/ofstd/ofcond.h \
../../ofstd/include/dcmtk/ofstd/oflimits.h \
../../config/include/dcmtk/config/arith.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
- ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dctag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \
- ../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdict.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
../../dcmdata/include/dcmtk/dcmdata/dclist.h \
../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcmetinf.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicdir.h \
- ../../ofstd/include/dcmtk/ofstd/ofmap.h \
- ../../ofstd/include/dcmtk/ofstd/ofutil.h \
- ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdirrec.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrulup.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixseq.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcofsetl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrae.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvras.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
- ../../ofstd/include/dcmtk/ofstd/ofdate.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrds.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrdt.h \
- ../../ofstd/include/dcmtk/ofstd/ofdatime.h \
- ../../ofstd/include/dcmtk/ofstd/oftime.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrur.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlt.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrst.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvruc.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrut.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrobow.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixel.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpobw.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcovlay.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
- ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
- ../include/dcmtk/dcmsr/dsdefine.h
+ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h
dsrrefin.o: dsrrefin.cc ../../config/include/dcmtk/config/osconfig.h \
../include/dcmtk/dcmsr/dsrrefin.h ../include/dcmtk/dcmsr/dsrtypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctk.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
- ../../oflog/include/dcmtk/oflog/oflog.h \
- ../../oflog/include/dcmtk/oflog/logger.h \
- ../../oflog/include/dcmtk/oflog/config.h \
+ ../include/dcmtk/dcmsr/dsdefine.h \
../../ofstd/include/dcmtk/ofstd/ofdefine.h \
../../ofstd/include/dcmtk/ofstd/ofcast.h \
../../ofstd/include/dcmtk/ofstd/ofexport.h \
../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
+ ../../ofstd/include/dcmtk/ofstd/ofthread.h \
+ ../../ofstd/include/dcmtk/ofstd/oftypes.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstream.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstring.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcond.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
+ ../../oflog/include/dcmtk/oflog/oflog.h \
+ ../../oflog/include/dcmtk/oflog/logger.h \
+ ../../oflog/include/dcmtk/oflog/config.h \
../../oflog/include/dcmtk/oflog/config/defines.h \
../../oflog/include/dcmtk/oflog/helpers/threadcf.h \
../../oflog/include/dcmtk/oflog/loglevel.h \
../../ofstd/include/dcmtk/ofstd/ofvector.h \
- ../../ofstd/include/dcmtk/ofstd/oftypes.h \
- ../../ofstd/include/dcmtk/ofstd/ofstream.h \
../../oflog/include/dcmtk/oflog/tstring.h \
- ../../ofstd/include/dcmtk/ofstd/ofstring.h \
../../oflog/include/dcmtk/oflog/tchar.h \
../../oflog/include/dcmtk/oflog/spi/apndatch.h \
../../oflog/include/dcmtk/oflog/appender.h \
@@ -4389,105 +2548,52 @@ dsrrefin.o: dsrrefin.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofcmdln.h \
../../ofstd/include/dcmtk/ofstd/oflist.h \
../../ofstd/include/dcmtk/ofstd/ofconsol.h \
- ../../ofstd/include/dcmtk/ofstd/ofthread.h \
../../ofstd/include/dcmtk/ofstd/offile.h \
../../ofstd/include/dcmtk/ofstd/ofstd.h \
../../ofstd/include/dcmtk/ofstd/oftraits.h \
- ../../ofstd/include/dcmtk/ofstd/ofcond.h \
../../ofstd/include/dcmtk/ofstd/oflimits.h \
../../config/include/dcmtk/config/arith.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
- ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dctag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \
- ../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdict.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
../../dcmdata/include/dcmtk/dcmdata/dclist.h \
../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcmetinf.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicdir.h \
- ../../ofstd/include/dcmtk/ofstd/ofmap.h \
- ../../ofstd/include/dcmtk/ofstd/ofutil.h \
- ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdirrec.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrulup.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixseq.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcofsetl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrae.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvras.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
- ../../ofstd/include/dcmtk/ofstd/ofdate.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrds.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrdt.h \
- ../../ofstd/include/dcmtk/ofstd/ofdatime.h \
- ../../ofstd/include/dcmtk/ofstd/oftime.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrur.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlt.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrst.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvruc.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrut.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrobow.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixel.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpobw.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcovlay.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
- ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
- ../include/dcmtk/dcmsr/dsdefine.h ../include/dcmtk/dcmsr/dsrcodvl.h \
+ ../include/dcmtk/dcmsr/dsrcodvl.h \
../../ofstd/include/dcmtk/ofstd/ofexbl.h \
- ../include/dcmtk/dcmsr/dsrxmld.h ../include/dcmtk/dcmsr/dsrxmlc.h
+ ../include/dcmtk/dcmsr/dsrxmld.h ../include/dcmtk/dcmsr/dsrxmlc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h
dsrreftn.o: dsrreftn.cc ../../config/include/dcmtk/config/osconfig.h \
- ../include/dcmtk/dcmsr/dsrtypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctk.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
- ../../oflog/include/dcmtk/oflog/oflog.h \
- ../../oflog/include/dcmtk/oflog/logger.h \
- ../../oflog/include/dcmtk/oflog/config.h \
+ ../include/dcmtk/dcmsr/dsrtypes.h ../include/dcmtk/dcmsr/dsdefine.h \
../../ofstd/include/dcmtk/ofstd/ofdefine.h \
../../ofstd/include/dcmtk/ofstd/ofcast.h \
../../ofstd/include/dcmtk/ofstd/ofexport.h \
../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
+ ../../ofstd/include/dcmtk/ofstd/ofthread.h \
+ ../../ofstd/include/dcmtk/ofstd/oftypes.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstream.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstring.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcond.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
+ ../../oflog/include/dcmtk/oflog/oflog.h \
+ ../../oflog/include/dcmtk/oflog/logger.h \
+ ../../oflog/include/dcmtk/oflog/config.h \
../../oflog/include/dcmtk/oflog/config/defines.h \
../../oflog/include/dcmtk/oflog/helpers/threadcf.h \
../../oflog/include/dcmtk/oflog/loglevel.h \
../../ofstd/include/dcmtk/ofstd/ofvector.h \
- ../../ofstd/include/dcmtk/ofstd/oftypes.h \
- ../../ofstd/include/dcmtk/ofstd/ofstream.h \
../../oflog/include/dcmtk/oflog/tstring.h \
- ../../ofstd/include/dcmtk/ofstd/ofstring.h \
../../oflog/include/dcmtk/oflog/tchar.h \
../../oflog/include/dcmtk/oflog/spi/apndatch.h \
../../oflog/include/dcmtk/oflog/appender.h \
@@ -4506,111 +2612,57 @@ dsrreftn.o: dsrreftn.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofcmdln.h \
../../ofstd/include/dcmtk/ofstd/oflist.h \
../../ofstd/include/dcmtk/ofstd/ofconsol.h \
- ../../ofstd/include/dcmtk/ofstd/ofthread.h \
../../ofstd/include/dcmtk/ofstd/offile.h \
../../ofstd/include/dcmtk/ofstd/ofstd.h \
../../ofstd/include/dcmtk/ofstd/oftraits.h \
- ../../ofstd/include/dcmtk/ofstd/ofcond.h \
../../ofstd/include/dcmtk/ofstd/oflimits.h \
../../config/include/dcmtk/config/arith.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
- ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dctag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \
- ../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdict.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
../../dcmdata/include/dcmtk/dcmdata/dclist.h \
../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcmetinf.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicdir.h \
- ../../ofstd/include/dcmtk/ofstd/ofmap.h \
+ ../include/dcmtk/dcmsr/dsrreftn.h ../include/dcmtk/dcmsr/dsrdoctn.h \
+ ../include/dcmtk/dcmsr/dsrtree.h ../include/dcmtk/dcmsr/dsrtncsr.h \
+ ../include/dcmtk/dcmsr/dsrposcn.h ../include/dcmtk/dcmsr/dsrtnant.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstack.h \
../../ofstd/include/dcmtk/ofstd/ofutil.h \
../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdirrec.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrulup.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixseq.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcofsetl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrae.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvras.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
- ../../ofstd/include/dcmtk/ofstd/ofdate.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrds.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrdt.h \
- ../../ofstd/include/dcmtk/ofstd/ofdatime.h \
- ../../ofstd/include/dcmtk/ofstd/oftime.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrur.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlt.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrst.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvruc.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrut.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrobow.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixel.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpobw.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcovlay.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
- ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
- ../include/dcmtk/dcmsr/dsdefine.h ../include/dcmtk/dcmsr/dsrreftn.h \
- ../include/dcmtk/dcmsr/dsrdoctn.h ../include/dcmtk/dcmsr/dsrtree.h \
- ../include/dcmtk/dcmsr/dsrtncsr.h \
- ../../ofstd/include/dcmtk/ofstd/ofstack.h \
- ../include/dcmtk/dcmsr/dsrposcn.h ../include/dcmtk/dcmsr/dsrtnant.h \
../include/dcmtk/dcmsr/dsrcodvl.h \
../../ofstd/include/dcmtk/ofstd/ofexbl.h \
- ../include/dcmtk/dcmsr/dsrxmld.h ../include/dcmtk/dcmsr/dsrxmlc.h
+ ../include/dcmtk/dcmsr/dsrxmld.h ../include/dcmtk/dcmsr/dsrxmlc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h
dsrrrdcc.o: dsrrrdcc.cc ../../config/include/dcmtk/config/osconfig.h \
../include/dcmtk/dcmsr/dsrrrdcc.h ../include/dcmtk/dcmsr/dsriodcc.h \
- ../include/dcmtk/dcmsr/dsrtypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctk.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
- ../../oflog/include/dcmtk/oflog/oflog.h \
- ../../oflog/include/dcmtk/oflog/logger.h \
- ../../oflog/include/dcmtk/oflog/config.h \
+ ../include/dcmtk/dcmsr/dsrtypes.h ../include/dcmtk/dcmsr/dsdefine.h \
../../ofstd/include/dcmtk/ofstd/ofdefine.h \
../../ofstd/include/dcmtk/ofstd/ofcast.h \
../../ofstd/include/dcmtk/ofstd/ofexport.h \
../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
+ ../../ofstd/include/dcmtk/ofstd/ofthread.h \
+ ../../ofstd/include/dcmtk/ofstd/oftypes.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstream.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstring.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcond.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
+ ../../oflog/include/dcmtk/oflog/oflog.h \
+ ../../oflog/include/dcmtk/oflog/logger.h \
+ ../../oflog/include/dcmtk/oflog/config.h \
../../oflog/include/dcmtk/oflog/config/defines.h \
../../oflog/include/dcmtk/oflog/helpers/threadcf.h \
../../oflog/include/dcmtk/oflog/loglevel.h \
../../ofstd/include/dcmtk/ofstd/ofvector.h \
- ../../ofstd/include/dcmtk/ofstd/oftypes.h \
- ../../ofstd/include/dcmtk/ofstd/ofstream.h \
../../oflog/include/dcmtk/oflog/tstring.h \
- ../../ofstd/include/dcmtk/ofstd/ofstring.h \
../../oflog/include/dcmtk/oflog/tchar.h \
../../oflog/include/dcmtk/oflog/spi/apndatch.h \
../../oflog/include/dcmtk/oflog/appender.h \
@@ -4629,105 +2681,47 @@ dsrrrdcc.o: dsrrrdcc.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofcmdln.h \
../../ofstd/include/dcmtk/ofstd/oflist.h \
../../ofstd/include/dcmtk/ofstd/ofconsol.h \
- ../../ofstd/include/dcmtk/ofstd/ofthread.h \
../../ofstd/include/dcmtk/ofstd/offile.h \
../../ofstd/include/dcmtk/ofstd/ofstd.h \
../../ofstd/include/dcmtk/ofstd/oftraits.h \
- ../../ofstd/include/dcmtk/ofstd/ofcond.h \
../../ofstd/include/dcmtk/ofstd/oflimits.h \
../../config/include/dcmtk/config/arith.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
- ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dctag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \
- ../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdict.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
../../dcmdata/include/dcmtk/dcmdata/dclist.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcmetinf.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicdir.h \
- ../../ofstd/include/dcmtk/ofstd/ofmap.h \
- ../../ofstd/include/dcmtk/ofstd/ofutil.h \
- ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdirrec.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrulup.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixseq.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcofsetl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrae.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvras.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
- ../../ofstd/include/dcmtk/ofstd/ofdate.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrds.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrdt.h \
- ../../ofstd/include/dcmtk/ofstd/ofdatime.h \
- ../../ofstd/include/dcmtk/ofstd/oftime.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrur.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlt.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrst.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvruc.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrut.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrobow.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixel.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpobw.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcovlay.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
- ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
- ../include/dcmtk/dcmsr/dsdefine.h
-dsrrtpl.o: dsrrtpl.cc ../../config/include/dcmtk/config/osconfig.h \
- ../include/dcmtk/dcmsr/dsrrtpl.h ../include/dcmtk/dcmsr/dsrdoctr.h \
- ../include/dcmtk/dcmsr/dsrdocst.h ../include/dcmtk/dcmsr/dsrtree.h \
- ../include/dcmtk/dcmsr/dsrtypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctk.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
- ../../oflog/include/dcmtk/oflog/oflog.h \
- ../../oflog/include/dcmtk/oflog/logger.h \
- ../../oflog/include/dcmtk/oflog/config.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h
+dsrrtpl.o: dsrrtpl.cc ../../config/include/dcmtk/config/osconfig.h \
+ ../include/dcmtk/dcmsr/dsrrtpl.h ../include/dcmtk/dcmsr/dsrdoctr.h \
+ ../include/dcmtk/dcmsr/dsrdocst.h ../include/dcmtk/dcmsr/dsrtree.h \
+ ../include/dcmtk/dcmsr/dsrtypes.h ../include/dcmtk/dcmsr/dsdefine.h \
../../ofstd/include/dcmtk/ofstd/ofdefine.h \
../../ofstd/include/dcmtk/ofstd/ofcast.h \
../../ofstd/include/dcmtk/ofstd/ofexport.h \
../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
+ ../../ofstd/include/dcmtk/ofstd/ofthread.h \
+ ../../ofstd/include/dcmtk/ofstd/oftypes.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstream.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstring.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcond.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
+ ../../oflog/include/dcmtk/oflog/oflog.h \
+ ../../oflog/include/dcmtk/oflog/logger.h \
+ ../../oflog/include/dcmtk/oflog/config.h \
../../oflog/include/dcmtk/oflog/config/defines.h \
../../oflog/include/dcmtk/oflog/helpers/threadcf.h \
../../oflog/include/dcmtk/oflog/loglevel.h \
../../ofstd/include/dcmtk/ofstd/ofvector.h \
- ../../ofstd/include/dcmtk/ofstd/oftypes.h \
- ../../ofstd/include/dcmtk/ofstd/ofstream.h \
../../oflog/include/dcmtk/oflog/tstring.h \
- ../../ofstd/include/dcmtk/ofstd/ofstring.h \
../../oflog/include/dcmtk/oflog/tchar.h \
../../oflog/include/dcmtk/oflog/spi/apndatch.h \
../../oflog/include/dcmtk/oflog/appender.h \
@@ -4746,89 +2740,31 @@ dsrrtpl.o: dsrrtpl.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofcmdln.h \
../../ofstd/include/dcmtk/ofstd/oflist.h \
../../ofstd/include/dcmtk/ofstd/ofconsol.h \
- ../../ofstd/include/dcmtk/ofstd/ofthread.h \
../../ofstd/include/dcmtk/ofstd/offile.h \
../../ofstd/include/dcmtk/ofstd/ofstd.h \
../../ofstd/include/dcmtk/ofstd/oftraits.h \
- ../../ofstd/include/dcmtk/ofstd/ofcond.h \
../../ofstd/include/dcmtk/ofstd/oflimits.h \
../../config/include/dcmtk/config/arith.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
- ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dctag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \
- ../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdict.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
../../dcmdata/include/dcmtk/dcmdata/dclist.h \
../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcmetinf.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicdir.h \
- ../../ofstd/include/dcmtk/ofstd/ofmap.h \
+ ../include/dcmtk/dcmsr/dsrtncsr.h ../include/dcmtk/dcmsr/dsrposcn.h \
+ ../include/dcmtk/dcmsr/dsrtnant.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstack.h \
../../ofstd/include/dcmtk/ofstd/ofutil.h \
../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdirrec.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrulup.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixseq.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcofsetl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrae.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvras.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
- ../../ofstd/include/dcmtk/ofstd/ofdate.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrds.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrdt.h \
- ../../ofstd/include/dcmtk/ofstd/ofdatime.h \
- ../../ofstd/include/dcmtk/ofstd/oftime.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrur.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlt.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrst.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvruc.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrut.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrobow.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixel.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpobw.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcovlay.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
- ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
- ../include/dcmtk/dcmsr/dsdefine.h ../include/dcmtk/dcmsr/dsrtncsr.h \
- ../../ofstd/include/dcmtk/ofstd/ofstack.h \
- ../include/dcmtk/dcmsr/dsrposcn.h ../include/dcmtk/dcmsr/dsrtnant.h \
../include/dcmtk/dcmsr/dsrdoctn.h ../include/dcmtk/dcmsr/dsrcodvl.h \
../../ofstd/include/dcmtk/ofstd/ofexbl.h \
- ../include/dcmtk/dcmsr/dsrcitem.h ../include/dcmtk/dcmsr/dsrnumvl.h \
+ ../include/dcmtk/dcmsr/dsrdncsr.h ../include/dcmtk/dcmsr/dsrcitem.h \
+ ../include/dcmtk/dcmsr/dsrnumvl.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
../include/dcmtk/dcmsr/dsrscovl.h ../include/dcmtk/dcmsr/dsrscogr.h \
../include/dcmtk/dcmsr/dsrtlist.h ../include/dcmtk/dcmsr/dsrsc3vl.h \
../include/dcmtk/dcmsr/dsrsc3gr.h ../include/dcmtk/dcmsr/dsrtcovl.h \
@@ -4842,23 +2778,31 @@ dsrrtpl.o: dsrrtpl.cc ../../config/include/dcmtk/config/osconfig.h \
../include/dcmtk/dcmsr/dsrxmlc.h
dsrsc3gr.o: dsrsc3gr.cc ../../config/include/dcmtk/config/osconfig.h \
../include/dcmtk/dcmsr/dsrsc3gr.h ../include/dcmtk/dcmsr/dsrtypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctk.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
- ../../oflog/include/dcmtk/oflog/oflog.h \
- ../../oflog/include/dcmtk/oflog/logger.h \
- ../../oflog/include/dcmtk/oflog/config.h \
+ ../include/dcmtk/dcmsr/dsdefine.h \
../../ofstd/include/dcmtk/ofstd/ofdefine.h \
../../ofstd/include/dcmtk/ofstd/ofcast.h \
../../ofstd/include/dcmtk/ofstd/ofexport.h \
../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
+ ../../ofstd/include/dcmtk/ofstd/ofthread.h \
+ ../../ofstd/include/dcmtk/ofstd/oftypes.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstream.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstring.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcond.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
+ ../../oflog/include/dcmtk/oflog/oflog.h \
+ ../../oflog/include/dcmtk/oflog/logger.h \
+ ../../oflog/include/dcmtk/oflog/config.h \
../../oflog/include/dcmtk/oflog/config/defines.h \
../../oflog/include/dcmtk/oflog/helpers/threadcf.h \
../../oflog/include/dcmtk/oflog/loglevel.h \
../../ofstd/include/dcmtk/ofstd/ofvector.h \
- ../../ofstd/include/dcmtk/ofstd/oftypes.h \
- ../../ofstd/include/dcmtk/ofstd/ofstream.h \
../../oflog/include/dcmtk/oflog/tstring.h \
- ../../ofstd/include/dcmtk/ofstd/ofstring.h \
../../oflog/include/dcmtk/oflog/tchar.h \
../../oflog/include/dcmtk/oflog/spi/apndatch.h \
../../oflog/include/dcmtk/oflog/appender.h \
@@ -4877,103 +2821,48 @@ dsrsc3gr.o: dsrsc3gr.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofcmdln.h \
../../ofstd/include/dcmtk/ofstd/oflist.h \
../../ofstd/include/dcmtk/ofstd/ofconsol.h \
- ../../ofstd/include/dcmtk/ofstd/ofthread.h \
../../ofstd/include/dcmtk/ofstd/offile.h \
../../ofstd/include/dcmtk/ofstd/ofstd.h \
../../ofstd/include/dcmtk/ofstd/oftraits.h \
- ../../ofstd/include/dcmtk/ofstd/ofcond.h \
../../ofstd/include/dcmtk/ofstd/oflimits.h \
../../config/include/dcmtk/config/arith.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
- ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dctag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \
- ../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdict.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
../../dcmdata/include/dcmtk/dcmdata/dclist.h \
../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcmetinf.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicdir.h \
- ../../ofstd/include/dcmtk/ofstd/ofmap.h \
- ../../ofstd/include/dcmtk/ofstd/ofutil.h \
- ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdirrec.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrulup.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixseq.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcofsetl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrae.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvras.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
- ../../ofstd/include/dcmtk/ofstd/ofdate.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrds.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrdt.h \
- ../../ofstd/include/dcmtk/ofstd/ofdatime.h \
- ../../ofstd/include/dcmtk/ofstd/oftime.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrur.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlt.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrst.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvruc.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrut.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrobow.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixel.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpobw.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcovlay.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
- ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
- ../include/dcmtk/dcmsr/dsdefine.h ../include/dcmtk/dcmsr/dsrtlist.h
+ ../include/dcmtk/dcmsr/dsrtlist.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h
dsrsc3tn.o: dsrsc3tn.cc ../../config/include/dcmtk/config/osconfig.h \
- ../include/dcmtk/dcmsr/dsrtypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctk.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
- ../../oflog/include/dcmtk/oflog/oflog.h \
- ../../oflog/include/dcmtk/oflog/logger.h \
- ../../oflog/include/dcmtk/oflog/config.h \
+ ../include/dcmtk/dcmsr/dsrtypes.h ../include/dcmtk/dcmsr/dsdefine.h \
../../ofstd/include/dcmtk/ofstd/ofdefine.h \
../../ofstd/include/dcmtk/ofstd/ofcast.h \
../../ofstd/include/dcmtk/ofstd/ofexport.h \
../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
+ ../../ofstd/include/dcmtk/ofstd/ofthread.h \
+ ../../ofstd/include/dcmtk/ofstd/oftypes.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstream.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstring.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcond.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
+ ../../oflog/include/dcmtk/oflog/oflog.h \
+ ../../oflog/include/dcmtk/oflog/logger.h \
+ ../../oflog/include/dcmtk/oflog/config.h \
../../oflog/include/dcmtk/oflog/config/defines.h \
../../oflog/include/dcmtk/oflog/helpers/threadcf.h \
../../oflog/include/dcmtk/oflog/loglevel.h \
../../ofstd/include/dcmtk/ofstd/ofvector.h \
- ../../ofstd/include/dcmtk/ofstd/oftypes.h \
- ../../ofstd/include/dcmtk/ofstd/ofstream.h \
../../oflog/include/dcmtk/oflog/tstring.h \
- ../../ofstd/include/dcmtk/ofstd/ofstring.h \
../../oflog/include/dcmtk/oflog/tchar.h \
../../oflog/include/dcmtk/oflog/spi/apndatch.h \
../../oflog/include/dcmtk/oflog/appender.h \
@@ -4992,88 +2881,25 @@ dsrsc3tn.o: dsrsc3tn.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofcmdln.h \
../../ofstd/include/dcmtk/ofstd/oflist.h \
../../ofstd/include/dcmtk/ofstd/ofconsol.h \
- ../../ofstd/include/dcmtk/ofstd/ofthread.h \
../../ofstd/include/dcmtk/ofstd/offile.h \
../../ofstd/include/dcmtk/ofstd/ofstd.h \
../../ofstd/include/dcmtk/ofstd/oftraits.h \
- ../../ofstd/include/dcmtk/ofstd/ofcond.h \
../../ofstd/include/dcmtk/ofstd/oflimits.h \
../../config/include/dcmtk/config/arith.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
- ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dctag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \
- ../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdict.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
../../dcmdata/include/dcmtk/dcmdata/dclist.h \
../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcmetinf.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicdir.h \
- ../../ofstd/include/dcmtk/ofstd/ofmap.h \
+ ../include/dcmtk/dcmsr/dsrsc3tn.h ../include/dcmtk/dcmsr/dsrdoctn.h \
+ ../include/dcmtk/dcmsr/dsrtree.h ../include/dcmtk/dcmsr/dsrtncsr.h \
+ ../include/dcmtk/dcmsr/dsrposcn.h ../include/dcmtk/dcmsr/dsrtnant.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstack.h \
../../ofstd/include/dcmtk/ofstd/ofutil.h \
../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdirrec.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrulup.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixseq.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcofsetl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrae.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvras.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
- ../../ofstd/include/dcmtk/ofstd/ofdate.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrds.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrdt.h \
- ../../ofstd/include/dcmtk/ofstd/ofdatime.h \
- ../../ofstd/include/dcmtk/ofstd/oftime.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrur.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlt.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrst.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvruc.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrut.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrobow.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixel.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpobw.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcovlay.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
- ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
- ../include/dcmtk/dcmsr/dsdefine.h ../include/dcmtk/dcmsr/dsrsc3tn.h \
- ../include/dcmtk/dcmsr/dsrdoctn.h ../include/dcmtk/dcmsr/dsrtree.h \
- ../include/dcmtk/dcmsr/dsrtncsr.h \
- ../../ofstd/include/dcmtk/ofstd/ofstack.h \
- ../include/dcmtk/dcmsr/dsrposcn.h ../include/dcmtk/dcmsr/dsrtnant.h \
../include/dcmtk/dcmsr/dsrcodvl.h \
../../ofstd/include/dcmtk/ofstd/ofexbl.h \
../include/dcmtk/dcmsr/dsrsc3vl.h ../include/dcmtk/dcmsr/dsrsc3gr.h \
@@ -5081,23 +2907,31 @@ dsrsc3tn.o: dsrsc3tn.cc ../../config/include/dcmtk/config/osconfig.h \
../include/dcmtk/dcmsr/dsrxmlc.h
dsrsc3vl.o: dsrsc3vl.cc ../../config/include/dcmtk/config/osconfig.h \
../include/dcmtk/dcmsr/dsrsc3vl.h ../include/dcmtk/dcmsr/dsrtypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctk.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
- ../../oflog/include/dcmtk/oflog/oflog.h \
- ../../oflog/include/dcmtk/oflog/logger.h \
- ../../oflog/include/dcmtk/oflog/config.h \
+ ../include/dcmtk/dcmsr/dsdefine.h \
../../ofstd/include/dcmtk/ofstd/ofdefine.h \
../../ofstd/include/dcmtk/ofstd/ofcast.h \
../../ofstd/include/dcmtk/ofstd/ofexport.h \
../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
+ ../../ofstd/include/dcmtk/ofstd/ofthread.h \
+ ../../ofstd/include/dcmtk/ofstd/oftypes.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstream.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstring.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcond.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
+ ../../oflog/include/dcmtk/oflog/oflog.h \
+ ../../oflog/include/dcmtk/oflog/logger.h \
+ ../../oflog/include/dcmtk/oflog/config.h \
../../oflog/include/dcmtk/oflog/config/defines.h \
../../oflog/include/dcmtk/oflog/helpers/threadcf.h \
../../oflog/include/dcmtk/oflog/loglevel.h \
../../ofstd/include/dcmtk/ofstd/ofvector.h \
- ../../ofstd/include/dcmtk/ofstd/oftypes.h \
- ../../ofstd/include/dcmtk/ofstd/ofstream.h \
../../oflog/include/dcmtk/oflog/tstring.h \
- ../../ofstd/include/dcmtk/ofstd/ofstring.h \
../../oflog/include/dcmtk/oflog/tchar.h \
../../oflog/include/dcmtk/oflog/spi/apndatch.h \
../../oflog/include/dcmtk/oflog/appender.h \
@@ -5116,105 +2950,51 @@ dsrsc3vl.o: dsrsc3vl.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofcmdln.h \
../../ofstd/include/dcmtk/ofstd/oflist.h \
../../ofstd/include/dcmtk/ofstd/ofconsol.h \
- ../../ofstd/include/dcmtk/ofstd/ofthread.h \
../../ofstd/include/dcmtk/ofstd/offile.h \
../../ofstd/include/dcmtk/ofstd/ofstd.h \
../../ofstd/include/dcmtk/ofstd/oftraits.h \
- ../../ofstd/include/dcmtk/ofstd/ofcond.h \
../../ofstd/include/dcmtk/ofstd/oflimits.h \
../../config/include/dcmtk/config/arith.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
- ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dctag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \
- ../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdict.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
../../dcmdata/include/dcmtk/dcmdata/dclist.h \
../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcmetinf.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicdir.h \
- ../../ofstd/include/dcmtk/ofstd/ofmap.h \
- ../../ofstd/include/dcmtk/ofstd/ofutil.h \
- ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdirrec.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrulup.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixseq.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcofsetl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrae.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvras.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
- ../../ofstd/include/dcmtk/ofstd/ofdate.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrds.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrdt.h \
- ../../ofstd/include/dcmtk/ofstd/ofdatime.h \
- ../../ofstd/include/dcmtk/ofstd/oftime.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
+ ../include/dcmtk/dcmsr/dsrsc3gr.h ../include/dcmtk/dcmsr/dsrtlist.h \
+ ../include/dcmtk/dcmsr/dsrxmld.h ../include/dcmtk/dcmsr/dsrxmlc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrur.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlt.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrst.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvruc.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrut.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrobow.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixel.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpobw.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcovlay.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
- ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
- ../include/dcmtk/dcmsr/dsdefine.h ../include/dcmtk/dcmsr/dsrsc3gr.h \
- ../include/dcmtk/dcmsr/dsrtlist.h ../include/dcmtk/dcmsr/dsrxmld.h \
- ../include/dcmtk/dcmsr/dsrxmlc.h
+ ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h
dsrscogr.o: dsrscogr.cc ../../config/include/dcmtk/config/osconfig.h \
../include/dcmtk/dcmsr/dsrscogr.h ../include/dcmtk/dcmsr/dsrtypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctk.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
- ../../oflog/include/dcmtk/oflog/oflog.h \
- ../../oflog/include/dcmtk/oflog/logger.h \
- ../../oflog/include/dcmtk/oflog/config.h \
+ ../include/dcmtk/dcmsr/dsdefine.h \
../../ofstd/include/dcmtk/ofstd/ofdefine.h \
../../ofstd/include/dcmtk/ofstd/ofcast.h \
../../ofstd/include/dcmtk/ofstd/ofexport.h \
../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
+ ../../ofstd/include/dcmtk/ofstd/ofthread.h \
+ ../../ofstd/include/dcmtk/ofstd/oftypes.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstream.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstring.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcond.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
+ ../../oflog/include/dcmtk/oflog/oflog.h \
+ ../../oflog/include/dcmtk/oflog/logger.h \
+ ../../oflog/include/dcmtk/oflog/config.h \
../../oflog/include/dcmtk/oflog/config/defines.h \
../../oflog/include/dcmtk/oflog/helpers/threadcf.h \
../../oflog/include/dcmtk/oflog/loglevel.h \
../../ofstd/include/dcmtk/ofstd/ofvector.h \
- ../../ofstd/include/dcmtk/ofstd/oftypes.h \
- ../../ofstd/include/dcmtk/ofstd/ofstream.h \
../../oflog/include/dcmtk/oflog/tstring.h \
- ../../ofstd/include/dcmtk/ofstd/ofstring.h \
../../oflog/include/dcmtk/oflog/tchar.h \
../../oflog/include/dcmtk/oflog/spi/apndatch.h \
../../oflog/include/dcmtk/oflog/appender.h \
@@ -5233,103 +3013,48 @@ dsrscogr.o: dsrscogr.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofcmdln.h \
../../ofstd/include/dcmtk/ofstd/oflist.h \
../../ofstd/include/dcmtk/ofstd/ofconsol.h \
- ../../ofstd/include/dcmtk/ofstd/ofthread.h \
../../ofstd/include/dcmtk/ofstd/offile.h \
../../ofstd/include/dcmtk/ofstd/ofstd.h \
../../ofstd/include/dcmtk/ofstd/oftraits.h \
- ../../ofstd/include/dcmtk/ofstd/ofcond.h \
../../ofstd/include/dcmtk/ofstd/oflimits.h \
../../config/include/dcmtk/config/arith.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
- ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dctag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \
- ../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdict.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
../../dcmdata/include/dcmtk/dcmdata/dclist.h \
../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcmetinf.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicdir.h \
- ../../ofstd/include/dcmtk/ofstd/ofmap.h \
- ../../ofstd/include/dcmtk/ofstd/ofutil.h \
- ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdirrec.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrulup.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixseq.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcofsetl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrae.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvras.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
- ../../ofstd/include/dcmtk/ofstd/ofdate.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrds.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrdt.h \
- ../../ofstd/include/dcmtk/ofstd/ofdatime.h \
- ../../ofstd/include/dcmtk/ofstd/oftime.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrur.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlt.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrst.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvruc.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrut.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrobow.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixel.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpobw.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcovlay.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
- ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
- ../include/dcmtk/dcmsr/dsdefine.h ../include/dcmtk/dcmsr/dsrtlist.h
+ ../include/dcmtk/dcmsr/dsrtlist.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h
dsrscotn.o: dsrscotn.cc ../../config/include/dcmtk/config/osconfig.h \
- ../include/dcmtk/dcmsr/dsrtypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctk.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
- ../../oflog/include/dcmtk/oflog/oflog.h \
- ../../oflog/include/dcmtk/oflog/logger.h \
- ../../oflog/include/dcmtk/oflog/config.h \
+ ../include/dcmtk/dcmsr/dsrtypes.h ../include/dcmtk/dcmsr/dsdefine.h \
../../ofstd/include/dcmtk/ofstd/ofdefine.h \
../../ofstd/include/dcmtk/ofstd/ofcast.h \
../../ofstd/include/dcmtk/ofstd/ofexport.h \
../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
+ ../../ofstd/include/dcmtk/ofstd/ofthread.h \
+ ../../ofstd/include/dcmtk/ofstd/oftypes.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstream.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstring.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcond.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
+ ../../oflog/include/dcmtk/oflog/oflog.h \
+ ../../oflog/include/dcmtk/oflog/logger.h \
+ ../../oflog/include/dcmtk/oflog/config.h \
../../oflog/include/dcmtk/oflog/config/defines.h \
../../oflog/include/dcmtk/oflog/helpers/threadcf.h \
../../oflog/include/dcmtk/oflog/loglevel.h \
../../ofstd/include/dcmtk/ofstd/ofvector.h \
- ../../ofstd/include/dcmtk/ofstd/oftypes.h \
- ../../ofstd/include/dcmtk/ofstd/ofstream.h \
../../oflog/include/dcmtk/oflog/tstring.h \
- ../../ofstd/include/dcmtk/ofstd/ofstring.h \
../../oflog/include/dcmtk/oflog/tchar.h \
../../oflog/include/dcmtk/oflog/spi/apndatch.h \
../../oflog/include/dcmtk/oflog/appender.h \
@@ -5348,88 +3073,25 @@ dsrscotn.o: dsrscotn.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofcmdln.h \
../../ofstd/include/dcmtk/ofstd/oflist.h \
../../ofstd/include/dcmtk/ofstd/ofconsol.h \
- ../../ofstd/include/dcmtk/ofstd/ofthread.h \
../../ofstd/include/dcmtk/ofstd/offile.h \
../../ofstd/include/dcmtk/ofstd/ofstd.h \
../../ofstd/include/dcmtk/ofstd/oftraits.h \
- ../../ofstd/include/dcmtk/ofstd/ofcond.h \
../../ofstd/include/dcmtk/ofstd/oflimits.h \
../../config/include/dcmtk/config/arith.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
- ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dctag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \
- ../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdict.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
../../dcmdata/include/dcmtk/dcmdata/dclist.h \
../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcmetinf.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicdir.h \
- ../../ofstd/include/dcmtk/ofstd/ofmap.h \
+ ../include/dcmtk/dcmsr/dsrscotn.h ../include/dcmtk/dcmsr/dsrdoctn.h \
+ ../include/dcmtk/dcmsr/dsrtree.h ../include/dcmtk/dcmsr/dsrtncsr.h \
+ ../include/dcmtk/dcmsr/dsrposcn.h ../include/dcmtk/dcmsr/dsrtnant.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstack.h \
../../ofstd/include/dcmtk/ofstd/ofutil.h \
../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdirrec.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrulup.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixseq.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcofsetl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrae.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvras.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
- ../../ofstd/include/dcmtk/ofstd/ofdate.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrds.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrdt.h \
- ../../ofstd/include/dcmtk/ofstd/ofdatime.h \
- ../../ofstd/include/dcmtk/ofstd/oftime.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrur.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlt.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrst.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvruc.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrut.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrobow.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixel.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpobw.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcovlay.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
- ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
- ../include/dcmtk/dcmsr/dsdefine.h ../include/dcmtk/dcmsr/dsrscotn.h \
- ../include/dcmtk/dcmsr/dsrdoctn.h ../include/dcmtk/dcmsr/dsrtree.h \
- ../include/dcmtk/dcmsr/dsrtncsr.h \
- ../../ofstd/include/dcmtk/ofstd/ofstack.h \
- ../include/dcmtk/dcmsr/dsrposcn.h ../include/dcmtk/dcmsr/dsrtnant.h \
../include/dcmtk/dcmsr/dsrcodvl.h \
../../ofstd/include/dcmtk/ofstd/ofexbl.h \
../include/dcmtk/dcmsr/dsrscovl.h ../include/dcmtk/dcmsr/dsrscogr.h \
@@ -5437,23 +3099,31 @@ dsrscotn.o: dsrscotn.cc ../../config/include/dcmtk/config/osconfig.h \
../include/dcmtk/dcmsr/dsrxmlc.h
dsrscovl.o: dsrscovl.cc ../../config/include/dcmtk/config/osconfig.h \
../include/dcmtk/dcmsr/dsrscovl.h ../include/dcmtk/dcmsr/dsrtypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctk.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
- ../../oflog/include/dcmtk/oflog/oflog.h \
- ../../oflog/include/dcmtk/oflog/logger.h \
- ../../oflog/include/dcmtk/oflog/config.h \
+ ../include/dcmtk/dcmsr/dsdefine.h \
../../ofstd/include/dcmtk/ofstd/ofdefine.h \
../../ofstd/include/dcmtk/ofstd/ofcast.h \
../../ofstd/include/dcmtk/ofstd/ofexport.h \
../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
+ ../../ofstd/include/dcmtk/ofstd/ofthread.h \
+ ../../ofstd/include/dcmtk/ofstd/oftypes.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstream.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstring.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcond.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
+ ../../oflog/include/dcmtk/oflog/oflog.h \
+ ../../oflog/include/dcmtk/oflog/logger.h \
+ ../../oflog/include/dcmtk/oflog/config.h \
../../oflog/include/dcmtk/oflog/config/defines.h \
../../oflog/include/dcmtk/oflog/helpers/threadcf.h \
../../oflog/include/dcmtk/oflog/loglevel.h \
../../ofstd/include/dcmtk/ofstd/ofvector.h \
- ../../ofstd/include/dcmtk/ofstd/oftypes.h \
- ../../ofstd/include/dcmtk/ofstd/ofstream.h \
../../oflog/include/dcmtk/oflog/tstring.h \
- ../../ofstd/include/dcmtk/ofstd/ofstring.h \
../../oflog/include/dcmtk/oflog/tchar.h \
../../oflog/include/dcmtk/oflog/spi/apndatch.h \
../../oflog/include/dcmtk/oflog/appender.h \
@@ -5472,103 +3142,42 @@ dsrscovl.o: dsrscovl.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofcmdln.h \
../../ofstd/include/dcmtk/ofstd/oflist.h \
../../ofstd/include/dcmtk/ofstd/ofconsol.h \
- ../../ofstd/include/dcmtk/ofstd/ofthread.h \
../../ofstd/include/dcmtk/ofstd/offile.h \
../../ofstd/include/dcmtk/ofstd/ofstd.h \
../../ofstd/include/dcmtk/ofstd/oftraits.h \
- ../../ofstd/include/dcmtk/ofstd/ofcond.h \
../../ofstd/include/dcmtk/ofstd/oflimits.h \
../../config/include/dcmtk/config/arith.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
- ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dctag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \
- ../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdict.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
../../dcmdata/include/dcmtk/dcmdata/dclist.h \
../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcmetinf.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicdir.h \
- ../../ofstd/include/dcmtk/ofstd/ofmap.h \
- ../../ofstd/include/dcmtk/ofstd/ofutil.h \
- ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdirrec.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrulup.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixseq.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcofsetl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrae.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvras.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
- ../../ofstd/include/dcmtk/ofstd/ofdate.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrds.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrdt.h \
- ../../ofstd/include/dcmtk/ofstd/ofdatime.h \
- ../../ofstd/include/dcmtk/ofstd/oftime.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
+ ../include/dcmtk/dcmsr/dsrscogr.h ../include/dcmtk/dcmsr/dsrtlist.h \
+ ../include/dcmtk/dcmsr/dsrxmld.h ../include/dcmtk/dcmsr/dsrxmlc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrur.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlt.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrst.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvruc.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrut.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrobow.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixel.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpobw.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcovlay.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
- ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
- ../include/dcmtk/dcmsr/dsdefine.h ../include/dcmtk/dcmsr/dsrscogr.h \
- ../include/dcmtk/dcmsr/dsrtlist.h ../include/dcmtk/dcmsr/dsrxmld.h \
- ../include/dcmtk/dcmsr/dsrxmlc.h
+ ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h
dsrsoprf.o: dsrsoprf.cc ../../config/include/dcmtk/config/osconfig.h \
- ../include/dcmtk/dcmsr/dsrsoprf.h \
- ../../ofstd/include/dcmtk/ofstd/oflist.h \
- ../../ofstd/include/dcmtk/ofstd/oftypes.h \
+ ../include/dcmtk/dcmsr/dsrsoprf.h ../include/dcmtk/dcmsr/dsrtypes.h \
+ ../include/dcmtk/dcmsr/dsdefine.h \
../../ofstd/include/dcmtk/ofstd/ofdefine.h \
../../ofstd/include/dcmtk/ofstd/ofcast.h \
../../ofstd/include/dcmtk/ofstd/ofexport.h \
../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
+ ../../ofstd/include/dcmtk/ofstd/ofthread.h \
+ ../../ofstd/include/dcmtk/ofstd/oftypes.h \
../../ofstd/include/dcmtk/ofstd/ofstream.h \
../../ofstd/include/dcmtk/ofstd/ofstring.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
../../ofstd/include/dcmtk/ofstd/ofcond.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
- ../../ofstd/include/dcmtk/ofstd/offile.h \
- ../../ofstd/include/dcmtk/ofstd/ofstd.h \
- ../../ofstd/include/dcmtk/ofstd/oftraits.h \
- ../../ofstd/include/dcmtk/ofstd/oflimits.h \
- ../../config/include/dcmtk/config/arith.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
../../oflog/include/dcmtk/oflog/oflog.h \
../../oflog/include/dcmtk/oflog/logger.h \
@@ -5594,102 +3203,59 @@ dsrsoprf.o: dsrsoprf.cc ../../config/include/dcmtk/config/osconfig.h \
../../oflog/include/dcmtk/oflog/tracelog.h \
../../ofstd/include/dcmtk/ofstd/ofconapp.h \
../../ofstd/include/dcmtk/ofstd/ofcmdln.h \
+ ../../ofstd/include/dcmtk/ofstd/oflist.h \
../../ofstd/include/dcmtk/ofstd/ofconsol.h \
- ../../ofstd/include/dcmtk/ofstd/ofthread.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
- ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
+ ../../ofstd/include/dcmtk/ofstd/offile.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstd.h \
+ ../../ofstd/include/dcmtk/ofstd/oftraits.h \
+ ../../ofstd/include/dcmtk/ofstd/oflimits.h \
+ ../../config/include/dcmtk/config/arith.h \
../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
../../dcmdata/include/dcmtk/dcmdata/dctag.h \
../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
../../dcmdata/include/dcmtk/dcmdata/dclist.h \
../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
- ../include/dcmtk/dcmsr/dsrtypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctk.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \
- ../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdict.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcmetinf.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicdir.h \
- ../../ofstd/include/dcmtk/ofstd/ofmap.h \
- ../../ofstd/include/dcmtk/ofstd/ofutil.h \
- ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdirrec.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrulup.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixseq.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcofsetl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
+ ../include/dcmtk/dcmsr/dsrcodvl.h \
+ ../../ofstd/include/dcmtk/ofstd/ofexbl.h \
+ ../include/dcmtk/dcmsr/dsrxmld.h ../include/dcmtk/dcmsr/dsrxmlc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrae.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvras.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
- ../../ofstd/include/dcmtk/ofstd/ofdate.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrds.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrdt.h \
- ../../ofstd/include/dcmtk/ofstd/ofdatime.h \
- ../../ofstd/include/dcmtk/ofstd/oftime.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrur.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlt.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrst.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvruc.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrut.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrobow.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixel.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpobw.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcovlay.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
- ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
- ../include/dcmtk/dcmsr/dsdefine.h ../include/dcmtk/dcmsr/dsrcodvl.h \
- ../../ofstd/include/dcmtk/ofstd/ofexbl.h \
- ../include/dcmtk/dcmsr/dsrxmld.h ../include/dcmtk/dcmsr/dsrxmlc.h
+ ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h
dsrspecc.o: dsrspecc.cc ../../config/include/dcmtk/config/osconfig.h \
../include/dcmtk/dcmsr/dsrspecc.h ../include/dcmtk/dcmsr/dsriodcc.h \
- ../include/dcmtk/dcmsr/dsrtypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctk.h \
+ ../include/dcmtk/dcmsr/dsrtypes.h ../include/dcmtk/dcmsr/dsdefine.h \
+ ../../ofstd/include/dcmtk/ofstd/ofdefine.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcast.h \
+ ../../ofstd/include/dcmtk/ofstd/ofexport.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
+ ../../ofstd/include/dcmtk/ofstd/ofthread.h \
+ ../../ofstd/include/dcmtk/ofstd/oftypes.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstream.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstring.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcond.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
../../oflog/include/dcmtk/oflog/oflog.h \
../../oflog/include/dcmtk/oflog/logger.h \
../../oflog/include/dcmtk/oflog/config.h \
- ../../ofstd/include/dcmtk/ofstd/ofdefine.h \
- ../../ofstd/include/dcmtk/ofstd/ofcast.h \
- ../../ofstd/include/dcmtk/ofstd/ofexport.h \
- ../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
../../oflog/include/dcmtk/oflog/config/defines.h \
../../oflog/include/dcmtk/oflog/helpers/threadcf.h \
../../oflog/include/dcmtk/oflog/loglevel.h \
../../ofstd/include/dcmtk/ofstd/ofvector.h \
- ../../ofstd/include/dcmtk/ofstd/oftypes.h \
- ../../ofstd/include/dcmtk/ofstd/ofstream.h \
../../oflog/include/dcmtk/oflog/tstring.h \
- ../../ofstd/include/dcmtk/ofstd/ofstring.h \
../../oflog/include/dcmtk/oflog/tchar.h \
../../oflog/include/dcmtk/oflog/spi/apndatch.h \
../../oflog/include/dcmtk/oflog/appender.h \
@@ -5708,105 +3274,47 @@ dsrspecc.o: dsrspecc.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofcmdln.h \
../../ofstd/include/dcmtk/ofstd/oflist.h \
../../ofstd/include/dcmtk/ofstd/ofconsol.h \
- ../../ofstd/include/dcmtk/ofstd/ofthread.h \
../../ofstd/include/dcmtk/ofstd/offile.h \
../../ofstd/include/dcmtk/ofstd/ofstd.h \
../../ofstd/include/dcmtk/ofstd/oftraits.h \
- ../../ofstd/include/dcmtk/ofstd/ofcond.h \
../../ofstd/include/dcmtk/ofstd/oflimits.h \
../../config/include/dcmtk/config/arith.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
- ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dctag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \
- ../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdict.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
../../dcmdata/include/dcmtk/dcmdata/dclist.h \
../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcmetinf.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicdir.h \
- ../../ofstd/include/dcmtk/ofstd/ofmap.h \
- ../../ofstd/include/dcmtk/ofstd/ofutil.h \
- ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdirrec.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrulup.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixseq.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcofsetl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrae.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvras.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
- ../../ofstd/include/dcmtk/ofstd/ofdate.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrds.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrdt.h \
- ../../ofstd/include/dcmtk/ofstd/ofdatime.h \
- ../../ofstd/include/dcmtk/ofstd/oftime.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrur.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlt.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrst.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvruc.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrut.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrobow.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixel.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpobw.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcovlay.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
- ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
- ../include/dcmtk/dcmsr/dsdefine.h
+ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h
dsrstpl.o: dsrstpl.cc ../../config/include/dcmtk/config/osconfig.h \
../include/dcmtk/dcmsr/dsrstpl.h ../include/dcmtk/dcmsr/dsrdoctr.h \
../include/dcmtk/dcmsr/dsrdocst.h ../include/dcmtk/dcmsr/dsrtree.h \
- ../include/dcmtk/dcmsr/dsrtypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctk.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
- ../../oflog/include/dcmtk/oflog/oflog.h \
- ../../oflog/include/dcmtk/oflog/logger.h \
- ../../oflog/include/dcmtk/oflog/config.h \
+ ../include/dcmtk/dcmsr/dsrtypes.h ../include/dcmtk/dcmsr/dsdefine.h \
../../ofstd/include/dcmtk/ofstd/ofdefine.h \
../../ofstd/include/dcmtk/ofstd/ofcast.h \
../../ofstd/include/dcmtk/ofstd/ofexport.h \
../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
+ ../../ofstd/include/dcmtk/ofstd/ofthread.h \
+ ../../ofstd/include/dcmtk/ofstd/oftypes.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstream.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstring.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcond.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
+ ../../oflog/include/dcmtk/oflog/oflog.h \
+ ../../oflog/include/dcmtk/oflog/logger.h \
+ ../../oflog/include/dcmtk/oflog/config.h \
../../oflog/include/dcmtk/oflog/config/defines.h \
../../oflog/include/dcmtk/oflog/helpers/threadcf.h \
../../oflog/include/dcmtk/oflog/loglevel.h \
../../ofstd/include/dcmtk/ofstd/ofvector.h \
- ../../ofstd/include/dcmtk/ofstd/oftypes.h \
- ../../ofstd/include/dcmtk/ofstd/ofstream.h \
../../oflog/include/dcmtk/oflog/tstring.h \
- ../../ofstd/include/dcmtk/ofstd/ofstring.h \
../../oflog/include/dcmtk/oflog/tchar.h \
../../oflog/include/dcmtk/oflog/spi/apndatch.h \
../../oflog/include/dcmtk/oflog/appender.h \
@@ -5825,89 +3333,31 @@ dsrstpl.o: dsrstpl.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofcmdln.h \
../../ofstd/include/dcmtk/ofstd/oflist.h \
../../ofstd/include/dcmtk/ofstd/ofconsol.h \
- ../../ofstd/include/dcmtk/ofstd/ofthread.h \
../../ofstd/include/dcmtk/ofstd/offile.h \
../../ofstd/include/dcmtk/ofstd/ofstd.h \
../../ofstd/include/dcmtk/ofstd/oftraits.h \
- ../../ofstd/include/dcmtk/ofstd/ofcond.h \
../../ofstd/include/dcmtk/ofstd/oflimits.h \
../../config/include/dcmtk/config/arith.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
- ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dctag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \
- ../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdict.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
../../dcmdata/include/dcmtk/dcmdata/dclist.h \
../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcmetinf.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicdir.h \
- ../../ofstd/include/dcmtk/ofstd/ofmap.h \
+ ../include/dcmtk/dcmsr/dsrtncsr.h ../include/dcmtk/dcmsr/dsrposcn.h \
+ ../include/dcmtk/dcmsr/dsrtnant.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstack.h \
../../ofstd/include/dcmtk/ofstd/ofutil.h \
../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdirrec.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrulup.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixseq.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcofsetl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrae.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvras.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
- ../../ofstd/include/dcmtk/ofstd/ofdate.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrds.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrdt.h \
- ../../ofstd/include/dcmtk/ofstd/ofdatime.h \
- ../../ofstd/include/dcmtk/ofstd/oftime.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrur.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlt.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrst.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvruc.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrut.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrobow.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixel.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpobw.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcovlay.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
- ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
- ../include/dcmtk/dcmsr/dsdefine.h ../include/dcmtk/dcmsr/dsrtncsr.h \
- ../../ofstd/include/dcmtk/ofstd/ofstack.h \
- ../include/dcmtk/dcmsr/dsrposcn.h ../include/dcmtk/dcmsr/dsrtnant.h \
../include/dcmtk/dcmsr/dsrdoctn.h ../include/dcmtk/dcmsr/dsrcodvl.h \
../../ofstd/include/dcmtk/ofstd/ofexbl.h \
- ../include/dcmtk/dcmsr/dsrcitem.h ../include/dcmtk/dcmsr/dsrnumvl.h \
+ ../include/dcmtk/dcmsr/dsrdncsr.h ../include/dcmtk/dcmsr/dsrcitem.h \
+ ../include/dcmtk/dcmsr/dsrnumvl.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
../include/dcmtk/dcmsr/dsrscovl.h ../include/dcmtk/dcmsr/dsrscogr.h \
../include/dcmtk/dcmsr/dsrtlist.h ../include/dcmtk/dcmsr/dsrsc3vl.h \
../include/dcmtk/dcmsr/dsrsc3gr.h ../include/dcmtk/dcmsr/dsrtcovl.h \
@@ -5919,23 +3369,31 @@ dsrstpl.o: dsrstpl.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofmem.h ../include/dcmtk/dcmsr/dsrctpl.h
dsrstrvl.o: dsrstrvl.cc ../../config/include/dcmtk/config/osconfig.h \
../include/dcmtk/dcmsr/dsrstrvl.h ../include/dcmtk/dcmsr/dsrtypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctk.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
- ../../oflog/include/dcmtk/oflog/oflog.h \
- ../../oflog/include/dcmtk/oflog/logger.h \
- ../../oflog/include/dcmtk/oflog/config.h \
+ ../include/dcmtk/dcmsr/dsdefine.h \
../../ofstd/include/dcmtk/ofstd/ofdefine.h \
../../ofstd/include/dcmtk/ofstd/ofcast.h \
../../ofstd/include/dcmtk/ofstd/ofexport.h \
../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
+ ../../ofstd/include/dcmtk/ofstd/ofthread.h \
+ ../../ofstd/include/dcmtk/ofstd/oftypes.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstream.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstring.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcond.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
+ ../../oflog/include/dcmtk/oflog/oflog.h \
+ ../../oflog/include/dcmtk/oflog/logger.h \
+ ../../oflog/include/dcmtk/oflog/config.h \
../../oflog/include/dcmtk/oflog/config/defines.h \
../../oflog/include/dcmtk/oflog/helpers/threadcf.h \
../../oflog/include/dcmtk/oflog/loglevel.h \
../../ofstd/include/dcmtk/ofstd/ofvector.h \
- ../../ofstd/include/dcmtk/ofstd/oftypes.h \
- ../../ofstd/include/dcmtk/ofstd/ofstream.h \
../../oflog/include/dcmtk/oflog/tstring.h \
- ../../ofstd/include/dcmtk/ofstd/ofstring.h \
../../oflog/include/dcmtk/oflog/tchar.h \
../../oflog/include/dcmtk/oflog/spi/apndatch.h \
../../oflog/include/dcmtk/oflog/appender.h \
@@ -5954,104 +3412,47 @@ dsrstrvl.o: dsrstrvl.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofcmdln.h \
../../ofstd/include/dcmtk/ofstd/oflist.h \
../../ofstd/include/dcmtk/ofstd/ofconsol.h \
- ../../ofstd/include/dcmtk/ofstd/ofthread.h \
../../ofstd/include/dcmtk/ofstd/offile.h \
../../ofstd/include/dcmtk/ofstd/ofstd.h \
../../ofstd/include/dcmtk/ofstd/oftraits.h \
- ../../ofstd/include/dcmtk/ofstd/ofcond.h \
../../ofstd/include/dcmtk/ofstd/oflimits.h \
../../config/include/dcmtk/config/arith.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
- ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dctag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \
- ../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdict.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
../../dcmdata/include/dcmtk/dcmdata/dclist.h \
../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcmetinf.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicdir.h \
- ../../ofstd/include/dcmtk/ofstd/ofmap.h \
- ../../ofstd/include/dcmtk/ofstd/ofutil.h \
- ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdirrec.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrulup.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixseq.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcofsetl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrae.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvras.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
- ../../ofstd/include/dcmtk/ofstd/ofdate.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrds.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrdt.h \
- ../../ofstd/include/dcmtk/ofstd/ofdatime.h \
- ../../ofstd/include/dcmtk/ofstd/oftime.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrur.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlt.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrst.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvruc.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrut.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrobow.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixel.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpobw.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcovlay.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
- ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
- ../include/dcmtk/dcmsr/dsdefine.h ../include/dcmtk/dcmsr/dsrxmld.h \
- ../include/dcmtk/dcmsr/dsrxmlc.h
+ ../include/dcmtk/dcmsr/dsrxmld.h ../include/dcmtk/dcmsr/dsrxmlc.h
dsrtcodt.o: dsrtcodt.cc ../../config/include/dcmtk/config/osconfig.h \
../include/dcmtk/dcmsr/dsrtcodt.h ../include/dcmtk/dcmsr/dsrtypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctk.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
- ../../oflog/include/dcmtk/oflog/oflog.h \
- ../../oflog/include/dcmtk/oflog/logger.h \
- ../../oflog/include/dcmtk/oflog/config.h \
+ ../include/dcmtk/dcmsr/dsdefine.h \
../../ofstd/include/dcmtk/ofstd/ofdefine.h \
../../ofstd/include/dcmtk/ofstd/ofcast.h \
../../ofstd/include/dcmtk/ofstd/ofexport.h \
../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
+ ../../ofstd/include/dcmtk/ofstd/ofthread.h \
+ ../../ofstd/include/dcmtk/ofstd/oftypes.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstream.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstring.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcond.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
+ ../../oflog/include/dcmtk/oflog/oflog.h \
+ ../../oflog/include/dcmtk/oflog/logger.h \
+ ../../oflog/include/dcmtk/oflog/config.h \
../../oflog/include/dcmtk/oflog/config/defines.h \
../../oflog/include/dcmtk/oflog/helpers/threadcf.h \
../../oflog/include/dcmtk/oflog/loglevel.h \
../../ofstd/include/dcmtk/ofstd/ofvector.h \
- ../../ofstd/include/dcmtk/ofstd/oftypes.h \
- ../../ofstd/include/dcmtk/ofstd/ofstream.h \
../../oflog/include/dcmtk/oflog/tstring.h \
- ../../ofstd/include/dcmtk/ofstd/ofstring.h \
../../oflog/include/dcmtk/oflog/tchar.h \
../../oflog/include/dcmtk/oflog/spi/apndatch.h \
../../oflog/include/dcmtk/oflog/appender.h \
@@ -6070,103 +3471,53 @@ dsrtcodt.o: dsrtcodt.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofcmdln.h \
../../ofstd/include/dcmtk/ofstd/oflist.h \
../../ofstd/include/dcmtk/ofstd/ofconsol.h \
- ../../ofstd/include/dcmtk/ofstd/ofthread.h \
../../ofstd/include/dcmtk/ofstd/offile.h \
../../ofstd/include/dcmtk/ofstd/ofstd.h \
../../ofstd/include/dcmtk/ofstd/oftraits.h \
- ../../ofstd/include/dcmtk/ofstd/ofcond.h \
../../ofstd/include/dcmtk/ofstd/oflimits.h \
../../config/include/dcmtk/config/arith.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
- ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dctag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \
- ../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdict.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
../../dcmdata/include/dcmtk/dcmdata/dclist.h \
../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcmetinf.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicdir.h \
- ../../ofstd/include/dcmtk/ofstd/ofmap.h \
- ../../ofstd/include/dcmtk/ofstd/ofutil.h \
- ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdirrec.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrulup.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixseq.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcofsetl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrae.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvras.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
- ../../ofstd/include/dcmtk/ofstd/ofdate.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrds.h \
+ ../include/dcmtk/dcmsr/dsrtlist.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrdt.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
../../ofstd/include/dcmtk/ofstd/ofdatime.h \
- ../../ofstd/include/dcmtk/ofstd/oftime.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrur.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlt.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrst.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvruc.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrut.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrobow.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixel.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpobw.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcovlay.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
- ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
- ../include/dcmtk/dcmsr/dsdefine.h ../include/dcmtk/dcmsr/dsrtlist.h
+ ../../ofstd/include/dcmtk/ofstd/ofdate.h \
+ ../../ofstd/include/dcmtk/ofstd/oftime.h
dsrtcosp.o: dsrtcosp.cc ../../config/include/dcmtk/config/osconfig.h \
../include/dcmtk/dcmsr/dsrtcosp.h ../include/dcmtk/dcmsr/dsrtypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctk.h \
+ ../include/dcmtk/dcmsr/dsdefine.h \
+ ../../ofstd/include/dcmtk/ofstd/ofdefine.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcast.h \
+ ../../ofstd/include/dcmtk/ofstd/ofexport.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
+ ../../ofstd/include/dcmtk/ofstd/ofthread.h \
+ ../../ofstd/include/dcmtk/ofstd/oftypes.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstream.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstring.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcond.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
../../oflog/include/dcmtk/oflog/oflog.h \
../../oflog/include/dcmtk/oflog/logger.h \
../../oflog/include/dcmtk/oflog/config.h \
- ../../ofstd/include/dcmtk/ofstd/ofdefine.h \
- ../../ofstd/include/dcmtk/ofstd/ofcast.h \
- ../../ofstd/include/dcmtk/ofstd/ofexport.h \
- ../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
../../oflog/include/dcmtk/oflog/config/defines.h \
../../oflog/include/dcmtk/oflog/helpers/threadcf.h \
../../oflog/include/dcmtk/oflog/loglevel.h \
../../ofstd/include/dcmtk/ofstd/ofvector.h \
- ../../ofstd/include/dcmtk/ofstd/oftypes.h \
- ../../ofstd/include/dcmtk/ofstd/ofstream.h \
../../oflog/include/dcmtk/oflog/tstring.h \
- ../../ofstd/include/dcmtk/ofstd/ofstring.h \
../../oflog/include/dcmtk/oflog/tchar.h \
../../oflog/include/dcmtk/oflog/spi/apndatch.h \
../../oflog/include/dcmtk/oflog/appender.h \
@@ -6185,103 +3536,48 @@ dsrtcosp.o: dsrtcosp.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofcmdln.h \
../../ofstd/include/dcmtk/ofstd/oflist.h \
../../ofstd/include/dcmtk/ofstd/ofconsol.h \
- ../../ofstd/include/dcmtk/ofstd/ofthread.h \
../../ofstd/include/dcmtk/ofstd/offile.h \
../../ofstd/include/dcmtk/ofstd/ofstd.h \
../../ofstd/include/dcmtk/ofstd/oftraits.h \
- ../../ofstd/include/dcmtk/ofstd/ofcond.h \
../../ofstd/include/dcmtk/ofstd/oflimits.h \
../../config/include/dcmtk/config/arith.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
- ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dctag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \
- ../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdict.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
../../dcmdata/include/dcmtk/dcmdata/dclist.h \
../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcmetinf.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicdir.h \
- ../../ofstd/include/dcmtk/ofstd/ofmap.h \
- ../../ofstd/include/dcmtk/ofstd/ofutil.h \
- ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdirrec.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrulup.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixseq.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcofsetl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrae.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvras.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
- ../../ofstd/include/dcmtk/ofstd/ofdate.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrds.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrdt.h \
- ../../ofstd/include/dcmtk/ofstd/ofdatime.h \
- ../../ofstd/include/dcmtk/ofstd/oftime.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrur.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlt.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrst.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvruc.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrut.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrobow.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixel.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpobw.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcovlay.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
- ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
- ../include/dcmtk/dcmsr/dsdefine.h ../include/dcmtk/dcmsr/dsrtlist.h
+ ../include/dcmtk/dcmsr/dsrtlist.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h
dsrtcotn.o: dsrtcotn.cc ../../config/include/dcmtk/config/osconfig.h \
- ../include/dcmtk/dcmsr/dsrtypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctk.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
- ../../oflog/include/dcmtk/oflog/oflog.h \
- ../../oflog/include/dcmtk/oflog/logger.h \
- ../../oflog/include/dcmtk/oflog/config.h \
+ ../include/dcmtk/dcmsr/dsrtypes.h ../include/dcmtk/dcmsr/dsdefine.h \
../../ofstd/include/dcmtk/ofstd/ofdefine.h \
../../ofstd/include/dcmtk/ofstd/ofcast.h \
../../ofstd/include/dcmtk/ofstd/ofexport.h \
../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
+ ../../ofstd/include/dcmtk/ofstd/ofthread.h \
+ ../../ofstd/include/dcmtk/ofstd/oftypes.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstream.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstring.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcond.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
+ ../../oflog/include/dcmtk/oflog/oflog.h \
+ ../../oflog/include/dcmtk/oflog/logger.h \
+ ../../oflog/include/dcmtk/oflog/config.h \
../../oflog/include/dcmtk/oflog/config/defines.h \
../../oflog/include/dcmtk/oflog/helpers/threadcf.h \
../../oflog/include/dcmtk/oflog/loglevel.h \
../../ofstd/include/dcmtk/ofstd/ofvector.h \
- ../../ofstd/include/dcmtk/ofstd/oftypes.h \
- ../../ofstd/include/dcmtk/ofstd/ofstream.h \
../../oflog/include/dcmtk/oflog/tstring.h \
- ../../ofstd/include/dcmtk/ofstd/ofstring.h \
../../oflog/include/dcmtk/oflog/tchar.h \
../../oflog/include/dcmtk/oflog/spi/apndatch.h \
../../oflog/include/dcmtk/oflog/appender.h \
@@ -6300,88 +3596,25 @@ dsrtcotn.o: dsrtcotn.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofcmdln.h \
../../ofstd/include/dcmtk/ofstd/oflist.h \
../../ofstd/include/dcmtk/ofstd/ofconsol.h \
- ../../ofstd/include/dcmtk/ofstd/ofthread.h \
../../ofstd/include/dcmtk/ofstd/offile.h \
../../ofstd/include/dcmtk/ofstd/ofstd.h \
../../ofstd/include/dcmtk/ofstd/oftraits.h \
- ../../ofstd/include/dcmtk/ofstd/ofcond.h \
../../ofstd/include/dcmtk/ofstd/oflimits.h \
../../config/include/dcmtk/config/arith.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
- ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dctag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \
- ../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdict.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
../../dcmdata/include/dcmtk/dcmdata/dclist.h \
../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcmetinf.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicdir.h \
- ../../ofstd/include/dcmtk/ofstd/ofmap.h \
+ ../include/dcmtk/dcmsr/dsrtcotn.h ../include/dcmtk/dcmsr/dsrdoctn.h \
+ ../include/dcmtk/dcmsr/dsrtree.h ../include/dcmtk/dcmsr/dsrtncsr.h \
+ ../include/dcmtk/dcmsr/dsrposcn.h ../include/dcmtk/dcmsr/dsrtnant.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstack.h \
../../ofstd/include/dcmtk/ofstd/ofutil.h \
../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdirrec.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrulup.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixseq.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcofsetl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrae.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvras.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
- ../../ofstd/include/dcmtk/ofstd/ofdate.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrds.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrdt.h \
- ../../ofstd/include/dcmtk/ofstd/ofdatime.h \
- ../../ofstd/include/dcmtk/ofstd/oftime.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrur.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlt.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrst.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvruc.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrut.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrobow.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixel.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpobw.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcovlay.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
- ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
- ../include/dcmtk/dcmsr/dsdefine.h ../include/dcmtk/dcmsr/dsrtcotn.h \
- ../include/dcmtk/dcmsr/dsrdoctn.h ../include/dcmtk/dcmsr/dsrtree.h \
- ../include/dcmtk/dcmsr/dsrtncsr.h \
- ../../ofstd/include/dcmtk/ofstd/ofstack.h \
- ../include/dcmtk/dcmsr/dsrposcn.h ../include/dcmtk/dcmsr/dsrtnant.h \
../include/dcmtk/dcmsr/dsrcodvl.h \
../../ofstd/include/dcmtk/ofstd/ofexbl.h \
../include/dcmtk/dcmsr/dsrtcovl.h ../include/dcmtk/dcmsr/dsrtcodt.h \
@@ -6390,23 +3623,31 @@ dsrtcotn.o: dsrtcotn.cc ../../config/include/dcmtk/config/osconfig.h \
../include/dcmtk/dcmsr/dsrxmlc.h
dsrtcoto.o: dsrtcoto.cc ../../config/include/dcmtk/config/osconfig.h \
../include/dcmtk/dcmsr/dsrtcoto.h ../include/dcmtk/dcmsr/dsrtypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctk.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
- ../../oflog/include/dcmtk/oflog/oflog.h \
- ../../oflog/include/dcmtk/oflog/logger.h \
- ../../oflog/include/dcmtk/oflog/config.h \
+ ../include/dcmtk/dcmsr/dsdefine.h \
../../ofstd/include/dcmtk/ofstd/ofdefine.h \
../../ofstd/include/dcmtk/ofstd/ofcast.h \
../../ofstd/include/dcmtk/ofstd/ofexport.h \
../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
+ ../../ofstd/include/dcmtk/ofstd/ofthread.h \
+ ../../ofstd/include/dcmtk/ofstd/oftypes.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstream.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstring.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcond.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
+ ../../oflog/include/dcmtk/oflog/oflog.h \
+ ../../oflog/include/dcmtk/oflog/logger.h \
+ ../../oflog/include/dcmtk/oflog/config.h \
../../oflog/include/dcmtk/oflog/config/defines.h \
../../oflog/include/dcmtk/oflog/helpers/threadcf.h \
../../oflog/include/dcmtk/oflog/loglevel.h \
../../ofstd/include/dcmtk/ofstd/ofvector.h \
- ../../ofstd/include/dcmtk/ofstd/oftypes.h \
- ../../ofstd/include/dcmtk/ofstd/ofstream.h \
../../oflog/include/dcmtk/oflog/tstring.h \
- ../../ofstd/include/dcmtk/ofstd/ofstring.h \
../../oflog/include/dcmtk/oflog/tchar.h \
../../oflog/include/dcmtk/oflog/spi/apndatch.h \
../../oflog/include/dcmtk/oflog/appender.h \
@@ -6425,103 +3666,50 @@ dsrtcoto.o: dsrtcoto.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofcmdln.h \
../../ofstd/include/dcmtk/ofstd/oflist.h \
../../ofstd/include/dcmtk/ofstd/ofconsol.h \
- ../../ofstd/include/dcmtk/ofstd/ofthread.h \
../../ofstd/include/dcmtk/ofstd/offile.h \
../../ofstd/include/dcmtk/ofstd/ofstd.h \
../../ofstd/include/dcmtk/ofstd/oftraits.h \
- ../../ofstd/include/dcmtk/ofstd/ofcond.h \
../../ofstd/include/dcmtk/ofstd/oflimits.h \
../../config/include/dcmtk/config/arith.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
- ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dctag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \
- ../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdict.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
../../dcmdata/include/dcmtk/dcmdata/dclist.h \
../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcmetinf.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicdir.h \
- ../../ofstd/include/dcmtk/ofstd/ofmap.h \
- ../../ofstd/include/dcmtk/ofstd/ofutil.h \
- ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdirrec.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrulup.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixseq.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcofsetl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrae.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvras.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
- ../../ofstd/include/dcmtk/ofstd/ofdate.h \
+ ../include/dcmtk/dcmsr/dsrtlist.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrds.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrdt.h \
- ../../ofstd/include/dcmtk/ofstd/ofdatime.h \
- ../../ofstd/include/dcmtk/ofstd/oftime.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrur.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlt.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrst.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvruc.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrut.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrobow.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixel.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpobw.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcovlay.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
- ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
- ../include/dcmtk/dcmsr/dsdefine.h ../include/dcmtk/dcmsr/dsrtlist.h
+ ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h
dsrtcovl.o: dsrtcovl.cc ../../config/include/dcmtk/config/osconfig.h \
../include/dcmtk/dcmsr/dsrtcovl.h ../include/dcmtk/dcmsr/dsrtypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctk.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
- ../../oflog/include/dcmtk/oflog/oflog.h \
- ../../oflog/include/dcmtk/oflog/logger.h \
- ../../oflog/include/dcmtk/oflog/config.h \
+ ../include/dcmtk/dcmsr/dsdefine.h \
../../ofstd/include/dcmtk/ofstd/ofdefine.h \
../../ofstd/include/dcmtk/ofstd/ofcast.h \
../../ofstd/include/dcmtk/ofstd/ofexport.h \
../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
+ ../../ofstd/include/dcmtk/ofstd/ofthread.h \
+ ../../ofstd/include/dcmtk/ofstd/oftypes.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstream.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstring.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcond.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
+ ../../oflog/include/dcmtk/oflog/oflog.h \
+ ../../oflog/include/dcmtk/oflog/logger.h \
+ ../../oflog/include/dcmtk/oflog/config.h \
../../oflog/include/dcmtk/oflog/config/defines.h \
../../oflog/include/dcmtk/oflog/helpers/threadcf.h \
../../oflog/include/dcmtk/oflog/loglevel.h \
../../ofstd/include/dcmtk/ofstd/ofvector.h \
- ../../ofstd/include/dcmtk/ofstd/oftypes.h \
- ../../ofstd/include/dcmtk/ofstd/ofstream.h \
../../oflog/include/dcmtk/oflog/tstring.h \
- ../../ofstd/include/dcmtk/ofstd/ofstring.h \
../../oflog/include/dcmtk/oflog/tchar.h \
../../oflog/include/dcmtk/oflog/spi/apndatch.h \
../../oflog/include/dcmtk/oflog/appender.h \
@@ -6530,116 +3718,59 @@ dsrtcovl.o: dsrtcovl.cc ../../config/include/dcmtk/config/osconfig.h \
../../oflog/include/dcmtk/oflog/streams.h \
../../oflog/include/dcmtk/oflog/helpers/pointer.h \
../../oflog/include/dcmtk/oflog/thread/syncprim.h \
- ../../oflog/include/dcmtk/oflog/spi/filter.h \
- ../../oflog/include/dcmtk/oflog/helpers/lockfile.h \
- ../../oflog/include/dcmtk/oflog/spi/logfact.h \
- ../../oflog/include/dcmtk/oflog/logmacro.h \
- ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \
- ../../oflog/include/dcmtk/oflog/tracelog.h \
- ../../ofstd/include/dcmtk/ofstd/ofconapp.h \
- ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \
- ../../ofstd/include/dcmtk/ofstd/oflist.h \
- ../../ofstd/include/dcmtk/ofstd/ofconsol.h \
- ../../ofstd/include/dcmtk/ofstd/ofthread.h \
- ../../ofstd/include/dcmtk/ofstd/offile.h \
- ../../ofstd/include/dcmtk/ofstd/ofstd.h \
- ../../ofstd/include/dcmtk/ofstd/oftraits.h \
- ../../ofstd/include/dcmtk/ofstd/ofcond.h \
- ../../ofstd/include/dcmtk/ofstd/oflimits.h \
- ../../config/include/dcmtk/config/arith.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
- ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \
- ../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdict.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
- ../../dcmdata/include/dcmtk/dcmdata/dclist.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcmetinf.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicdir.h \
- ../../ofstd/include/dcmtk/ofstd/ofmap.h \
- ../../ofstd/include/dcmtk/ofstd/ofutil.h \
- ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdirrec.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrulup.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixseq.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcofsetl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrae.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvras.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
- ../../ofstd/include/dcmtk/ofstd/ofdate.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrds.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrdt.h \
- ../../ofstd/include/dcmtk/ofstd/ofdatime.h \
- ../../ofstd/include/dcmtk/ofstd/oftime.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrur.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlt.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrst.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvruc.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrut.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrobow.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixel.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpobw.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcovlay.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
- ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
- ../include/dcmtk/dcmsr/dsdefine.h ../include/dcmtk/dcmsr/dsrtcodt.h \
- ../include/dcmtk/dcmsr/dsrtlist.h ../include/dcmtk/dcmsr/dsrtcosp.h \
- ../include/dcmtk/dcmsr/dsrtcoto.h ../include/dcmtk/dcmsr/dsrxmld.h \
- ../include/dcmtk/dcmsr/dsrxmlc.h
+ ../../oflog/include/dcmtk/oflog/spi/filter.h \
+ ../../oflog/include/dcmtk/oflog/helpers/lockfile.h \
+ ../../oflog/include/dcmtk/oflog/spi/logfact.h \
+ ../../oflog/include/dcmtk/oflog/logmacro.h \
+ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \
+ ../../oflog/include/dcmtk/oflog/tracelog.h \
+ ../../ofstd/include/dcmtk/ofstd/ofconapp.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \
+ ../../ofstd/include/dcmtk/ofstd/oflist.h \
+ ../../ofstd/include/dcmtk/ofstd/ofconsol.h \
+ ../../ofstd/include/dcmtk/ofstd/offile.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstd.h \
+ ../../ofstd/include/dcmtk/ofstd/oftraits.h \
+ ../../ofstd/include/dcmtk/ofstd/oflimits.h \
+ ../../config/include/dcmtk/config/arith.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
+ ../include/dcmtk/dcmsr/dsrtcodt.h ../include/dcmtk/dcmsr/dsrtlist.h \
+ ../include/dcmtk/dcmsr/dsrtcosp.h ../include/dcmtk/dcmsr/dsrtcoto.h \
+ ../include/dcmtk/dcmsr/dsrxmld.h ../include/dcmtk/dcmsr/dsrxmlc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h
dsrtextn.o: dsrtextn.cc ../../config/include/dcmtk/config/osconfig.h \
- ../include/dcmtk/dcmsr/dsrtypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctk.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
- ../../oflog/include/dcmtk/oflog/oflog.h \
- ../../oflog/include/dcmtk/oflog/logger.h \
- ../../oflog/include/dcmtk/oflog/config.h \
+ ../include/dcmtk/dcmsr/dsrtypes.h ../include/dcmtk/dcmsr/dsdefine.h \
../../ofstd/include/dcmtk/ofstd/ofdefine.h \
../../ofstd/include/dcmtk/ofstd/ofcast.h \
../../ofstd/include/dcmtk/ofstd/ofexport.h \
../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
+ ../../ofstd/include/dcmtk/ofstd/ofthread.h \
+ ../../ofstd/include/dcmtk/ofstd/oftypes.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstream.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstring.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcond.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
+ ../../oflog/include/dcmtk/oflog/oflog.h \
+ ../../oflog/include/dcmtk/oflog/logger.h \
+ ../../oflog/include/dcmtk/oflog/config.h \
../../oflog/include/dcmtk/oflog/config/defines.h \
../../oflog/include/dcmtk/oflog/helpers/threadcf.h \
../../oflog/include/dcmtk/oflog/loglevel.h \
../../ofstd/include/dcmtk/ofstd/ofvector.h \
- ../../ofstd/include/dcmtk/ofstd/oftypes.h \
- ../../ofstd/include/dcmtk/ofstd/ofstream.h \
../../oflog/include/dcmtk/oflog/tstring.h \
- ../../ofstd/include/dcmtk/ofstd/ofstring.h \
../../oflog/include/dcmtk/oflog/tchar.h \
../../oflog/include/dcmtk/oflog/spi/apndatch.h \
../../oflog/include/dcmtk/oflog/appender.h \
@@ -6658,111 +3789,59 @@ dsrtextn.o: dsrtextn.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofcmdln.h \
../../ofstd/include/dcmtk/ofstd/oflist.h \
../../ofstd/include/dcmtk/ofstd/ofconsol.h \
- ../../ofstd/include/dcmtk/ofstd/ofthread.h \
../../ofstd/include/dcmtk/ofstd/offile.h \
../../ofstd/include/dcmtk/ofstd/ofstd.h \
../../ofstd/include/dcmtk/ofstd/oftraits.h \
- ../../ofstd/include/dcmtk/ofstd/ofcond.h \
../../ofstd/include/dcmtk/ofstd/oflimits.h \
../../config/include/dcmtk/config/arith.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
- ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dctag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \
- ../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdict.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
../../dcmdata/include/dcmtk/dcmdata/dclist.h \
../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcmetinf.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicdir.h \
- ../../ofstd/include/dcmtk/ofstd/ofmap.h \
+ ../include/dcmtk/dcmsr/dsrtextn.h ../include/dcmtk/dcmsr/dsrdoctn.h \
+ ../include/dcmtk/dcmsr/dsrtree.h ../include/dcmtk/dcmsr/dsrtncsr.h \
+ ../include/dcmtk/dcmsr/dsrposcn.h ../include/dcmtk/dcmsr/dsrtnant.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstack.h \
../../ofstd/include/dcmtk/ofstd/ofutil.h \
../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdirrec.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrulup.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixseq.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcofsetl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrae.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvras.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
- ../../ofstd/include/dcmtk/ofstd/ofdate.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrds.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrdt.h \
- ../../ofstd/include/dcmtk/ofstd/ofdatime.h \
- ../../ofstd/include/dcmtk/ofstd/oftime.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrur.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlt.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrst.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvruc.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrut.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrobow.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixel.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpobw.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcovlay.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
- ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
- ../include/dcmtk/dcmsr/dsdefine.h ../include/dcmtk/dcmsr/dsrtextn.h \
- ../include/dcmtk/dcmsr/dsrdoctn.h ../include/dcmtk/dcmsr/dsrtree.h \
- ../include/dcmtk/dcmsr/dsrtncsr.h \
- ../../ofstd/include/dcmtk/ofstd/ofstack.h \
- ../include/dcmtk/dcmsr/dsrposcn.h ../include/dcmtk/dcmsr/dsrtnant.h \
../include/dcmtk/dcmsr/dsrcodvl.h \
../../ofstd/include/dcmtk/ofstd/ofexbl.h \
../include/dcmtk/dcmsr/dsrstrvl.h ../include/dcmtk/dcmsr/dsrxmld.h \
- ../include/dcmtk/dcmsr/dsrxmlc.h
+ ../include/dcmtk/dcmsr/dsrxmlc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrut.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h
dsrtimtn.o: dsrtimtn.cc ../../config/include/dcmtk/config/osconfig.h \
- ../include/dcmtk/dcmsr/dsrtypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctk.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
- ../../oflog/include/dcmtk/oflog/oflog.h \
- ../../oflog/include/dcmtk/oflog/logger.h \
- ../../oflog/include/dcmtk/oflog/config.h \
+ ../include/dcmtk/dcmsr/dsrtypes.h ../include/dcmtk/dcmsr/dsdefine.h \
../../ofstd/include/dcmtk/ofstd/ofdefine.h \
../../ofstd/include/dcmtk/ofstd/ofcast.h \
../../ofstd/include/dcmtk/ofstd/ofexport.h \
../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
+ ../../ofstd/include/dcmtk/ofstd/ofthread.h \
+ ../../ofstd/include/dcmtk/ofstd/oftypes.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstream.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstring.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcond.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
+ ../../oflog/include/dcmtk/oflog/oflog.h \
+ ../../oflog/include/dcmtk/oflog/logger.h \
+ ../../oflog/include/dcmtk/oflog/config.h \
../../oflog/include/dcmtk/oflog/config/defines.h \
../../oflog/include/dcmtk/oflog/helpers/threadcf.h \
../../oflog/include/dcmtk/oflog/loglevel.h \
../../ofstd/include/dcmtk/ofstd/ofvector.h \
- ../../ofstd/include/dcmtk/ofstd/oftypes.h \
- ../../ofstd/include/dcmtk/ofstd/ofstream.h \
../../oflog/include/dcmtk/oflog/tstring.h \
- ../../ofstd/include/dcmtk/ofstd/ofstring.h \
../../oflog/include/dcmtk/oflog/tchar.h \
../../oflog/include/dcmtk/oflog/spi/apndatch.h \
../../oflog/include/dcmtk/oflog/appender.h \
@@ -6781,111 +3860,59 @@ dsrtimtn.o: dsrtimtn.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofcmdln.h \
../../ofstd/include/dcmtk/ofstd/oflist.h \
../../ofstd/include/dcmtk/ofstd/ofconsol.h \
- ../../ofstd/include/dcmtk/ofstd/ofthread.h \
../../ofstd/include/dcmtk/ofstd/offile.h \
../../ofstd/include/dcmtk/ofstd/ofstd.h \
../../ofstd/include/dcmtk/ofstd/oftraits.h \
- ../../ofstd/include/dcmtk/ofstd/ofcond.h \
../../ofstd/include/dcmtk/ofstd/oflimits.h \
../../config/include/dcmtk/config/arith.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
- ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dctag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \
- ../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdict.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
../../dcmdata/include/dcmtk/dcmdata/dclist.h \
../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcmetinf.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicdir.h \
- ../../ofstd/include/dcmtk/ofstd/ofmap.h \
+ ../include/dcmtk/dcmsr/dsrtimtn.h ../include/dcmtk/dcmsr/dsrdoctn.h \
+ ../include/dcmtk/dcmsr/dsrtree.h ../include/dcmtk/dcmsr/dsrtncsr.h \
+ ../include/dcmtk/dcmsr/dsrposcn.h ../include/dcmtk/dcmsr/dsrtnant.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstack.h \
../../ofstd/include/dcmtk/ofstd/ofutil.h \
../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdirrec.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrulup.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixseq.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcofsetl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrae.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvras.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
- ../../ofstd/include/dcmtk/ofstd/ofdate.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrds.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrdt.h \
- ../../ofstd/include/dcmtk/ofstd/ofdatime.h \
- ../../ofstd/include/dcmtk/ofstd/oftime.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrur.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlt.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrst.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvruc.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrut.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrobow.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixel.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpobw.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcovlay.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
- ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
- ../include/dcmtk/dcmsr/dsdefine.h ../include/dcmtk/dcmsr/dsrtimtn.h \
- ../include/dcmtk/dcmsr/dsrdoctn.h ../include/dcmtk/dcmsr/dsrtree.h \
- ../include/dcmtk/dcmsr/dsrtncsr.h \
- ../../ofstd/include/dcmtk/ofstd/ofstack.h \
- ../include/dcmtk/dcmsr/dsrposcn.h ../include/dcmtk/dcmsr/dsrtnant.h \
../include/dcmtk/dcmsr/dsrcodvl.h \
../../ofstd/include/dcmtk/ofstd/ofexbl.h \
../include/dcmtk/dcmsr/dsrstrvl.h ../include/dcmtk/dcmsr/dsrxmld.h \
- ../include/dcmtk/dcmsr/dsrxmlc.h
+ ../include/dcmtk/dcmsr/dsrxmlc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
+ ../../ofstd/include/dcmtk/ofstd/oftime.h
dsrtpltn.o: dsrtpltn.cc ../../config/include/dcmtk/config/osconfig.h \
- ../include/dcmtk/dcmsr/dsrtypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctk.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
- ../../oflog/include/dcmtk/oflog/oflog.h \
- ../../oflog/include/dcmtk/oflog/logger.h \
- ../../oflog/include/dcmtk/oflog/config.h \
+ ../include/dcmtk/dcmsr/dsrtypes.h ../include/dcmtk/dcmsr/dsdefine.h \
../../ofstd/include/dcmtk/ofstd/ofdefine.h \
../../ofstd/include/dcmtk/ofstd/ofcast.h \
../../ofstd/include/dcmtk/ofstd/ofexport.h \
../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
+ ../../ofstd/include/dcmtk/ofstd/ofthread.h \
+ ../../ofstd/include/dcmtk/ofstd/oftypes.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstream.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstring.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcond.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
+ ../../oflog/include/dcmtk/oflog/oflog.h \
+ ../../oflog/include/dcmtk/oflog/logger.h \
+ ../../oflog/include/dcmtk/oflog/config.h \
../../oflog/include/dcmtk/oflog/config/defines.h \
../../oflog/include/dcmtk/oflog/helpers/threadcf.h \
../../oflog/include/dcmtk/oflog/loglevel.h \
../../ofstd/include/dcmtk/ofstd/ofvector.h \
- ../../ofstd/include/dcmtk/ofstd/oftypes.h \
- ../../ofstd/include/dcmtk/ofstd/ofstream.h \
../../oflog/include/dcmtk/oflog/tstring.h \
- ../../ofstd/include/dcmtk/ofstd/ofstring.h \
../../oflog/include/dcmtk/oflog/tchar.h \
../../oflog/include/dcmtk/oflog/spi/apndatch.h \
../../oflog/include/dcmtk/oflog/appender.h \
@@ -6904,121 +3931,70 @@ dsrtpltn.o: dsrtpltn.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofcmdln.h \
../../ofstd/include/dcmtk/ofstd/oflist.h \
../../ofstd/include/dcmtk/ofstd/ofconsol.h \
- ../../ofstd/include/dcmtk/ofstd/ofthread.h \
../../ofstd/include/dcmtk/ofstd/offile.h \
../../ofstd/include/dcmtk/ofstd/ofstd.h \
../../ofstd/include/dcmtk/ofstd/oftraits.h \
- ../../ofstd/include/dcmtk/ofstd/ofcond.h \
../../ofstd/include/dcmtk/ofstd/oflimits.h \
../../config/include/dcmtk/config/arith.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
- ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dctag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \
- ../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdict.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
../../dcmdata/include/dcmtk/dcmdata/dclist.h \
../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcmetinf.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicdir.h \
- ../../ofstd/include/dcmtk/ofstd/ofmap.h \
+ ../include/dcmtk/dcmsr/dsrtpltn.h ../include/dcmtk/dcmsr/dsrdoctn.h \
+ ../include/dcmtk/dcmsr/dsrtree.h ../include/dcmtk/dcmsr/dsrtncsr.h \
+ ../include/dcmtk/dcmsr/dsrposcn.h ../include/dcmtk/dcmsr/dsrtnant.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstack.h \
../../ofstd/include/dcmtk/ofstd/ofutil.h \
../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdirrec.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrulup.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixseq.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcofsetl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrae.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvras.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
- ../../ofstd/include/dcmtk/ofstd/ofdate.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrds.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrdt.h \
- ../../ofstd/include/dcmtk/ofstd/ofdatime.h \
- ../../ofstd/include/dcmtk/ofstd/oftime.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrur.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlt.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrst.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvruc.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrut.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrobow.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixel.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpobw.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcovlay.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
- ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
- ../include/dcmtk/dcmsr/dsdefine.h ../include/dcmtk/dcmsr/dsrtpltn.h \
- ../include/dcmtk/dcmsr/dsrdoctn.h ../include/dcmtk/dcmsr/dsrtree.h \
- ../include/dcmtk/dcmsr/dsrtncsr.h \
- ../../ofstd/include/dcmtk/ofstd/ofstack.h \
- ../include/dcmtk/dcmsr/dsrposcn.h ../include/dcmtk/dcmsr/dsrtnant.h \
../include/dcmtk/dcmsr/dsrcodvl.h \
../../ofstd/include/dcmtk/ofstd/ofexbl.h \
../include/dcmtk/dcmsr/dsrstpl.h ../include/dcmtk/dcmsr/dsrdoctr.h \
- ../include/dcmtk/dcmsr/dsrdocst.h ../include/dcmtk/dcmsr/dsrcitem.h \
- ../include/dcmtk/dcmsr/dsrnumvl.h ../include/dcmtk/dcmsr/dsrscovl.h \
- ../include/dcmtk/dcmsr/dsrscogr.h ../include/dcmtk/dcmsr/dsrtlist.h \
- ../include/dcmtk/dcmsr/dsrsc3vl.h ../include/dcmtk/dcmsr/dsrsc3gr.h \
- ../include/dcmtk/dcmsr/dsrtcovl.h ../include/dcmtk/dcmsr/dsrtcodt.h \
- ../include/dcmtk/dcmsr/dsrtcosp.h ../include/dcmtk/dcmsr/dsrtcoto.h \
- ../include/dcmtk/dcmsr/dsrcomvl.h ../include/dcmtk/dcmsr/dsrimgvl.h \
- ../include/dcmtk/dcmsr/dsrimgfr.h ../include/dcmtk/dcmsr/dsrimgse.h \
- ../include/dcmtk/dcmsr/dsrwavvl.h ../include/dcmtk/dcmsr/dsrwavch.h \
+ ../include/dcmtk/dcmsr/dsrdocst.h ../include/dcmtk/dcmsr/dsrdncsr.h \
+ ../include/dcmtk/dcmsr/dsrcitem.h ../include/dcmtk/dcmsr/dsrnumvl.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
+ ../include/dcmtk/dcmsr/dsrscovl.h ../include/dcmtk/dcmsr/dsrscogr.h \
+ ../include/dcmtk/dcmsr/dsrtlist.h ../include/dcmtk/dcmsr/dsrsc3vl.h \
+ ../include/dcmtk/dcmsr/dsrsc3gr.h ../include/dcmtk/dcmsr/dsrtcovl.h \
+ ../include/dcmtk/dcmsr/dsrtcodt.h ../include/dcmtk/dcmsr/dsrtcosp.h \
+ ../include/dcmtk/dcmsr/dsrtcoto.h ../include/dcmtk/dcmsr/dsrcomvl.h \
+ ../include/dcmtk/dcmsr/dsrimgvl.h ../include/dcmtk/dcmsr/dsrimgfr.h \
+ ../include/dcmtk/dcmsr/dsrimgse.h ../include/dcmtk/dcmsr/dsrwavvl.h \
+ ../include/dcmtk/dcmsr/dsrwavch.h \
../../ofstd/include/dcmtk/ofstd/ofmem.h ../include/dcmtk/dcmsr/dsrctpl.h \
../include/dcmtk/dcmsr/dsrxmld.h ../include/dcmtk/dcmsr/dsrxmlc.h
dsrtree.o: dsrtree.cc ../../config/include/dcmtk/config/osconfig.h \
../include/dcmtk/dcmsr/dsrtree.h ../include/dcmtk/dcmsr/dsrtypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctk.h \
+ ../include/dcmtk/dcmsr/dsdefine.h \
+ ../../ofstd/include/dcmtk/ofstd/ofdefine.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcast.h \
+ ../../ofstd/include/dcmtk/ofstd/ofexport.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
+ ../../ofstd/include/dcmtk/ofstd/ofthread.h \
+ ../../ofstd/include/dcmtk/ofstd/oftypes.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstream.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstring.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcond.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
../../oflog/include/dcmtk/oflog/oflog.h \
../../oflog/include/dcmtk/oflog/logger.h \
../../oflog/include/dcmtk/oflog/config.h \
- ../../ofstd/include/dcmtk/ofstd/ofdefine.h \
- ../../ofstd/include/dcmtk/ofstd/ofcast.h \
- ../../ofstd/include/dcmtk/ofstd/ofexport.h \
- ../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
../../oflog/include/dcmtk/oflog/config/defines.h \
../../oflog/include/dcmtk/oflog/helpers/threadcf.h \
../../oflog/include/dcmtk/oflog/loglevel.h \
../../ofstd/include/dcmtk/ofstd/ofvector.h \
- ../../ofstd/include/dcmtk/ofstd/oftypes.h \
- ../../ofstd/include/dcmtk/ofstd/ofstream.h \
../../oflog/include/dcmtk/oflog/tstring.h \
- ../../ofstd/include/dcmtk/ofstd/ofstring.h \
../../oflog/include/dcmtk/oflog/tchar.h \
../../oflog/include/dcmtk/oflog/spi/apndatch.h \
../../oflog/include/dcmtk/oflog/appender.h \
@@ -7037,105 +4013,50 @@ dsrtree.o: dsrtree.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofcmdln.h \
../../ofstd/include/dcmtk/ofstd/oflist.h \
../../ofstd/include/dcmtk/ofstd/ofconsol.h \
- ../../ofstd/include/dcmtk/ofstd/ofthread.h \
../../ofstd/include/dcmtk/ofstd/offile.h \
../../ofstd/include/dcmtk/ofstd/ofstd.h \
../../ofstd/include/dcmtk/ofstd/oftraits.h \
- ../../ofstd/include/dcmtk/ofstd/ofcond.h \
../../ofstd/include/dcmtk/ofstd/oflimits.h \
../../config/include/dcmtk/config/arith.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
- ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dctag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \
- ../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdict.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
../../dcmdata/include/dcmtk/dcmdata/dclist.h \
../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcmetinf.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicdir.h \
- ../../ofstd/include/dcmtk/ofstd/ofmap.h \
- ../../ofstd/include/dcmtk/ofstd/ofutil.h \
- ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdirrec.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrulup.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixseq.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcofsetl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrae.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvras.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
- ../../ofstd/include/dcmtk/ofstd/ofdate.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrds.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrdt.h \
- ../../ofstd/include/dcmtk/ofstd/ofdatime.h \
- ../../ofstd/include/dcmtk/ofstd/oftime.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrur.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlt.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrst.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvruc.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrut.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrobow.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixel.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpobw.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcovlay.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
- ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
- ../include/dcmtk/dcmsr/dsdefine.h ../include/dcmtk/dcmsr/dsrtncsr.h \
+ ../include/dcmtk/dcmsr/dsrtncsr.h ../include/dcmtk/dcmsr/dsrposcn.h \
+ ../include/dcmtk/dcmsr/dsrtnant.h \
../../ofstd/include/dcmtk/ofstd/ofstack.h \
- ../include/dcmtk/dcmsr/dsrposcn.h ../include/dcmtk/dcmsr/dsrtnant.h
+ ../../ofstd/include/dcmtk/ofstd/ofutil.h \
+ ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h
dsrtypes.o: dsrtypes.cc ../../config/include/dcmtk/config/osconfig.h \
- ../include/dcmtk/dcmsr/dsrtypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctk.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
- ../../oflog/include/dcmtk/oflog/oflog.h \
- ../../oflog/include/dcmtk/oflog/logger.h \
- ../../oflog/include/dcmtk/oflog/config.h \
+ ../include/dcmtk/dcmsr/dsrtypes.h ../include/dcmtk/dcmsr/dsdefine.h \
../../ofstd/include/dcmtk/ofstd/ofdefine.h \
../../ofstd/include/dcmtk/ofstd/ofcast.h \
../../ofstd/include/dcmtk/ofstd/ofexport.h \
../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
+ ../../ofstd/include/dcmtk/ofstd/ofthread.h \
+ ../../ofstd/include/dcmtk/ofstd/oftypes.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstream.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstring.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcond.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
+ ../../oflog/include/dcmtk/oflog/oflog.h \
+ ../../oflog/include/dcmtk/oflog/logger.h \
+ ../../oflog/include/dcmtk/oflog/config.h \
../../oflog/include/dcmtk/oflog/config/defines.h \
../../oflog/include/dcmtk/oflog/helpers/threadcf.h \
../../oflog/include/dcmtk/oflog/loglevel.h \
../../ofstd/include/dcmtk/ofstd/ofvector.h \
- ../../ofstd/include/dcmtk/ofstd/oftypes.h \
- ../../ofstd/include/dcmtk/ofstd/ofstream.h \
../../oflog/include/dcmtk/oflog/tstring.h \
- ../../ofstd/include/dcmtk/ofstd/ofstring.h \
../../oflog/include/dcmtk/oflog/tchar.h \
../../oflog/include/dcmtk/oflog/spi/apndatch.h \
../../oflog/include/dcmtk/oflog/appender.h \
@@ -7154,92 +4075,32 @@ dsrtypes.o: dsrtypes.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofcmdln.h \
../../ofstd/include/dcmtk/ofstd/oflist.h \
../../ofstd/include/dcmtk/ofstd/ofconsol.h \
- ../../ofstd/include/dcmtk/ofstd/ofthread.h \
../../ofstd/include/dcmtk/ofstd/offile.h \
../../ofstd/include/dcmtk/ofstd/ofstd.h \
../../ofstd/include/dcmtk/ofstd/oftraits.h \
- ../../ofstd/include/dcmtk/ofstd/ofcond.h \
../../ofstd/include/dcmtk/ofstd/oflimits.h \
../../config/include/dcmtk/config/arith.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
- ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dctag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \
- ../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdict.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
../../dcmdata/include/dcmtk/dcmdata/dclist.h \
../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcmetinf.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicdir.h \
- ../../ofstd/include/dcmtk/ofstd/ofmap.h \
+ ../include/dcmtk/dcmsr/dsrtextn.h ../include/dcmtk/dcmsr/dsrdoctn.h \
+ ../include/dcmtk/dcmsr/dsrtree.h ../include/dcmtk/dcmsr/dsrtncsr.h \
+ ../include/dcmtk/dcmsr/dsrposcn.h ../include/dcmtk/dcmsr/dsrtnant.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstack.h \
../../ofstd/include/dcmtk/ofstd/ofutil.h \
../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdirrec.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrulup.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixseq.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcofsetl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrae.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvras.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
- ../../ofstd/include/dcmtk/ofstd/ofdate.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrds.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrdt.h \
- ../../ofstd/include/dcmtk/ofstd/ofdatime.h \
- ../../ofstd/include/dcmtk/ofstd/oftime.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrur.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlt.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrst.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvruc.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrut.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrobow.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixel.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpobw.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcovlay.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
- ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
- ../include/dcmtk/dcmsr/dsdefine.h ../include/dcmtk/dcmsr/dsrtextn.h \
- ../include/dcmtk/dcmsr/dsrdoctn.h ../include/dcmtk/dcmsr/dsrtree.h \
- ../include/dcmtk/dcmsr/dsrtncsr.h \
- ../../ofstd/include/dcmtk/ofstd/ofstack.h \
- ../include/dcmtk/dcmsr/dsrposcn.h ../include/dcmtk/dcmsr/dsrtnant.h \
../include/dcmtk/dcmsr/dsrcodvl.h \
../../ofstd/include/dcmtk/ofstd/ofexbl.h \
../include/dcmtk/dcmsr/dsrstrvl.h ../include/dcmtk/dcmsr/dsrcodtn.h \
../include/dcmtk/dcmsr/dsrnumtn.h ../include/dcmtk/dcmsr/dsrnumvl.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
../include/dcmtk/dcmsr/dsrdtitn.h ../include/dcmtk/dcmsr/dsrdattn.h \
../include/dcmtk/dcmsr/dsrtimtn.h ../include/dcmtk/dcmsr/dsruidtn.h \
../include/dcmtk/dcmsr/dsrpnmtn.h ../include/dcmtk/dcmsr/dsrscotn.h \
@@ -7261,26 +4122,43 @@ dsrtypes.o: dsrtypes.cc ../../config/include/dcmtk/config/osconfig.h \
../include/dcmtk/dcmsr/dsrprocc.h ../include/dcmtk/dcmsr/dsrxrdcc.h \
../include/dcmtk/dcmsr/dsrspecc.h ../include/dcmtk/dcmsr/dsrmaccc.h \
../include/dcmtk/dcmsr/dsrimpcc.h ../include/dcmtk/dcmsr/dsrc3dcc.h \
- ../include/dcmtk/dcmsr/dsrrrdcc.h ../include/dcmtk/dcmsr/dsracqcc.h
+ ../include/dcmtk/dcmsr/dsrrrdcc.h ../include/dcmtk/dcmsr/dsracqcc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
+ ../../ofstd/include/dcmtk/ofstd/ofdate.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrdt.h \
+ ../../ofstd/include/dcmtk/ofstd/ofdatime.h \
+ ../../ofstd/include/dcmtk/ofstd/oftime.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h
dsruidtn.o: dsruidtn.cc ../../config/include/dcmtk/config/osconfig.h \
- ../include/dcmtk/dcmsr/dsrtypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctk.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
- ../../oflog/include/dcmtk/oflog/oflog.h \
- ../../oflog/include/dcmtk/oflog/logger.h \
- ../../oflog/include/dcmtk/oflog/config.h \
+ ../include/dcmtk/dcmsr/dsrtypes.h ../include/dcmtk/dcmsr/dsdefine.h \
../../ofstd/include/dcmtk/ofstd/ofdefine.h \
../../ofstd/include/dcmtk/ofstd/ofcast.h \
../../ofstd/include/dcmtk/ofstd/ofexport.h \
../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
+ ../../ofstd/include/dcmtk/ofstd/ofthread.h \
+ ../../ofstd/include/dcmtk/ofstd/oftypes.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstream.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstring.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcond.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
+ ../../oflog/include/dcmtk/oflog/oflog.h \
+ ../../oflog/include/dcmtk/oflog/logger.h \
+ ../../oflog/include/dcmtk/oflog/config.h \
../../oflog/include/dcmtk/oflog/config/defines.h \
../../oflog/include/dcmtk/oflog/helpers/threadcf.h \
../../oflog/include/dcmtk/oflog/loglevel.h \
../../ofstd/include/dcmtk/ofstd/ofvector.h \
- ../../ofstd/include/dcmtk/ofstd/oftypes.h \
- ../../ofstd/include/dcmtk/ofstd/ofstream.h \
../../oflog/include/dcmtk/oflog/tstring.h \
- ../../ofstd/include/dcmtk/ofstd/ofstring.h \
../../oflog/include/dcmtk/oflog/tchar.h \
../../oflog/include/dcmtk/oflog/spi/apndatch.h \
../../oflog/include/dcmtk/oflog/appender.h \
@@ -7299,111 +4177,59 @@ dsruidtn.o: dsruidtn.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofcmdln.h \
../../ofstd/include/dcmtk/ofstd/oflist.h \
../../ofstd/include/dcmtk/ofstd/ofconsol.h \
- ../../ofstd/include/dcmtk/ofstd/ofthread.h \
../../ofstd/include/dcmtk/ofstd/offile.h \
../../ofstd/include/dcmtk/ofstd/ofstd.h \
../../ofstd/include/dcmtk/ofstd/oftraits.h \
- ../../ofstd/include/dcmtk/ofstd/ofcond.h \
../../ofstd/include/dcmtk/ofstd/oflimits.h \
../../config/include/dcmtk/config/arith.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
- ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dctag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \
- ../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdict.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
../../dcmdata/include/dcmtk/dcmdata/dclist.h \
../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcmetinf.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicdir.h \
- ../../ofstd/include/dcmtk/ofstd/ofmap.h \
+ ../include/dcmtk/dcmsr/dsruidtn.h ../include/dcmtk/dcmsr/dsrdoctn.h \
+ ../include/dcmtk/dcmsr/dsrtree.h ../include/dcmtk/dcmsr/dsrtncsr.h \
+ ../include/dcmtk/dcmsr/dsrposcn.h ../include/dcmtk/dcmsr/dsrtnant.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstack.h \
../../ofstd/include/dcmtk/ofstd/ofutil.h \
../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdirrec.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrulup.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixseq.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcofsetl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrae.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvras.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
- ../../ofstd/include/dcmtk/ofstd/ofdate.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrds.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrdt.h \
- ../../ofstd/include/dcmtk/ofstd/ofdatime.h \
- ../../ofstd/include/dcmtk/ofstd/oftime.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrur.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlt.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrst.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvruc.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrut.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrobow.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixel.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpobw.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcovlay.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
- ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
- ../include/dcmtk/dcmsr/dsdefine.h ../include/dcmtk/dcmsr/dsruidtn.h \
- ../include/dcmtk/dcmsr/dsrdoctn.h ../include/dcmtk/dcmsr/dsrtree.h \
- ../include/dcmtk/dcmsr/dsrtncsr.h \
- ../../ofstd/include/dcmtk/ofstd/ofstack.h \
- ../include/dcmtk/dcmsr/dsrposcn.h ../include/dcmtk/dcmsr/dsrtnant.h \
../include/dcmtk/dcmsr/dsrcodvl.h \
../../ofstd/include/dcmtk/ofstd/ofexbl.h \
../include/dcmtk/dcmsr/dsrstrvl.h ../include/dcmtk/dcmsr/dsrxmld.h \
- ../include/dcmtk/dcmsr/dsrxmlc.h
+ ../include/dcmtk/dcmsr/dsrxmlc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h
dsrwavch.o: dsrwavch.cc ../../config/include/dcmtk/config/osconfig.h \
../include/dcmtk/dcmsr/dsrwavch.h ../include/dcmtk/dcmsr/dsrtypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctk.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
- ../../oflog/include/dcmtk/oflog/oflog.h \
- ../../oflog/include/dcmtk/oflog/logger.h \
- ../../oflog/include/dcmtk/oflog/config.h \
+ ../include/dcmtk/dcmsr/dsdefine.h \
../../ofstd/include/dcmtk/ofstd/ofdefine.h \
../../ofstd/include/dcmtk/ofstd/ofcast.h \
../../ofstd/include/dcmtk/ofstd/ofexport.h \
../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
+ ../../ofstd/include/dcmtk/ofstd/ofthread.h \
+ ../../ofstd/include/dcmtk/ofstd/oftypes.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstream.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstring.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcond.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
+ ../../oflog/include/dcmtk/oflog/oflog.h \
+ ../../oflog/include/dcmtk/oflog/logger.h \
+ ../../oflog/include/dcmtk/oflog/config.h \
../../oflog/include/dcmtk/oflog/config/defines.h \
../../oflog/include/dcmtk/oflog/helpers/threadcf.h \
../../oflog/include/dcmtk/oflog/loglevel.h \
../../ofstd/include/dcmtk/ofstd/ofvector.h \
- ../../ofstd/include/dcmtk/ofstd/oftypes.h \
- ../../ofstd/include/dcmtk/ofstd/ofstream.h \
../../oflog/include/dcmtk/oflog/tstring.h \
- ../../ofstd/include/dcmtk/ofstd/ofstring.h \
../../oflog/include/dcmtk/oflog/tchar.h \
../../oflog/include/dcmtk/oflog/spi/apndatch.h \
../../oflog/include/dcmtk/oflog/appender.h \
@@ -7422,104 +4248,49 @@ dsrwavch.o: dsrwavch.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofcmdln.h \
../../ofstd/include/dcmtk/ofstd/oflist.h \
../../ofstd/include/dcmtk/ofstd/ofconsol.h \
- ../../ofstd/include/dcmtk/ofstd/ofthread.h \
../../ofstd/include/dcmtk/ofstd/offile.h \
../../ofstd/include/dcmtk/ofstd/ofstd.h \
../../ofstd/include/dcmtk/ofstd/oftraits.h \
- ../../ofstd/include/dcmtk/ofstd/ofcond.h \
../../ofstd/include/dcmtk/ofstd/oflimits.h \
../../config/include/dcmtk/config/arith.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
- ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dctag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \
- ../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdict.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
../../dcmdata/include/dcmtk/dcmdata/dclist.h \
../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcmetinf.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicdir.h \
- ../../ofstd/include/dcmtk/ofstd/ofmap.h \
- ../../ofstd/include/dcmtk/ofstd/ofutil.h \
- ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdirrec.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrulup.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixseq.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcofsetl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrae.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvras.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
- ../../ofstd/include/dcmtk/ofstd/ofdate.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrds.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrdt.h \
- ../../ofstd/include/dcmtk/ofstd/ofdatime.h \
- ../../ofstd/include/dcmtk/ofstd/oftime.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrur.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlt.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrst.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvruc.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrut.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrobow.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixel.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpobw.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcovlay.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
- ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
- ../include/dcmtk/dcmsr/dsdefine.h ../include/dcmtk/dcmsr/dsrtlist.h \
- ../include/dcmtk/dcmsr/dsrxmld.h ../include/dcmtk/dcmsr/dsrxmlc.h
+ ../include/dcmtk/dcmsr/dsrtlist.h ../include/dcmtk/dcmsr/dsrxmld.h \
+ ../include/dcmtk/dcmsr/dsrxmlc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h
dsrwavtn.o: dsrwavtn.cc ../../config/include/dcmtk/config/osconfig.h \
- ../include/dcmtk/dcmsr/dsrtypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctk.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
- ../../oflog/include/dcmtk/oflog/oflog.h \
- ../../oflog/include/dcmtk/oflog/logger.h \
- ../../oflog/include/dcmtk/oflog/config.h \
+ ../include/dcmtk/dcmsr/dsrtypes.h ../include/dcmtk/dcmsr/dsdefine.h \
../../ofstd/include/dcmtk/ofstd/ofdefine.h \
../../ofstd/include/dcmtk/ofstd/ofcast.h \
../../ofstd/include/dcmtk/ofstd/ofexport.h \
../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
+ ../../ofstd/include/dcmtk/ofstd/ofthread.h \
+ ../../ofstd/include/dcmtk/ofstd/oftypes.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstream.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstring.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcond.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
+ ../../oflog/include/dcmtk/oflog/oflog.h \
+ ../../oflog/include/dcmtk/oflog/logger.h \
+ ../../oflog/include/dcmtk/oflog/config.h \
../../oflog/include/dcmtk/oflog/config/defines.h \
../../oflog/include/dcmtk/oflog/helpers/threadcf.h \
../../oflog/include/dcmtk/oflog/loglevel.h \
../../ofstd/include/dcmtk/ofstd/ofvector.h \
- ../../ofstd/include/dcmtk/ofstd/oftypes.h \
- ../../ofstd/include/dcmtk/ofstd/ofstream.h \
../../oflog/include/dcmtk/oflog/tstring.h \
- ../../ofstd/include/dcmtk/ofstd/ofstring.h \
../../oflog/include/dcmtk/oflog/tchar.h \
../../oflog/include/dcmtk/oflog/spi/apndatch.h \
../../oflog/include/dcmtk/oflog/appender.h \
@@ -7538,112 +4309,58 @@ dsrwavtn.o: dsrwavtn.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofcmdln.h \
../../ofstd/include/dcmtk/ofstd/oflist.h \
../../ofstd/include/dcmtk/ofstd/ofconsol.h \
- ../../ofstd/include/dcmtk/ofstd/ofthread.h \
../../ofstd/include/dcmtk/ofstd/offile.h \
../../ofstd/include/dcmtk/ofstd/ofstd.h \
../../ofstd/include/dcmtk/ofstd/oftraits.h \
- ../../ofstd/include/dcmtk/ofstd/ofcond.h \
../../ofstd/include/dcmtk/ofstd/oflimits.h \
../../config/include/dcmtk/config/arith.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
- ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dctag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \
- ../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdict.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
../../dcmdata/include/dcmtk/dcmdata/dclist.h \
../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcmetinf.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicdir.h \
- ../../ofstd/include/dcmtk/ofstd/ofmap.h \
+ ../include/dcmtk/dcmsr/dsrwavtn.h ../include/dcmtk/dcmsr/dsrdoctn.h \
+ ../include/dcmtk/dcmsr/dsrtree.h ../include/dcmtk/dcmsr/dsrtncsr.h \
+ ../include/dcmtk/dcmsr/dsrposcn.h ../include/dcmtk/dcmsr/dsrtnant.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstack.h \
../../ofstd/include/dcmtk/ofstd/ofutil.h \
../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdirrec.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrulup.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixseq.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcofsetl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrae.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvras.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
- ../../ofstd/include/dcmtk/ofstd/ofdate.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrds.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrdt.h \
- ../../ofstd/include/dcmtk/ofstd/ofdatime.h \
- ../../ofstd/include/dcmtk/ofstd/oftime.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrur.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlt.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrst.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvruc.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrut.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrobow.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixel.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpobw.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcovlay.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
- ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
- ../include/dcmtk/dcmsr/dsdefine.h ../include/dcmtk/dcmsr/dsrwavtn.h \
- ../include/dcmtk/dcmsr/dsrdoctn.h ../include/dcmtk/dcmsr/dsrtree.h \
- ../include/dcmtk/dcmsr/dsrtncsr.h \
- ../../ofstd/include/dcmtk/ofstd/ofstack.h \
- ../include/dcmtk/dcmsr/dsrposcn.h ../include/dcmtk/dcmsr/dsrtnant.h \
../include/dcmtk/dcmsr/dsrcodvl.h \
../../ofstd/include/dcmtk/ofstd/ofexbl.h \
../include/dcmtk/dcmsr/dsrwavvl.h ../include/dcmtk/dcmsr/dsrcomvl.h \
../include/dcmtk/dcmsr/dsrwavch.h ../include/dcmtk/dcmsr/dsrtlist.h \
- ../include/dcmtk/dcmsr/dsrxmld.h ../include/dcmtk/dcmsr/dsrxmlc.h
+ ../include/dcmtk/dcmsr/dsrxmld.h ../include/dcmtk/dcmsr/dsrxmlc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h
dsrwavvl.o: dsrwavvl.cc ../../config/include/dcmtk/config/osconfig.h \
../include/dcmtk/dcmsr/dsrwavvl.h ../include/dcmtk/dcmsr/dsrtypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctk.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
- ../../oflog/include/dcmtk/oflog/oflog.h \
- ../../oflog/include/dcmtk/oflog/logger.h \
- ../../oflog/include/dcmtk/oflog/config.h \
+ ../include/dcmtk/dcmsr/dsdefine.h \
../../ofstd/include/dcmtk/ofstd/ofdefine.h \
../../ofstd/include/dcmtk/ofstd/ofcast.h \
../../ofstd/include/dcmtk/ofstd/ofexport.h \
../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
+ ../../ofstd/include/dcmtk/ofstd/ofthread.h \
+ ../../ofstd/include/dcmtk/ofstd/oftypes.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstream.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstring.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcond.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
+ ../../oflog/include/dcmtk/oflog/oflog.h \
+ ../../oflog/include/dcmtk/oflog/logger.h \
+ ../../oflog/include/dcmtk/oflog/config.h \
../../oflog/include/dcmtk/oflog/config/defines.h \
../../oflog/include/dcmtk/oflog/helpers/threadcf.h \
../../oflog/include/dcmtk/oflog/loglevel.h \
../../ofstd/include/dcmtk/ofstd/ofvector.h \
- ../../ofstd/include/dcmtk/ofstd/oftypes.h \
- ../../ofstd/include/dcmtk/ofstd/ofstream.h \
../../oflog/include/dcmtk/oflog/tstring.h \
- ../../ofstd/include/dcmtk/ofstd/ofstring.h \
../../oflog/include/dcmtk/oflog/tchar.h \
../../oflog/include/dcmtk/oflog/spi/apndatch.h \
../../oflog/include/dcmtk/oflog/appender.h \
@@ -7662,115 +4379,58 @@ dsrwavvl.o: dsrwavvl.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofcmdln.h \
../../ofstd/include/dcmtk/ofstd/oflist.h \
../../ofstd/include/dcmtk/ofstd/ofconsol.h \
- ../../ofstd/include/dcmtk/ofstd/ofthread.h \
../../ofstd/include/dcmtk/ofstd/offile.h \
../../ofstd/include/dcmtk/ofstd/ofstd.h \
../../ofstd/include/dcmtk/ofstd/oftraits.h \
- ../../ofstd/include/dcmtk/ofstd/ofcond.h \
../../ofstd/include/dcmtk/ofstd/oflimits.h \
../../config/include/dcmtk/config/arith.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
- ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dctag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \
- ../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdict.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
../../dcmdata/include/dcmtk/dcmdata/dclist.h \
../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcmetinf.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicdir.h \
- ../../ofstd/include/dcmtk/ofstd/ofmap.h \
- ../../ofstd/include/dcmtk/ofstd/ofutil.h \
- ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdirrec.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrulup.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixseq.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcofsetl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrae.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvras.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
- ../../ofstd/include/dcmtk/ofstd/ofdate.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrds.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrdt.h \
- ../../ofstd/include/dcmtk/ofstd/ofdatime.h \
- ../../ofstd/include/dcmtk/ofstd/oftime.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrur.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlt.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrst.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvruc.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrut.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrobow.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixel.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpobw.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcovlay.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
- ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
- ../include/dcmtk/dcmsr/dsdefine.h ../include/dcmtk/dcmsr/dsrcomvl.h \
- ../include/dcmtk/dcmsr/dsrwavch.h ../include/dcmtk/dcmsr/dsrtlist.h \
- ../include/dcmtk/dcmsr/dsrxmld.h ../include/dcmtk/dcmsr/dsrxmlc.h
-dsrxmlc.o: dsrxmlc.cc ../../config/include/dcmtk/config/osconfig.h \
+ ../include/dcmtk/dcmsr/dsrcomvl.h ../include/dcmtk/dcmsr/dsrwavch.h \
+ ../include/dcmtk/dcmsr/dsrtlist.h ../include/dcmtk/dcmsr/dsrxmld.h \
../include/dcmtk/dcmsr/dsrxmlc.h \
- ../../ofstd/include/dcmtk/ofstd/oftypes.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h
+dsrxmlc.o: dsrxmlc.cc ../../config/include/dcmtk/config/osconfig.h \
+ ../include/dcmtk/dcmsr/dsrxmlc.h ../include/dcmtk/dcmsr/dsdefine.h \
../../ofstd/include/dcmtk/ofstd/ofdefine.h \
../../ofstd/include/dcmtk/ofstd/ofcast.h \
../../ofstd/include/dcmtk/ofstd/ofexport.h \
../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
- ../../ofstd/include/dcmtk/ofstd/ofstream.h \
- ../include/dcmtk/dcmsr/dsdefine.h
+ ../../ofstd/include/dcmtk/ofstd/oftypes.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstream.h
dsrxmld.o: dsrxmld.cc ../../config/include/dcmtk/config/osconfig.h \
- ../include/dcmtk/dcmsr/dsrxmld.h \
+ ../include/dcmtk/dcmsr/dsrxmld.h ../include/dcmtk/dcmsr/dsrtypes.h \
+ ../include/dcmtk/dcmsr/dsdefine.h \
+ ../../ofstd/include/dcmtk/ofstd/ofdefine.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcast.h \
+ ../../ofstd/include/dcmtk/ofstd/ofexport.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
+ ../../ofstd/include/dcmtk/ofstd/ofthread.h \
+ ../../ofstd/include/dcmtk/ofstd/oftypes.h \
../../ofstd/include/dcmtk/ofstd/ofstream.h \
- ../include/dcmtk/dcmsr/dsrtypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctk.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstring.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcond.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
../../oflog/include/dcmtk/oflog/oflog.h \
../../oflog/include/dcmtk/oflog/logger.h \
../../oflog/include/dcmtk/oflog/config.h \
- ../../ofstd/include/dcmtk/ofstd/ofdefine.h \
- ../../ofstd/include/dcmtk/ofstd/ofcast.h \
- ../../ofstd/include/dcmtk/ofstd/ofexport.h \
- ../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
../../oflog/include/dcmtk/oflog/config/defines.h \
../../oflog/include/dcmtk/oflog/helpers/threadcf.h \
../../oflog/include/dcmtk/oflog/loglevel.h \
../../ofstd/include/dcmtk/ofstd/ofvector.h \
- ../../ofstd/include/dcmtk/ofstd/oftypes.h \
../../oflog/include/dcmtk/oflog/tstring.h \
- ../../ofstd/include/dcmtk/ofstd/ofstring.h \
../../oflog/include/dcmtk/oflog/tchar.h \
../../oflog/include/dcmtk/oflog/spi/apndatch.h \
../../oflog/include/dcmtk/oflog/appender.h \
@@ -7789,104 +4449,47 @@ dsrxmld.o: dsrxmld.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofcmdln.h \
../../ofstd/include/dcmtk/ofstd/oflist.h \
../../ofstd/include/dcmtk/ofstd/ofconsol.h \
- ../../ofstd/include/dcmtk/ofstd/ofthread.h \
../../ofstd/include/dcmtk/ofstd/offile.h \
../../ofstd/include/dcmtk/ofstd/ofstd.h \
../../ofstd/include/dcmtk/ofstd/oftraits.h \
- ../../ofstd/include/dcmtk/ofstd/ofcond.h \
../../ofstd/include/dcmtk/ofstd/oflimits.h \
../../config/include/dcmtk/config/arith.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
- ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dctag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \
- ../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdict.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
../../dcmdata/include/dcmtk/dcmdata/dclist.h \
../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcmetinf.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicdir.h \
- ../../ofstd/include/dcmtk/ofstd/ofmap.h \
- ../../ofstd/include/dcmtk/ofstd/ofutil.h \
- ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdirrec.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrulup.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixseq.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcofsetl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrae.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvras.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
- ../../ofstd/include/dcmtk/ofstd/ofdate.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrds.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrdt.h \
- ../../ofstd/include/dcmtk/ofstd/ofdatime.h \
- ../../ofstd/include/dcmtk/ofstd/oftime.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrur.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlt.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrst.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvruc.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrut.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrobow.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixel.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpobw.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcovlay.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
- ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
- ../include/dcmtk/dcmsr/dsdefine.h ../include/dcmtk/dcmsr/dsrxmlc.h
+ ../include/dcmtk/dcmsr/dsrxmlc.h
dsrxrdcc.o: dsrxrdcc.cc ../../config/include/dcmtk/config/osconfig.h \
../include/dcmtk/dcmsr/dsrxrdcc.h ../include/dcmtk/dcmsr/dsriodcc.h \
- ../include/dcmtk/dcmsr/dsrtypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctk.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
- ../../oflog/include/dcmtk/oflog/oflog.h \
- ../../oflog/include/dcmtk/oflog/logger.h \
- ../../oflog/include/dcmtk/oflog/config.h \
+ ../include/dcmtk/dcmsr/dsrtypes.h ../include/dcmtk/dcmsr/dsdefine.h \
../../ofstd/include/dcmtk/ofstd/ofdefine.h \
../../ofstd/include/dcmtk/ofstd/ofcast.h \
../../ofstd/include/dcmtk/ofstd/ofexport.h \
../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
+ ../../ofstd/include/dcmtk/ofstd/ofthread.h \
+ ../../ofstd/include/dcmtk/ofstd/oftypes.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstream.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstring.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcond.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
+ ../../oflog/include/dcmtk/oflog/oflog.h \
+ ../../oflog/include/dcmtk/oflog/logger.h \
+ ../../oflog/include/dcmtk/oflog/config.h \
../../oflog/include/dcmtk/oflog/config/defines.h \
../../oflog/include/dcmtk/oflog/helpers/threadcf.h \
../../oflog/include/dcmtk/oflog/loglevel.h \
../../ofstd/include/dcmtk/ofstd/ofvector.h \
- ../../ofstd/include/dcmtk/ofstd/oftypes.h \
- ../../ofstd/include/dcmtk/ofstd/ofstream.h \
../../oflog/include/dcmtk/oflog/tstring.h \
- ../../ofstd/include/dcmtk/ofstd/ofstring.h \
../../oflog/include/dcmtk/oflog/tchar.h \
../../oflog/include/dcmtk/oflog/spi/apndatch.h \
../../oflog/include/dcmtk/oflog/appender.h \
@@ -7905,81 +4508,16 @@ dsrxrdcc.o: dsrxrdcc.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofcmdln.h \
../../ofstd/include/dcmtk/ofstd/oflist.h \
../../ofstd/include/dcmtk/ofstd/ofconsol.h \
- ../../ofstd/include/dcmtk/ofstd/ofthread.h \
../../ofstd/include/dcmtk/ofstd/offile.h \
../../ofstd/include/dcmtk/ofstd/ofstd.h \
../../ofstd/include/dcmtk/ofstd/oftraits.h \
- ../../ofstd/include/dcmtk/ofstd/ofcond.h \
../../ofstd/include/dcmtk/ofstd/oflimits.h \
../../config/include/dcmtk/config/arith.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
- ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dctag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \
- ../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdict.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
../../dcmdata/include/dcmtk/dcmdata/dclist.h \
../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcmetinf.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicdir.h \
- ../../ofstd/include/dcmtk/ofstd/ofmap.h \
- ../../ofstd/include/dcmtk/ofstd/ofutil.h \
- ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdirrec.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrulup.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixseq.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcofsetl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrae.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvras.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
- ../../ofstd/include/dcmtk/ofstd/ofdate.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrds.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrdt.h \
- ../../ofstd/include/dcmtk/ofstd/ofdatime.h \
- ../../ofstd/include/dcmtk/ofstd/oftime.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrur.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlt.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrst.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvruc.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrut.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrobow.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixel.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpobw.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcovlay.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
- ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
- ../include/dcmtk/dcmsr/dsdefine.h
+ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h
diff --git a/dcmsr/libsrc/Makefile.in b/dcmsr/libsrc/Makefile.in
index f62d6a1..318eab2 100644
--- a/dcmsr/libsrc/Makefile.in
+++ b/dcmsr/libsrc/Makefile.in
@@ -22,14 +22,14 @@ LOCALINCLUDES = -I$(ofstddir)/include -I$(oflogdir)/include -I$(dcmdatadir)/incl
-I$(dcmimgledir)/include -I$(dcmimagedir)/include
LOCALDEFS =
-objs = dsrdoc.o dsrposcn.o dsrtree.o dsrdoctn.o dsrdoctr.o dsrdocst.o \
- dsrctpl.o dsrrtpl.o dsrstpl.o dsrctxgr.o dsrcitem.o dsrtypes.o \
- dsrimgfr.o dsrimgse.o dsrscogr.o dsrsc3gr.o dsrtcodt.o dsrtcosp.o \
- dsrtcoto.o dsrwavch.o dsrstrvl.o dsrcodvl.o dsrnumvl.o dsrscovl.o \
- dsrsc3vl.o dsrtcovl.o dsrcomvl.o dsrimgvl.o dsrwavvl.o dsrtextn.o \
- dsrcodtn.o dsrnumtn.o dsrdtitn.o dsrdattn.o dsrtimtn.o dsruidtn.o \
- dsrpnmtn.o dsrscotn.o dsrsc3tn.o dsrtcotn.o dsrcomtn.o dsrimgtn.o \
- dsrwavtn.o dsrcontn.o dsrreftn.o dsrtpltn.o \
+objs = dsrdoc.o dsrposcn.o dsrdncsr.o dsrtree.o dsrdoctn.o dsrdoctr.o \
+ dsrdocst.o dsrctpl.o dsrrtpl.o dsrstpl.o dsrctxgr.o dsrcitem.o \
+ dsrtypes.o dsrimgfr.o dsrimgse.o dsrscogr.o dsrsc3gr.o dsrtcodt.o \
+ dsrtcosp.o dsrtcoto.o dsrwavch.o dsrstrvl.o dsrcodvl.o dsrnumvl.o \
+ dsrscovl.o dsrsc3vl.o dsrtcovl.o dsrcomvl.o dsrimgvl.o dsrwavvl.o \
+ dsrtextn.o dsrcodtn.o dsrnumtn.o dsrdtitn.o dsrdattn.o dsrtimtn.o \
+ dsruidtn.o dsrpnmtn.o dsrscotn.o dsrsc3tn.o dsrtcotn.o dsrcomtn.o \
+ dsrimgtn.o dsrwavtn.o dsrcontn.o dsrreftn.o dsrtpltn.o \
dsrsoprf.o dsrrefin.o dsrcsidl.o dsrxmlc.o dsrxmld.o \
dsriodcc.o dsrbascc.o dsrenhcc.o dsrcomcc.o dsrkeycc.o dsrmamcc.o \
dsrchecc.o dsrcolcc.o dsrprocc.o dsrxrdcc.o dsrspecc.o dsrmaccc.o \
diff --git a/dcmsr/libsrc/dsrcodtn.cc b/dcmsr/libsrc/dsrcodtn.cc
index cffcd38..34a0d28 100644
--- a/dcmsr/libsrc/dsrcodtn.cc
+++ b/dcmsr/libsrc/dsrcodtn.cc
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2000-2015, OFFIS e.V.
+ * Copyright (C) 2000-2016, OFFIS e.V.
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation were developed by
@@ -27,6 +27,8 @@
#include "dcmtk/dcmsr/dsrcodtn.h"
#include "dcmtk/dcmsr/dsrxmld.h"
+#include "dcmtk/dcmdata/dcdeftag.h"
+
DSRCodeTreeNode::DSRCodeTreeNode(const E_RelationshipType relationshipType)
: DSRDocumentTreeNode(relationshipType, VT_Code),
diff --git a/dcmsr/libsrc/dsrcodvl.cc b/dcmsr/libsrc/dsrcodvl.cc
index bb0171a..45e3a3e 100644
--- a/dcmsr/libsrc/dsrcodvl.cc
+++ b/dcmsr/libsrc/dsrcodvl.cc
@@ -27,6 +27,15 @@
#include "dcmtk/dcmsr/dsrcodvl.h"
#include "dcmtk/dcmsr/dsrxmld.h"
+#include "dcmtk/dcmdata/dcdeftag.h"
+#include "dcmtk/dcmdata/dcvrcs.h"
+#include "dcmtk/dcmdata/dcvrdt.h"
+#include "dcmtk/dcmdata/dcvrlo.h"
+#include "dcmtk/dcmdata/dcvrsh.h"
+#include "dcmtk/dcmdata/dcvruc.h"
+#include "dcmtk/dcmdata/dcvrui.h"
+#include "dcmtk/dcmdata/dcvrur.h"
+
// implementation of class DSRBasicCodedEntry
diff --git a/dcmsr/libsrc/dsrcomtn.cc b/dcmsr/libsrc/dsrcomtn.cc
index 42bb4af..b6fd5ec 100644
--- a/dcmsr/libsrc/dsrcomtn.cc
+++ b/dcmsr/libsrc/dsrcomtn.cc
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2000-2015, OFFIS e.V.
+ * Copyright (C) 2000-2016, OFFIS e.V.
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation were developed by
@@ -27,6 +27,7 @@
#include "dcmtk/dcmsr/dsrcomtn.h"
#include "dcmtk/dcmsr/dsrxmld.h"
+#include "dcmtk/dcmdata/dcdeftag.h"
#include "dcmtk/dcmdata/dcuid.h"
diff --git a/dcmsr/libsrc/dsrcomvl.cc b/dcmsr/libsrc/dsrcomvl.cc
index e03a84f..2635280 100644
--- a/dcmsr/libsrc/dsrcomvl.cc
+++ b/dcmsr/libsrc/dsrcomvl.cc
@@ -27,6 +27,10 @@
#include "dcmtk/dcmsr/dsrcomvl.h"
#include "dcmtk/dcmsr/dsrxmld.h"
+#include "dcmtk/dcmdata/dcdeftag.h"
+#include "dcmtk/dcmdata/dcuid.h"
+#include "dcmtk/dcmdata/dcvrui.h"
+
DSRCompositeReferenceValue::DSRCompositeReferenceValue()
: SOPClassUID(),
diff --git a/dcmsr/libsrc/dsrcontn.cc b/dcmsr/libsrc/dsrcontn.cc
index 798308e..2aef16e 100644
--- a/dcmsr/libsrc/dsrcontn.cc
+++ b/dcmsr/libsrc/dsrcontn.cc
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2000-2015, OFFIS e.V.
+ * Copyright (C) 2000-2016, OFFIS e.V.
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation were developed by
@@ -27,6 +27,8 @@
#include "dcmtk/dcmsr/dsrcontn.h"
#include "dcmtk/dcmsr/dsrxmld.h"
+#include "dcmtk/dcmdata/dcdeftag.h"
+
DSRContainerTreeNode::DSRContainerTreeNode(const E_RelationshipType relationshipType,
const E_ContinuityOfContent continuityOfContent)
diff --git a/dcmsr/libsrc/dsrcsidl.cc b/dcmsr/libsrc/dsrcsidl.cc
index 8f6f663..73f895f 100644
--- a/dcmsr/libsrc/dsrcsidl.cc
+++ b/dcmsr/libsrc/dsrcsidl.cc
@@ -26,10 +26,19 @@
#include "dcmtk/dcmsr/dsrcsidl.h"
#include "dcmtk/dcmsr/dsrxmld.h"
+#include "dcmtk/dcmdata/dcdeftag.h"
+#include "dcmtk/dcmdata/dcuid.h"
+#include "dcmtk/dcmdata/dcvrcs.h"
+#include "dcmtk/dcmdata/dcvrlo.h"
+#include "dcmtk/dcmdata/dcvrsh.h"
+#include "dcmtk/dcmdata/dcvrst.h"
+#include "dcmtk/dcmdata/dcvrui.h"
+
DSRCodingSchemeIdentificationList::DSRCodingSchemeIdentificationList()
: ItemList(),
- Iterator()
+ Iterator(),
+ SpecificCharacterSet()
{
/* initialize list cursor */
Iterator = ItemList.end();
@@ -56,6 +65,8 @@ void DSRCodingSchemeIdentificationList::clear()
/* make sure that the list is empty */
ItemList.clear();
Iterator = ItemList.end();
+ /* also clear other members */
+ SpecificCharacterSet.clear();
}
@@ -219,6 +230,16 @@ OFCondition DSRCodingSchemeIdentificationList::writeXML(STD_NAMESPACE ostream &s
}
+OFCondition DSRCodingSchemeIdentificationList::setSpecificCharacterSet(const OFString &value,
+ const OFBool check)
+{
+ OFCondition result = (check) ? DcmCodeString::checkStringValue(value, "1-n") : EC_Normal;
+ if (result.good())
+ SpecificCharacterSet = value;
+ return result;
+}
+
+
OFCondition DSRCodingSchemeIdentificationList::addPrivateDcmtkCodingScheme()
{
/* add private coding scheme (if not already existent) */
@@ -272,7 +293,7 @@ OFCondition DSRCodingSchemeIdentificationList::addItem(const OFString &codingSch
else if (check)
{
/* check whether the passed value is valid */
- result = DcmShortString::checkStringValue(codingSchemeDesignator, "1");
+ result = DcmShortString::checkStringValue(codingSchemeDesignator, "1", SpecificCharacterSet);
}
if (result.good())
{
@@ -297,13 +318,13 @@ OFCondition DSRCodingSchemeIdentificationList::addItem(const OFString &codingSch
else if (check)
{
/* check whether the passed values are valid */
- result = DcmShortString::checkStringValue(codingSchemeDesignator, "1");
+ result = DcmShortString::checkStringValue(codingSchemeDesignator, "1", SpecificCharacterSet);
if (result.good())
result = DcmUniqueIdentifier::checkStringValue(codingSchemeUID, "1");
if (result.good())
- result = DcmShortText::checkStringValue(codingSchemeName);
+ result = DcmShortText::checkStringValue(codingSchemeName, SpecificCharacterSet);
if (result.good())
- result = DcmShortText::checkStringValue(responsibleOrganization);
+ result = DcmShortText::checkStringValue(responsibleOrganization, SpecificCharacterSet);
}
if (result.good())
{
@@ -516,7 +537,7 @@ OFCondition DSRCodingSchemeIdentificationList::setCodingSchemeRegistry(const OFS
if (item != NULL)
{
/* set the value (if valid) */
- result = (check) ? DcmLongString::checkStringValue(value, "1") : EC_Normal;
+ result = (check) ? DcmLongString::checkStringValue(value, "1", SpecificCharacterSet) : EC_Normal;
if (result.good())
item->CodingSchemeRegistry = value;
}
@@ -550,7 +571,7 @@ OFCondition DSRCodingSchemeIdentificationList::setCodingSchemeExternalID(const O
if (item != NULL)
{
/* set the value (if valid) */
- result = (check) ? DcmShortText::checkStringValue(value) : EC_Normal;
+ result = (check) ? DcmShortText::checkStringValue(value, SpecificCharacterSet) : EC_Normal;
if (result.good())
item->CodingSchemeExternalID = value;
}
@@ -567,7 +588,7 @@ OFCondition DSRCodingSchemeIdentificationList::setCodingSchemeName(const OFStrin
if (item != NULL)
{
/* set the value (if valid) */
- result = (check) ? DcmShortText::checkStringValue(value) : EC_Normal;
+ result = (check) ? DcmShortText::checkStringValue(value, SpecificCharacterSet) : EC_Normal;
if (result.good())
item->CodingSchemeName = value;
}
@@ -584,7 +605,7 @@ OFCondition DSRCodingSchemeIdentificationList::setCodingSchemeVersion(const OFSt
if (item != NULL)
{
/* set the value (if valid) */
- result = (check) ? DcmShortString::checkStringValue(value, "1") : EC_Normal;
+ result = (check) ? DcmShortString::checkStringValue(value, "1", SpecificCharacterSet) : EC_Normal;
if (result.good())
item->CodingSchemeVersion = value;
}
@@ -601,7 +622,7 @@ OFCondition DSRCodingSchemeIdentificationList::setCodingSchemeResponsibleOrganiz
if (item != NULL)
{
/* set the value (if valid) */
- result = (check) ? DcmShortText::checkStringValue(value) : EC_Normal;
+ result = (check) ? DcmShortText::checkStringValue(value, SpecificCharacterSet) : EC_Normal;
if (result.good())
item->CodingSchemeResponsibleOrganization = value;
}
diff --git a/dcmsr/libsrc/dsrctpl.cc b/dcmsr/libsrc/dsrctpl.cc
index 95653f2..9da1b43 100644
--- a/dcmsr/libsrc/dsrctpl.cc
+++ b/dcmsr/libsrc/dsrctpl.cc
@@ -26,6 +26,9 @@
#include "dcmtk/dcmsr/dsrctpl.h"
#include "dcmtk/dcmsr/dsrdocst.h"
+#include "dcmtk/dcmdata/dcvrcs.h"
+#include "dcmtk/dcmdata/dcvrui.h"
+
DSRTemplateCommon::DSRTemplateCommon(const OFString &templateIdentifier,
const OFString &mappingResource,
diff --git a/dcmsr/libsrc/dsrdattn.cc b/dcmsr/libsrc/dsrdattn.cc
index c2b9ce2..b6bd87e 100644
--- a/dcmsr/libsrc/dsrdattn.cc
+++ b/dcmsr/libsrc/dsrdattn.cc
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2000-2015, OFFIS e.V.
+ * Copyright (C) 2000-2016, OFFIS e.V.
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation were developed by
@@ -27,6 +27,9 @@
#include "dcmtk/dcmsr/dsrdattn.h"
#include "dcmtk/dcmsr/dsrxmld.h"
+#include "dcmtk/dcmdata/dcdeftag.h"
+#include "dcmtk/dcmdata/dcvrda.h"
+
DSRDateTreeNode::DSRDateTreeNode(const E_RelationshipType relationshipType)
: DSRDocumentTreeNode(relationshipType, VT_Date),
diff --git a/dcmsr/libsrc/dsrdncsr.cc b/dcmsr/libsrc/dsrdncsr.cc
new file mode 100644
index 0000000..172add7
--- /dev/null
+++ b/dcmsr/libsrc/dsrdncsr.cc
@@ -0,0 +1,155 @@
+/*
+ *
+ * Copyright (C) 2016, J. Riesmeier, Oldenburg, Germany
+ * All rights reserved. See COPYRIGHT file for details.
+ *
+ * This software and supporting documentation are maintained by
+ *
+ * OFFIS e.V.
+ * R&D Division Health
+ * Escherweg 2
+ * D-26121 Oldenburg, Germany
+ *
+ *
+ * Module: dcmsr
+ *
+ * Author: Joerg Riesmeier
+ *
+ * Purpose:
+ * classes: specialization of DSRTreeNodeCursor (= DSRIncludedTemplateNodeCursor)
+ *
+ */
+
+
+#include "dcmtk/config/osconfig.h" /* make sure OS specific configuration is included first */
+
+#include "dcmtk/dcmsr/dsrdncsr.h"
+#include "dcmtk/dcmsr/dsrdoctn.h"
+#include "dcmtk/dcmsr/dsrtpltn.h"
+#include "dcmtk/dcmsr/dsrstpl.h"
+
+
+DCMTK_EXPLICIT_SPECIALIZATION
+const DSRDocumentTreeNode *DSRTreeNodeCursor<DSRDocumentTreeNode, OFTrue>::getChildNode() const
+{
+ DSRDocumentTreeNode *node = NULL;
+ if (NodeCursor != NULL)
+ {
+ /* check for special case "included template" */
+ if (NodeCursor->getValueType() == DSRTypes::VT_includedTemplate)
+ {
+ DSRSubTemplate *subTempl = OFstatic_cast(DSRIncludedTemplateTreeNode *, NodeCursor)->getValue().get();
+ if (subTempl != NULL)
+ {
+ /* get root node of referenced subtree */
+ node = subTempl->getRoot();
+ }
+ } else {
+ /* standard case */
+ node = NodeCursor->getDown();
+ }
+ }
+ return node;
+}
+
+
+DCMTK_EXPLICIT_SPECIALIZATION
+size_t DSRTreeNodeCursor<DSRDocumentTreeNode, OFTrue>::countChildNodes(const OFBool searchIntoSub) const
+{
+ size_t count = 0;
+ if (NodeCursor != NULL)
+ {
+ /* do we have any children at all? */
+ DSRTreeNodeCursor<DSRDocumentTreeNode, OFTrue> cursor(*this);
+ if (cursor.goDown())
+ {
+ /* iterate over all child nodes */
+ do {
+ ++count;
+ } while (cursor.iterate(searchIntoSub));
+ }
+ }
+ return count;
+}
+
+
+DCMTK_EXPLICIT_SPECIALIZATION
+size_t DSRTreeNodeCursor<DSRDocumentTreeNode, OFTrue>::goDown()
+{
+ size_t nodeID = 0;
+ if (NodeCursor != NULL)
+ {
+ /* check for special case "included template" */
+ if (NodeCursor->getValueType() == DSRTypes::VT_includedTemplate)
+ {
+ DSRSubTemplate *subTempl = OFstatic_cast(DSRIncludedTemplateTreeNode *, NodeCursor)->getValue().get();
+ if (subTempl != NULL)
+ {
+ NodeCursorStack.push(NodeCursor);
+ /* go to root node of referenced subtree */
+ NodeCursor = subTempl->getRoot();
+ nodeID = NodeCursor->getIdent();
+ Position.goDown();
+ }
+ }
+ /* standard case */
+ else if (NodeCursor->getDown() != NULL)
+ {
+ NodeCursorStack.push(NodeCursor);
+ NodeCursor = NodeCursor->getDown();
+ nodeID = NodeCursor->getIdent();
+ Position.goDown();
+ }
+ }
+ return nodeID;
+}
+
+
+DCMTK_EXPLICIT_SPECIALIZATION
+size_t DSRTreeNodeCursor<DSRDocumentTreeNode, OFTrue>::iterate(const OFBool searchIntoSub)
+{
+ size_t nodeID = 0;
+ if (NodeCursor != NULL)
+ {
+ /* perform "deep search", if specified */
+ if (searchIntoSub && hasChildNodes())
+ nodeID = goDown();
+ else if (NodeCursor->getNext() != NULL)
+ {
+ NodeCursor = NodeCursor->getNext();
+ nodeID = NodeCursor->getIdent();
+ /* check for special case: do not count "included template" nodes? */
+ if ((NodeCursor->getValueType() != DSRTypes::VT_includedTemplate) || !(Position.getFlags() & DSRTypes::PF_dontCountIncludedTemplateNodes))
+ ++Position;
+ }
+ else if (searchIntoSub && !NodeCursorStack.empty())
+ {
+ do {
+ if (!NodeCursorStack.empty())
+ {
+ NodeCursor = NodeCursorStack.top();
+ NodeCursorStack.pop();
+ Position.goUp();
+ } else
+ NodeCursor = NULL;
+ } while ((NodeCursor != NULL) && (NodeCursor->getNext() == NULL));
+ if (NodeCursor != NULL)
+ {
+ if (NodeCursor->getNext() != NULL)
+ {
+ NodeCursor = NodeCursor->getNext();
+ nodeID = NodeCursor->getIdent();
+ /* check for special case: do not count "included template" nodes? */
+ if ((NodeCursor->getValueType() != DSRTypes::VT_includedTemplate) || !(Position.getFlags() & DSRTypes::PF_dontCountIncludedTemplateNodes))
+ ++Position;
+ }
+ }
+ }
+ }
+ return nodeID;
+}
+
+
+// explicit template instantiation
+template class DSRTreeNodeCursor<DSRDocumentTreeNode, OFFalse>;
+template class DSRTreeNodeCursor<DSRDocumentTreeNode, OFTrue>;
diff --git a/dcmsr/libsrc/dsrdoc.cc b/dcmsr/libsrc/dsrdoc.cc
index 2ac6597..00f2abe 100644
--- a/dcmsr/libsrc/dsrdoc.cc
+++ b/dcmsr/libsrc/dsrdoc.cc
@@ -30,6 +30,10 @@
#include "dcmtk/dcmsr/dsrdtitn.h"
#include "dcmtk/dcmsr/dsrtimtn.h"
+#include "dcmtk/dcmdata/dcdeftag.h"
+#include "dcmtk/dcmdata/dcuid.h"
+#include "dcmtk/dcmdata/dcvrdt.h"
+
/*---------------------*
* macro definitions *
@@ -57,7 +61,7 @@ DSRDocument::DSRDocument(const E_DocumentType documentType)
PreliminaryFlagEnum(PF_invalid),
CompletionFlagEnum(CF_invalid),
VerificationFlagEnum(VF_invalid),
- SpecificCharacterSetEnum(CS_invalid),
+ SpecificCharacterSetEnum(CS_default),
SOPClassUID(DCM_SOPClassUID),
SOPInstanceUID(DCM_SOPInstanceUID),
SpecificCharacterSet(DCM_SpecificCharacterSet),
@@ -122,7 +126,7 @@ void DSRDocument::clear()
PreliminaryFlagEnum = PF_invalid;
CompletionFlagEnum = CF_invalid;
VerificationFlagEnum = VF_invalid;
- SpecificCharacterSetEnum = CS_invalid;
+ SpecificCharacterSetEnum = CS_default;
/* clear all DICOM attributes */
SOPClassUID.clear();
SOPInstanceUID.clear();
@@ -612,7 +616,9 @@ OFCondition DSRDocument::write(DcmItem &dataset,
// --- SOP Common Module ---
addElementToDataset(result, dataset, new DcmUniqueIdentifier(SOPClassUID), "1", "1", "SOPCommonModule");
addElementToDataset(result, dataset, new DcmUniqueIdentifier(SOPInstanceUID), "1", "1", "SOPCommonModule");
- addElementToDataset(result, dataset, new DcmCodeString(SpecificCharacterSet), "1-n", "1C", "SOPCommonModule");
+ /* never write specific character set for ASCII (default character repertoire) */
+ if (SpecificCharacterSetEnum != CS_ASCII)
+ addElementToDataset(result, dataset, new DcmCodeString(SpecificCharacterSet), "1-n", "1C", "SOPCommonModule");
addElementToDataset(result, dataset, new DcmDate(InstanceCreationDate), "1", "3", "SOPCommonModule");
addElementToDataset(result, dataset, new DcmTime(InstanceCreationTime), "1", "3", "SOPCommonModule");
addElementToDataset(result, dataset, new DcmUniqueIdentifier(InstanceCreatorUID), "1", "3", "SOPCommonModule");
@@ -1924,6 +1930,13 @@ OFCondition DSRDocument::setTreeFromRootTemplate(DSRRootTemplate &rootTemplate,
}
+const char *DSRDocument::getSpecificCharacterSet() const
+{
+ /* never return NULL */
+ return OFSTRING_GUARD(getStringValueFromElement(SpecificCharacterSet));
+}
+
+
DSRTypes::E_CharacterSet DSRDocument::getSpecificCharacterSetType() const
{
return SpecificCharacterSetEnum;
@@ -2025,24 +2038,32 @@ OFCondition DSRDocument::getVerifyingObserver(const size_t idx,
DSRSOPInstanceReferenceList &DSRDocument::getPredecessorDocuments()
{
+ /* pass current value of specific character set */
+ PredecessorDocuments.setSpecificCharacterSet(getSpecificCharacterSet());
return PredecessorDocuments;
}
DSRSOPInstanceReferenceList &DSRDocument::getIdenticalDocuments()
{
+ /* pass current value of specific character set */
+ IdenticalDocuments.setSpecificCharacterSet(getSpecificCharacterSet());
return IdenticalDocuments;
}
DSRSOPInstanceReferenceList &DSRDocument::getCurrentRequestedProcedureEvidence()
{
+ /* pass current value of specific character set */
+ CurrentRequestedProcedureEvidence.setSpecificCharacterSet(getSpecificCharacterSet());
return CurrentRequestedProcedureEvidence;
}
DSRSOPInstanceReferenceList &DSRDocument::getPertinentOtherEvidence()
{
+ /* pass current value of specific character set */
+ PredecessorDocuments.setSpecificCharacterSet(getSpecificCharacterSet());
return PertinentOtherEvidence;
}
@@ -2055,6 +2076,8 @@ DSRReferencedInstanceList &DSRDocument::getReferencedInstances()
DSRCodingSchemeIdentificationList &DSRDocument::getCodingSchemeIdentification()
{
+ /* pass current value of specific character set */
+ CodingSchemeIdentification.setSpecificCharacterSet(getSpecificCharacterSet());
return CodingSchemeIdentification;
}
@@ -2293,7 +2316,11 @@ OFCondition DSRDocument::setSpecificCharacterSet(const OFString &value,
OFCondition result = (check) ? DcmCodeString::checkStringValue(value, "1-n") : EC_Normal;
if (result.good())
{
+ /* try to map the given string to an enum value */
SpecificCharacterSetEnum = definedTermToCharacterSet(value);
+ if (SpecificCharacterSetEnum == CS_unknown)
+ DCMSR_WARN("Setting unknown/unsupported value for Specific Character Set: " << value);
+ /* in any case, store the passed string value */
result = SpecificCharacterSet.putOFStringArray(value);
}
return result;
@@ -2308,7 +2335,7 @@ OFCondition DSRDocument::setCompletionFlagDescription(const OFString &value,
if (getDocumentType() != DT_KeyObjectSelectionDocument)
{
if (check)
- result = DcmLongString::checkStringValue(value, "1");
+ result = DcmLongString::checkStringValue(value, "1", getSpecificCharacterSet());
if (result.good())
result = CompletionFlagDescription.putOFStringArray(value);
}
@@ -2319,7 +2346,7 @@ OFCondition DSRDocument::setCompletionFlagDescription(const OFString &value,
OFCondition DSRDocument::setPatientName(const OFString &value,
const OFBool check)
{
- OFCondition result = (check) ? DcmPersonName::checkStringValue(value, "1") : EC_Normal;
+ OFCondition result = (check) ? DcmPersonName::checkStringValue(value, "1", getSpecificCharacterSet()) : EC_Normal;
if (result.good())
result = PatientName.putOFStringArray(value);
return result;
@@ -2349,7 +2376,7 @@ OFCondition DSRDocument::setPatientSex(const OFString &value,
OFCondition DSRDocument::setReferringPhysicianName(const OFString &value,
const OFBool check)
{
- OFCondition result = (check) ? DcmPersonName::checkStringValue(value, "1") : EC_Normal;
+ OFCondition result = (check) ? DcmPersonName::checkStringValue(value, "1", getSpecificCharacterSet()) : EC_Normal;
if (result.good())
result = ReferringPhysicianName.putOFStringArray(value);
return result;
@@ -2359,7 +2386,7 @@ OFCondition DSRDocument::setReferringPhysicianName(const OFString &value,
OFCondition DSRDocument::setStudyDescription(const OFString &value,
const OFBool check)
{
- OFCondition result = (check) ? DcmLongString::checkStringValue(value, "1") : EC_Normal;
+ OFCondition result = (check) ? DcmLongString::checkStringValue(value, "1", getSpecificCharacterSet()) : EC_Normal;
if (result.good())
result = StudyDescription.putOFStringArray(value);
return result;
@@ -2369,7 +2396,7 @@ OFCondition DSRDocument::setStudyDescription(const OFString &value,
OFCondition DSRDocument::setSeriesDescription(const OFString &value,
const OFBool check)
{
- OFCondition result = (check) ? DcmLongString::checkStringValue(value, "1") : EC_Normal;
+ OFCondition result = (check) ? DcmLongString::checkStringValue(value, "1", getSpecificCharacterSet()) : EC_Normal;
if (result.good())
result = SeriesDescription.putOFStringArray(value);
return result;
@@ -2379,7 +2406,7 @@ OFCondition DSRDocument::setSeriesDescription(const OFString &value,
OFCondition DSRDocument::setProtocolName(const OFString &value,
const OFBool check)
{
- OFCondition result = (check) ? DcmLongString::checkStringValue(value, "1") : EC_Normal;
+ OFCondition result = (check) ? DcmLongString::checkStringValue(value, "1", getSpecificCharacterSet()) : EC_Normal;
if (result.good())
result = ProtocolName.putOFStringArray(value);
return result;
@@ -2389,7 +2416,7 @@ OFCondition DSRDocument::setProtocolName(const OFString &value,
OFCondition DSRDocument::setManufacturer(const OFString &value,
const OFBool check)
{
- OFCondition result = (check) ? DcmLongString::checkStringValue(value, "1") : EC_Normal;
+ OFCondition result = (check) ? DcmLongString::checkStringValue(value, "1", getSpecificCharacterSet()) : EC_Normal;
if (result.good())
result = Manufacturer.putOFStringArray(value);
return result;
@@ -2399,7 +2426,7 @@ OFCondition DSRDocument::setManufacturer(const OFString &value,
OFCondition DSRDocument::setManufacturerModelName(const OFString &value,
const OFBool check)
{
- OFCondition result = (check) ? DcmLongString::checkStringValue(value, "1") : EC_Normal;
+ OFCondition result = (check) ? DcmLongString::checkStringValue(value, "1", getSpecificCharacterSet()) : EC_Normal;
if (result.good())
result = ManufacturerModelName.putOFStringArray(value);
return result;
@@ -2409,7 +2436,7 @@ OFCondition DSRDocument::setManufacturerModelName(const OFString &value,
OFCondition DSRDocument::setDeviceSerialNumber(const OFString &value,
const OFBool check)
{
- OFCondition result = (check) ? DcmLongString::checkStringValue(value, "1") : EC_Normal;
+ OFCondition result = (check) ? DcmLongString::checkStringValue(value, "1", getSpecificCharacterSet()) : EC_Normal;
if (result.good())
result = DeviceSerialNumber.putOFStringArray(value);
return result;
@@ -2419,7 +2446,7 @@ OFCondition DSRDocument::setDeviceSerialNumber(const OFString &value,
OFCondition DSRDocument::setSoftwareVersions(const OFString &value,
const OFBool check)
{
- OFCondition result = (check) ? DcmLongString::checkStringValue(value, "1-n") : EC_Normal;
+ OFCondition result = (check) ? DcmLongString::checkStringValue(value, "1-n", getSpecificCharacterSet()) : EC_Normal;
if (result.good())
result = SoftwareVersions.putOFStringArray(value);
return result;
@@ -2489,7 +2516,7 @@ OFCondition DSRDocument::setSeriesTime(const OFString &value,
OFCondition DSRDocument::setStudyID(const OFString &value,
const OFBool check)
{
- OFCondition result = (check) ? DcmShortString::checkStringValue(value, "1") : EC_Normal;
+ OFCondition result = (check) ? DcmShortString::checkStringValue(value, "1", getSpecificCharacterSet()) : EC_Normal;
if (result.good())
result = StudyID.putOFStringArray(value);
return result;
@@ -2499,7 +2526,7 @@ OFCondition DSRDocument::setStudyID(const OFString &value,
OFCondition DSRDocument::setPatientID(const OFString &value,
const OFBool check)
{
- OFCondition result = (check) ? DcmLongString::checkStringValue(value, "1") : EC_Normal;
+ OFCondition result = (check) ? DcmLongString::checkStringValue(value, "1", getSpecificCharacterSet()) : EC_Normal;
if (result.good())
result = PatientID.putOFStringArray(value);
return result;
@@ -2529,7 +2556,7 @@ OFCondition DSRDocument::setInstanceNumber(const OFString &value,
OFCondition DSRDocument::setAccessionNumber(const OFString &value,
const OFBool check)
{
- OFCondition result = (check) ? DcmShortString::checkStringValue(value, "1") : EC_Normal;
+ OFCondition result = (check) ? DcmShortString::checkStringValue(value, "1", getSpecificCharacterSet()) : EC_Normal;
if (result.good())
result = AccessionNumber.putOFStringArray(value);
return result;
@@ -2687,7 +2714,7 @@ OFCondition DSRDocument::completeDocument(const OFString &description,
if (CompletionFlagEnum != CF_Complete)
{
/* check parameter for conformance with VR and VM (if needed) */
- result = (check) ? DcmLongString::checkStringValue(description, "1") : EC_Normal;
+ result = (check) ? DcmLongString::checkStringValue(description, "1", getSpecificCharacterSet()) : EC_Normal;
if (result.good())
{
/* completed for now and ever */
@@ -2733,9 +2760,9 @@ OFCondition DSRDocument::verifyDocument(const OFString &observerName,
if (observerCode.isEmpty() || observerCode.isValid())
result = EC_Normal;
if (result.good())
- result = DcmPersonName::checkStringValue(observerName, "1");
+ result = DcmPersonName::checkStringValue(observerName, "1", getSpecificCharacterSet());
if (result.good())
- result = DcmLongString::checkStringValue(organization, "1");
+ result = DcmLongString::checkStringValue(organization, "1", getSpecificCharacterSet());
if (result.good())
result = DcmDateTime::checkStringValue(dateTime, "1");
} else {
diff --git a/dcmsr/libsrc/dsrdocst.cc b/dcmsr/libsrc/dsrdocst.cc
index e89ca5b..2467e78 100644
--- a/dcmsr/libsrc/dsrdocst.cc
+++ b/dcmsr/libsrc/dsrdocst.cc
@@ -47,7 +47,7 @@ DSRDocumentSubTree::DSRDocumentSubTree(const DSRDocumentSubTree &tree)
{
/* the real work is done in the base class DSRTree,
* so just update the by-reference relationships (if any) */
- checkByReferenceRelationships(CM_updateNodeID);
+ checkByReferenceRelationships<DSRDocumentTreeNodeCursor>(CM_updateNodeID);
}
@@ -174,15 +174,15 @@ OFBool DSRDocumentSubTree::canUseTemplateIdentification() const
OFCondition DSRDocumentSubTree::print(STD_NAMESPACE ostream &stream,
const size_t flags,
- DSRPositionCounter *posCounter)
+ const DSRPositionCounter *posCounter)
{
OFCondition result = EC_Normal;
/* initialize cursor with root node (and optional position counter) */
- DSRDocumentTreeNodeCursor cursor(getRoot(), posCounter);
+ DSRIncludedTemplateNodeCursor cursor(getRoot(), posCounter);
if (cursor.isValid())
{
- /* check and update by-reference relationships (if applicable) */
- checkByReferenceRelationships(CM_updatePositionString);
+ /* check and update by-reference relationships */
+ checkByReferenceRelationships<DSRIncludedTemplateNodeCursor>(CM_updatePositionString, flags & CB_maskPrintFlags);
/* update the document tree for output (if needed) */
updateTreeForOutput();
OFString tmpString;
@@ -220,22 +220,10 @@ OFCondition DSRDocumentSubTree::print(STD_NAMESPACE ostream &stream,
DCMSR_PRINT_ANSI_ESCAPE_CODE(DCMSR_ANSI_ESCAPE_CODE_RESET)
stream << OFendl;
}
- /* print content of included template (subtree) */
- if (node->hasValidValue())
+ else if ((flags & PF_dontCountIncludedTemplateNodes) && !(cursor.getPositionCounter().getFlags() & PF_dontCountIncludedTemplateNodes))
{
- DSRSubTemplate *subTempl = OFstatic_cast(DSRIncludedTemplateTreeNode *, node)->getValue().get();
- /* further indent included subtree */
- if (!(flags & PF_hideIncludedTemplateNodes))
- cursor.getPositionCounter().goDown();
- /* only print non-empty template (subtree) */
- if (!subTempl->isEmpty())
- result = subTempl->print(stream, flags, &cursor.getPositionCounter());
- /* make sure that empty templates are not counted */
- else if (flags & PF_hideIncludedTemplateNodes)
- --cursor.getPositionCounter();
- /* reset indentation of included subtree */
- if (!(flags & PF_hideIncludedTemplateNodes))
- cursor.getPositionCounter().goUp();
+ /* do not count internal "included template" nodes */
+ --cursor.getPositionCounter();
}
} else {
/* print node content */
@@ -252,9 +240,6 @@ OFCondition DSRDocumentSubTree::print(STD_NAMESPACE ostream &stream,
}
} while (result.good() && cursor.iterate());
}
- /* store and return current value of position counter (if needed) */
- if (posCounter != NULL)
- *posCounter = cursor.getPositionCounter();
return result;
}
@@ -271,7 +256,7 @@ OFCondition DSRDocumentSubTree::writeXML(STD_NAMESPACE ostream &stream,
if (cursor.isValid())
{
/* check by-reference relationships (if applicable) */
- checkByReferenceRelationships(CM_resetReferenceTargetFlag);
+ checkByReferenceRelationships<DSRDocumentTreeNodeCursor>(CM_resetReferenceTargetFlag);
/* update the document tree for output (if needed) */
updateTreeForOutput();
/* write current node (and its siblings) */
@@ -291,6 +276,26 @@ DSRContentItem &DSRDocumentSubTree::getCurrentContentItem()
}
+const DSRDocumentTreeNode *DSRDocumentSubTree::getCurrentNode() const
+{
+ return getNode();
+}
+
+
+OFBool DSRDocumentSubTree::getCursorToRootNode(DSRDocumentTreeNodeCursor &cursor) const
+{
+ cursor = DSRDocumentTreeNodeCursor(getRoot());
+ return cursor.isValid();
+}
+
+
+OFBool DSRDocumentSubTree::getCursorToRootNode(DSRIncludedTemplateNodeCursor &cursor) const
+{
+ cursor = DSRIncludedTemplateNodeCursor(getRoot());
+ return cursor.isValid();
+}
+
+
size_t DSRDocumentSubTree::countNodes(const OFBool searchIntoSubTemplates,
const OFBool countIncludedTemplateNodes) const
{
@@ -603,10 +608,15 @@ size_t DSRDocumentSubTree::addByReferenceRelationship(const E_RelationshipType r
}
-OFCondition DSRDocumentSubTree::updateByReferenceRelationships()
+OFCondition DSRDocumentSubTree::updateByReferenceRelationships(const OFBool updateIncludedTemplates)
{
+ OFCondition result = EC_Normal;
/* update the position strings of by-reference relationships */
- return checkByReferenceRelationships(CM_updatePositionString);
+ if (updateIncludedTemplates)
+ result = checkByReferenceRelationships<DSRIncludedTemplateNodeCursor>(CM_updatePositionString);
+ else
+ result = checkByReferenceRelationships<DSRDocumentTreeNodeCursor>(CM_updatePositionString);
+ return result;
}
@@ -858,6 +868,13 @@ void DSRDocumentSubTree::swap(DSRDocumentSubTree &tree)
}
+DSRDocumentTreeNode *DSRDocumentSubTree::getNode() const
+{
+ /* just call the inherited method */
+ return DSRTree<DSRDocumentTreeNode>::getNode();
+}
+
+
size_t DSRDocumentSubTree::addNode(DSRDocumentTreeNode *node,
const E_AddMode addMode)
{
@@ -928,7 +945,7 @@ OFCondition DSRDocumentSubTree::expandIncludedTemplates(DSRDocumentSubTree *tree
if ((tree != NULL) && (tree->gotoRoot() > 0))
{
OFBool nodeDeleted;
- const DSRDocumentTreeNode *node;
+ DSRDocumentTreeNode *node;
/* iterate over all nodes */
do {
node = tree->getNode();
@@ -938,7 +955,7 @@ OFCondition DSRDocumentSubTree::expandIncludedTemplates(DSRDocumentSubTree *tree
/* and expand the included templates (if any) */
if (node->getValueType() == VT_includedTemplate)
{
- const DSRSubTemplate *subTempl = OFstatic_cast(const DSRIncludedTemplateTreeNode *, node)->getValue().get();
+ DSRSubTemplate *subTempl = OFstatic_cast(DSRIncludedTemplateTreeNode *, node)->getValue().get();
if (subTempl != NULL)
{
/* template has no content items */
@@ -947,6 +964,8 @@ OFCondition DSRDocumentSubTree::expandIncludedTemplates(DSRDocumentSubTree *tree
/* just remove current node (included template) */
nodeDeleted = (tree->removeNode() > 0);
} else {
+ /* make sure that by-reference relationships are "up to date" */
+ subTempl->updateByReferenceRelationships(OFTrue /*updateIncludedTemplates*/);
/* clone the subtree managed by the template */
DSRDocumentSubTree *subTree = subTempl->cloneTree();
if (subTree != NULL)
@@ -986,6 +1005,7 @@ OFCondition DSRDocumentSubTree::expandIncludedTemplates(DSRDocumentSubTree *tree
}
+template <typename T_Cursor>
OFCondition DSRDocumentSubTree::checkByReferenceRelationships(const size_t mode,
const size_t flags)
{
@@ -999,8 +1019,10 @@ OFCondition DSRDocumentSubTree::checkByReferenceRelationships(const size_t mode,
/* specify for all content items not to be the target of a by-reference relationship */
if (mode & CM_resetReferenceTargetFlag)
resetReferenceTargetFlag();
+ /* pass flags to reference cursor (see below) */
+ const DSRPositionCounter posCounter(flags);
/* start at the root of the document tree */
- DSRDocumentTreeNodeCursor cursor(getRoot());
+ T_Cursor cursor(getRoot());
if (cursor.isValid())
{
/* for all content items */
@@ -1012,14 +1034,14 @@ OFCondition DSRDocumentSubTree::checkByReferenceRelationships(const size_t mode,
OFString nodePosString;
cursor.getPosition(nodePosString);
/* type cast to access members of by-reference class */
- DSRByReferenceTreeNode *byRefNode = OFconst_cast(DSRByReferenceTreeNode *, OFstatic_cast(const DSRByReferenceTreeNode *, cursor.getNode()));
+ DSRByReferenceTreeNode *byRefNode = OFstatic_cast(DSRByReferenceTreeNode *, cursor.getNode());
if (flags & RF_showCurrentlyProcessedItem)
DCMSR_INFO("Updating by-reference relationship in content item " << nodePosString);
/* start searching from root node, be careful with large trees! (tbd: might be improved later on) */
- DSRDocumentTreeNodeCursor refCursor(getRoot());
+ T_Cursor refCursor(getRoot(), &posCounter);
if (mode & CM_updateNodeID)
{
- /* update node ID (based on position string; tbc: what about included templates?) */
+ /* update node ID (based on position string) */
refNodeID = refCursor.gotoNode(byRefNode->getReferencedContentItem());
const DSRDocumentTreeNode *targetNode = (refNodeID > 0) ? refCursor.getNode() : NULL;
const E_ValueType targetValueType = (targetNode != NULL) ? targetNode->getValueType() : VT_invalid;
@@ -1030,7 +1052,7 @@ OFCondition DSRDocumentSubTree::checkByReferenceRelationships(const size_t mode,
if (mode & CM_updatePositionString)
{
OFString refPosString;
- /* update position string (tbd: does not yet work correctly with "included templates" */
+ /* update position string */
if (refNodeID > 0)
refCursor.getPosition(refPosString);
byRefNode->updateReference(refPosString);
@@ -1097,7 +1119,7 @@ OFCondition DSRDocumentSubTree::checkByReferenceRelationships(const size_t mode,
void DSRDocumentSubTree::resetReferenceTargetFlag()
{
- DSRDocumentTreeNodeCursor cursor(getRoot());
+ DSRIncludedTemplateNodeCursor cursor(getRoot());
if (cursor.isValid())
{
/* iterate over all nodes */
diff --git a/dcmsr/libsrc/dsrdoctn.cc b/dcmsr/libsrc/dsrdoctn.cc
index b7583e8..e588c84 100644
--- a/dcmsr/libsrc/dsrdoctn.cc
+++ b/dcmsr/libsrc/dsrdoctn.cc
@@ -24,12 +24,17 @@
#include "dcmtk/config/osconfig.h" /* make sure OS specific configuration is included first */
#include "dcmtk/dcmsr/dsrdoctn.h"
+#include "dcmtk/dcmsr/dsrdncsr.h"
#include "dcmtk/dcmsr/dsrdtitn.h"
#include "dcmtk/dcmsr/dsrxmld.h"
#include "dcmtk/dcmsr/dsriodcc.h"
-#include "dcmtk/ofstd/ofstring.h"
-#include "dcmtk/ofstd/ofstream.h"
+#include "dcmtk/dcmdata/dcdeftag.h"
+#include "dcmtk/dcmdata/dcuid.h"
+#include "dcmtk/dcmdata/dcvrcs.h"
+#include "dcmtk/dcmdata/dcvrdt.h"
+#include "dcmtk/dcmdata/dcvrui.h"
+#include "dcmtk/dcmdata/dcvrul.h"
DSRDocumentTreeNode::DSRDocumentTreeNode(const E_RelationshipType relationshipType,
diff --git a/dcmsr/libsrc/dsrdoctr.cc b/dcmsr/libsrc/dsrdoctr.cc
index db58d62..a69adb7 100644
--- a/dcmsr/libsrc/dsrdoctr.cc
+++ b/dcmsr/libsrc/dsrdoctr.cc
@@ -29,6 +29,9 @@
#include "dcmtk/dcmsr/dsrxmld.h"
#include "dcmtk/dcmsr/dsriodcc.h"
+#include "dcmtk/dcmdata/dcdeftag.h"
+#include "dcmtk/dcmdata/dcuid.h"
+
DSRDocumentTree::DSRDocumentTree(const E_DocumentType documentType)
: DSRDocumentSubTree(),
@@ -129,7 +132,7 @@ OFCondition DSRDocumentTree::read(DcmItem &dataset,
/* ... and let the node read the rest of the document */
result = node->read(dataset, ConstraintChecker, flags);
/* check and update by-reference relationships (if applicable) */
- checkByReferenceRelationships(CM_updateNodeID, flags);
+ checkByReferenceRelationships<DSRDocumentTreeNodeCursor>(CM_updateNodeID, flags & CB_maskReadFlags);
} else
result = SR_EC_InvalidDocumentTree;
} else
@@ -158,7 +161,7 @@ OFCondition DSRDocumentTree::write(DcmItem &dataset,
if (node != NULL)
{
/* check and update by-reference relationships (if applicable) */
- checkByReferenceRelationships(CM_updatePositionString);
+ checkByReferenceRelationships<DSRDocumentTreeNodeCursor>(CM_updatePositionString);
/* update the document tree for output (if needed) */
updateTreeForOutput();
/* start writing from root node */
@@ -225,7 +228,7 @@ OFCondition DSRDocumentTree::readXML(const DSRXMLDocument &doc,
/* ... and let the node read the rest of the document */
result = node->readXML(doc, cursor, DocumentType, flags);
/* check and update by-reference relationships (if applicable) */
- checkByReferenceRelationships(CM_updatePositionString);
+ checkByReferenceRelationships<DSRDocumentTreeNodeCursor>(CM_updatePositionString);
} else
result = SR_EC_InvalidDocumentTree;
} else
@@ -255,7 +258,7 @@ OFCondition DSRDocumentTree::renderHTML(STD_NAMESPACE ostream &docStream,
{
size_t annexNumber = 1;
/* check by-reference relationships (if applicable) */
- checkByReferenceRelationships(CM_resetReferenceTargetFlag);
+ checkByReferenceRelationships<DSRDocumentTreeNodeCursor>(CM_resetReferenceTargetFlag);
/* update the document tree for output (if needed) */
updateTreeForOutput();
/* start rendering from root node */
@@ -393,7 +396,7 @@ OFCondition DSRDocumentTree::checkDocumentTreeConstraints(DSRIODConstraintChecke
}
}
/* check by-reference relationships (update 'target value type' if applicable) */
- result = checkByReferenceRelationships(CM_resetReferenceTargetFlag, RF_ignoreRelationshipConstraints);
+ result = checkByReferenceRelationships<DSRDocumentTreeNodeCursor>(CM_resetReferenceTargetFlag, RF_ignoreRelationshipConstraints);
/* check whether the nodes of this tree also comply with the given constraints */
if (result.good())
result = checkSubTreeConstraints(this, checker);
@@ -408,7 +411,7 @@ OFCondition DSRDocumentTree::checkDocumentTreeConstraints(DSRIODConstraintChecke
void DSRDocumentTree::unmarkAllContentItems()
{
- DSRDocumentTreeNodeCursor cursor(getRoot());
+ DSRIncludedTemplateNodeCursor cursor(getRoot());
if (cursor.isValid())
{
/* iterate over all nodes */
@@ -421,7 +424,7 @@ void DSRDocumentTree::unmarkAllContentItems()
void DSRDocumentTree::removeSignatures()
{
- DSRDocumentTreeNodeCursor cursor(getRoot());
+ DSRIncludedTemplateNodeCursor cursor(getRoot());
if (cursor.isValid())
{
/* iterate over all nodes */
diff --git a/dcmsr/libsrc/dsrdtitn.cc b/dcmsr/libsrc/dsrdtitn.cc
index 08b7c95..1da208e 100644
--- a/dcmsr/libsrc/dsrdtitn.cc
+++ b/dcmsr/libsrc/dsrdtitn.cc
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2000-2015, OFFIS e.V.
+ * Copyright (C) 2000-2016, OFFIS e.V.
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation were developed by
@@ -27,6 +27,9 @@
#include "dcmtk/dcmsr/dsrdtitn.h"
#include "dcmtk/dcmsr/dsrxmld.h"
+#include "dcmtk/dcmdata/dcdeftag.h"
+#include "dcmtk/dcmdata/dcvrdt.h"
+
DSRDateTimeTreeNode::DSRDateTimeTreeNode(const E_RelationshipType relationshipType)
: DSRDocumentTreeNode(relationshipType, VT_DateTime),
diff --git a/dcmsr/libsrc/dsrimgfr.cc b/dcmsr/libsrc/dsrimgfr.cc
index 26e0dfb..05ce940 100644
--- a/dcmsr/libsrc/dsrimgfr.cc
+++ b/dcmsr/libsrc/dsrimgfr.cc
@@ -25,6 +25,9 @@
#include "dcmtk/dcmsr/dsrimgfr.h"
+#include "dcmtk/dcmdata/dcdeftag.h"
+#include "dcmtk/dcmdata/dcvris.h"
+
#define INCLUDE_CSTDIO
#include "dcmtk/ofstd/ofstdinc.h"
diff --git a/dcmsr/libsrc/dsrimgse.cc b/dcmsr/libsrc/dsrimgse.cc
index c5f2129..bc45139 100644
--- a/dcmsr/libsrc/dsrimgse.cc
+++ b/dcmsr/libsrc/dsrimgse.cc
@@ -25,6 +25,9 @@
#include "dcmtk/dcmsr/dsrimgse.h"
+#include "dcmtk/dcmdata/dcdeftag.h"
+#include "dcmtk/dcmdata/dcvrus.h"
+
#define INCLUDE_CSTDIO
#include "dcmtk/ofstd/ofstdinc.h"
@@ -58,8 +61,8 @@ DSRImageSegmentList &DSRImageSegmentList::operator=(const DSRImageSegmentList &l
OFCondition DSRImageSegmentList::print(STD_NAMESPACE ostream &stream,
- const size_t flags,
- const char separator) const
+ const size_t flags,
+ const char separator) const
{
const OFListConstIterator(Uint16) endPos = ItemList.end();
OFListConstIterator(Uint16) iterator = ItemList.begin();
diff --git a/dcmsr/libsrc/dsrimgtn.cc b/dcmsr/libsrc/dsrimgtn.cc
index 30a8dbd..1e12c1c 100644
--- a/dcmsr/libsrc/dsrimgtn.cc
+++ b/dcmsr/libsrc/dsrimgtn.cc
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2000-2015, OFFIS e.V.
+ * Copyright (C) 2000-2016, OFFIS e.V.
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation were developed by
@@ -27,6 +27,8 @@
#include "dcmtk/dcmsr/dsrimgtn.h"
#include "dcmtk/dcmsr/dsrxmld.h"
+#include "dcmtk/dcmdata/dcdeftag.h"
+
DSRImageTreeNode::DSRImageTreeNode(const E_RelationshipType relationshipType)
: DSRDocumentTreeNode(relationshipType, VT_Image),
diff --git a/dcmsr/libsrc/dsrimgvl.cc b/dcmsr/libsrc/dsrimgvl.cc
index e65d200..a21e9f1 100644
--- a/dcmsr/libsrc/dsrimgvl.cc
+++ b/dcmsr/libsrc/dsrimgvl.cc
@@ -25,11 +25,15 @@
#include "dcmtk/dcmsr/dsrimgvl.h"
#include "dcmtk/dcmsr/dsrxmld.h"
+
#include "dcmtk/dcmimgle/dcmimage.h"
#include "dcmtk/dcmimgle/diutils.h"
#include "dcmtk/dcmimage/diregist.h" /* add support for color images */
#include "dcmtk/dcmimage/diquant.h" /* for DcmQuant */
+#include "dcmtk/dcmdata/dcdeftag.h"
+#include "dcmtk/dcmdata/dcuid.h"
+
DSRImageReferenceValue::DSRImageReferenceValue()
: DSRCompositeReferenceValue(),
diff --git a/dcmsr/libsrc/dsrnumvl.cc b/dcmsr/libsrc/dsrnumvl.cc
index ef12542..07fc3a7 100644
--- a/dcmsr/libsrc/dsrnumvl.cc
+++ b/dcmsr/libsrc/dsrnumvl.cc
@@ -27,6 +27,9 @@
#include "dcmtk/dcmsr/dsrnumvl.h"
#include "dcmtk/dcmsr/dsrxmld.h"
+#include "dcmtk/dcmdata/dcdeftag.h"
+#include "dcmtk/dcmdata/dcvrds.h"
+
DSRNumericMeasurementValue::DSRNumericMeasurementValue()
: NumericValue(),
diff --git a/dcmsr/libsrc/dsrpnmtn.cc b/dcmsr/libsrc/dsrpnmtn.cc
index 63c7ffa..ff9b576 100644
--- a/dcmsr/libsrc/dsrpnmtn.cc
+++ b/dcmsr/libsrc/dsrpnmtn.cc
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2000-2015, OFFIS e.V.
+ * Copyright (C) 2000-2016, OFFIS e.V.
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation were developed by
@@ -27,6 +27,9 @@
#include "dcmtk/dcmsr/dsrpnmtn.h"
#include "dcmtk/dcmsr/dsrxmld.h"
+#include "dcmtk/dcmdata/dcdeftag.h"
+#include "dcmtk/dcmdata/dcvrpn.h"
+
DSRPNameTreeNode::DSRPNameTreeNode(const E_RelationshipType relationshipType)
: DSRDocumentTreeNode(relationshipType, VT_PName),
diff --git a/dcmsr/libsrc/dsrposcn.cc b/dcmsr/libsrc/dsrposcn.cc
index 7130e50..69b3912 100644
--- a/dcmsr/libsrc/dsrposcn.cc
+++ b/dcmsr/libsrc/dsrposcn.cc
@@ -27,16 +27,18 @@
#include "dcmtk/dcmsr/dsrtypes.h"
-DSRPositionCounter::DSRPositionCounter()
+DSRPositionCounter::DSRPositionCounter(const size_t flags)
: Position(0),
- PositionList()
+ PositionList(),
+ Flags(flags)
{
}
DSRPositionCounter::DSRPositionCounter(const DSRPositionCounter &counter)
: Position(counter.Position),
- PositionList(counter.PositionList)
+ PositionList(counter.PositionList),
+ Flags(counter.Flags)
{
}
@@ -50,6 +52,7 @@ DSRPositionCounter &DSRPositionCounter::operator=(const DSRPositionCounter &coun
{
Position = counter.Position;
PositionList = counter.PositionList;
+ Flags = counter.Flags;
return *this;
}
@@ -59,14 +62,17 @@ void DSRPositionCounter::clear()
/* clear and invalidate position counter */
Position = 0;
PositionList.clear();
+ Flags = 0;
}
-void DSRPositionCounter::initialize(const OFBool valid)
+void DSRPositionCounter::initialize(const OFBool valid,
+ const size_t flags)
{
/* distinguish valid from non-valid position counter */
Position = (valid ? 1 : 0);
PositionList.clear();
+ Flags = flags;
}
diff --git a/dcmsr/libsrc/dsrrefin.cc b/dcmsr/libsrc/dsrrefin.cc
index 4c30d53..1becfc8 100644
--- a/dcmsr/libsrc/dsrrefin.cc
+++ b/dcmsr/libsrc/dsrrefin.cc
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2011-2015, OFFIS e.V.
+ * Copyright (C) 2011-2016, OFFIS e.V.
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation were developed by
@@ -26,6 +26,10 @@
#include "dcmtk/dcmsr/dsrrefin.h"
#include "dcmtk/dcmsr/dsrxmld.h"
+#include "dcmtk/dcmdata/dcdeftag.h"
+#include "dcmtk/dcmdata/dcuid.h"
+#include "dcmtk/dcmdata/dcvrui.h"
+
DSRReferencedInstanceList::DSRReferencedInstanceList()
: ItemList(),
diff --git a/dcmsr/libsrc/dsrreftn.cc b/dcmsr/libsrc/dsrreftn.cc
index 9c9d296..e05b49f 100644
--- a/dcmsr/libsrc/dsrreftn.cc
+++ b/dcmsr/libsrc/dsrreftn.cc
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2000-2015, OFFIS e.V.
+ * Copyright (C) 2000-2016, OFFIS e.V.
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation were developed by
@@ -27,6 +27,9 @@
#include "dcmtk/dcmsr/dsrreftn.h"
#include "dcmtk/dcmsr/dsrxmld.h"
+#include "dcmtk/dcmdata/dcdeftag.h"
+#include "dcmtk/dcmdata/dcvrul.h"
+
DSRByReferenceTreeNode::DSRByReferenceTreeNode(const E_RelationshipType relationshipType)
: DSRDocumentTreeNode(relationshipType, VT_byReference),
@@ -100,7 +103,10 @@ OFCondition DSRByReferenceTreeNode::print(STD_NAMESPACE ostream &stream,
DCMSR_PRINT_ANSI_ESCAPE_CODE(DCMSR_ANSI_ESCAPE_CODE_RELATIONSHIP_TYPE)
stream << relationshipTypeToReadableName(getRelationshipType()) << " ";
DCMSR_PRINT_ANSI_ESCAPE_CODE(DCMSR_ANSI_ESCAPE_CODE_ITEM_VALUE)
- stream << ReferencedContentItem;
+ if (ReferencedContentItem.empty())
+ stream << "?";
+ else
+ stream << ReferencedContentItem;
/* print node ID (might be useful for debugging purposes) */
if (flags & PF_printNodeID)
{
diff --git a/dcmsr/libsrc/dsrrrdcc.cc b/dcmsr/libsrc/dsrrrdcc.cc
index 9ee262c..24edb3a 100644
--- a/dcmsr/libsrc/dsrrrdcc.cc
+++ b/dcmsr/libsrc/dsrrrdcc.cc
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2014-2015, J. Riesmeier, Oldenburg, Germany
+ * Copyright (C) 2014-2016, J. Riesmeier, Oldenburg, Germany
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation are maintained by
@@ -102,7 +102,7 @@ OFBool DSRRadiopharmaceuticalRadiationDoseConstraintChecker::checkContentRelatio
}
/* row 5 of the table */
else if ((relationshipType == RT_hasProperties) &&
- ((sourceValueType == VT_Text) || (sourceValueType == VT_Code) || (sourceValueType == VT_Num) || (targetValueType == VT_PName)))
+ ((sourceValueType == VT_Text) || (sourceValueType == VT_Code) || (sourceValueType == VT_Num) || (sourceValueType == VT_PName)))
{
result = (targetValueType == VT_Text) || (targetValueType == VT_Code) || (targetValueType == VT_Num) ||
(targetValueType == VT_DateTime) || (targetValueType == VT_UIDRef) || (targetValueType == VT_PName) ||
diff --git a/dcmsr/libsrc/dsrsc3gr.cc b/dcmsr/libsrc/dsrsc3gr.cc
index b1d935c..794f1be 100644
--- a/dcmsr/libsrc/dsrsc3gr.cc
+++ b/dcmsr/libsrc/dsrsc3gr.cc
@@ -24,6 +24,10 @@
#include "dcmtk/config/osconfig.h" /* make sure OS specific configuration is included first */
#include "dcmtk/dcmsr/dsrsc3gr.h"
+
+#include "dcmtk/dcmdata/dcdeftag.h"
+#include "dcmtk/dcmdata/dcvrfl.h"
+
#include "dcmtk/ofstd/ofstd.h"
/* declared in class DSRListOfItems<T> */
diff --git a/dcmsr/libsrc/dsrsc3vl.cc b/dcmsr/libsrc/dsrsc3vl.cc
index 55f67b6..aa45327 100644
--- a/dcmsr/libsrc/dsrsc3vl.cc
+++ b/dcmsr/libsrc/dsrsc3vl.cc
@@ -26,6 +26,9 @@
#include "dcmtk/dcmsr/dsrsc3vl.h"
#include "dcmtk/dcmsr/dsrxmld.h"
+#include "dcmtk/dcmdata/dcdeftag.h"
+#include "dcmtk/dcmdata/dcvrui.h"
+
DSRSpatialCoordinates3DValue::DSRSpatialCoordinates3DValue()
: GraphicType(DSRTypes::GT3_invalid),
diff --git a/dcmsr/libsrc/dsrscogr.cc b/dcmsr/libsrc/dsrscogr.cc
index b79edef..745b420 100644
--- a/dcmsr/libsrc/dsrscogr.cc
+++ b/dcmsr/libsrc/dsrscogr.cc
@@ -24,6 +24,10 @@
#include "dcmtk/config/osconfig.h" /* make sure OS specific configuration is included first */
#include "dcmtk/dcmsr/dsrscogr.h"
+
+#include "dcmtk/dcmdata/dcdeftag.h"
+#include "dcmtk/dcmdata/dcvrfl.h"
+
#include "dcmtk/ofstd/ofstd.h"
/* declared in class DSRListOfItems<T> */
diff --git a/dcmsr/libsrc/dsrscovl.cc b/dcmsr/libsrc/dsrscovl.cc
index 0bc37e1..1017a43 100644
--- a/dcmsr/libsrc/dsrscovl.cc
+++ b/dcmsr/libsrc/dsrscovl.cc
@@ -26,6 +26,9 @@
#include "dcmtk/dcmsr/dsrscovl.h"
#include "dcmtk/dcmsr/dsrxmld.h"
+#include "dcmtk/dcmdata/dcdeftag.h"
+#include "dcmtk/dcmdata/dcvrui.h"
+
DSRSpatialCoordinatesValue::DSRSpatialCoordinatesValue()
: GraphicType(DSRTypes::GT_invalid),
diff --git a/dcmsr/libsrc/dsrsoprf.cc b/dcmsr/libsrc/dsrsoprf.cc
index 3b21aa1..512b123 100644
--- a/dcmsr/libsrc/dsrsoprf.cc
+++ b/dcmsr/libsrc/dsrsoprf.cc
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2002-2015, OFFIS e.V.
+ * Copyright (C) 2002-2016, OFFIS e.V.
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation were developed by
@@ -28,6 +28,11 @@
#include "dcmtk/dcmsr/dsrxmld.h"
#include "dcmtk/dcmdata/dcdeftag.h"
+#include "dcmtk/dcmdata/dcuid.h"
+#include "dcmtk/dcmdata/dcvrae.h"
+#include "dcmtk/dcmdata/dcvrcs.h"
+#include "dcmtk/dcmdata/dcvrsh.h"
+#include "dcmtk/dcmdata/dcvrui.h"
// --- DSRSOPInstanceReferenceList::InstanceStruct ---
@@ -767,7 +772,8 @@ void DSRSOPInstanceReferenceList::StudyStruct::removeIncompleteItems()
DSRSOPInstanceReferenceList::DSRSOPInstanceReferenceList(const DcmTagKey &sequence)
: SequenceTag(sequence),
StudyList(),
- Iterator()
+ Iterator(),
+ SpecificCharacterSet()
{
/* initialize list cursor */
Iterator = StudyList.end();
@@ -794,6 +800,8 @@ void DSRSOPInstanceReferenceList::clear()
/* make sure that the list is empty */
StudyList.clear();
Iterator = StudyList.end();
+ /* also clear other members */
+ SpecificCharacterSet.clear();
}
@@ -969,6 +977,16 @@ OFCondition DSRSOPInstanceReferenceList::writeXML(STD_NAMESPACE ostream &stream,
}
+OFCondition DSRSOPInstanceReferenceList::setSpecificCharacterSet(const OFString &value,
+ const OFBool check)
+{
+ OFCondition result = (check) ? DcmCodeString::checkStringValue(value, "1-n") : EC_Normal;
+ if (result.good())
+ SpecificCharacterSet = value;
+ return result;
+}
+
+
DSRSOPInstanceReferenceList::StudyStruct *DSRSOPInstanceReferenceList::gotoStudy(const OFString &studyUID)
{
StudyStruct *study = NULL;
@@ -1444,7 +1462,7 @@ OFCondition DSRSOPInstanceReferenceList::setStorageMediaFileSetID(const OFString
if (series != NULL)
{
/* set the value (if valid) */
- result = (check) ? DcmShortString::checkStringValue(value, "1") : EC_Normal;
+ result = (check) ? DcmShortString::checkStringValue(value, "1", SpecificCharacterSet) : EC_Normal;
if (result.good())
series->StorageMediaFileSetID = value;
}
diff --git a/dcmsr/libsrc/dsrtcodt.cc b/dcmsr/libsrc/dsrtcodt.cc
index 24faf45..c11180a 100644
--- a/dcmsr/libsrc/dsrtcodt.cc
+++ b/dcmsr/libsrc/dsrtcodt.cc
@@ -25,6 +25,9 @@
#include "dcmtk/dcmsr/dsrtcodt.h"
+#include "dcmtk/dcmdata/dcdeftag.h"
+#include "dcmtk/dcmdata/dcvrdt.h"
+
/* declared in class DSRListOfItems<T> */
DCMTK_EXPLICIT_SPECIALIZATION
const OFString DSRListOfItems<OFString>::EmptyItem;
diff --git a/dcmsr/libsrc/dsrtcosp.cc b/dcmsr/libsrc/dsrtcosp.cc
index 970060b..fc07faf 100644
--- a/dcmsr/libsrc/dsrtcosp.cc
+++ b/dcmsr/libsrc/dsrtcosp.cc
@@ -25,6 +25,9 @@
#include "dcmtk/dcmsr/dsrtcosp.h"
+#include "dcmtk/dcmdata/dcdeftag.h"
+#include "dcmtk/dcmdata/dcvrul.h"
+
#define INCLUDE_CSTDIO
#include "dcmtk/ofstd/ofstdinc.h"
diff --git a/dcmsr/libsrc/dsrtcoto.cc b/dcmsr/libsrc/dsrtcoto.cc
index e344336..9030f51 100644
--- a/dcmsr/libsrc/dsrtcoto.cc
+++ b/dcmsr/libsrc/dsrtcoto.cc
@@ -24,8 +24,11 @@
#include "dcmtk/config/osconfig.h" /* make sure OS specific configuration is included first */
#include "dcmtk/dcmsr/dsrtcoto.h"
-#include "dcmtk/ofstd/ofstd.h"
+#include "dcmtk/dcmdata/dcdeftag.h"
+#include "dcmtk/dcmdata/dcvrds.h"
+
+#include "dcmtk/ofstd/ofstd.h"
#define INCLUDE_CSTDIO
#include "dcmtk/ofstd/ofstdinc.h"
diff --git a/dcmsr/libsrc/dsrtcovl.cc b/dcmsr/libsrc/dsrtcovl.cc
index e2c8c09..adbb5ea 100644
--- a/dcmsr/libsrc/dsrtcovl.cc
+++ b/dcmsr/libsrc/dsrtcovl.cc
@@ -26,6 +26,8 @@
#include "dcmtk/dcmsr/dsrtcovl.h"
#include "dcmtk/dcmsr/dsrxmld.h"
+#include "dcmtk/dcmdata/dcdeftag.h"
+
DSRTemporalCoordinatesValue::DSRTemporalCoordinatesValue()
: TemporalRangeType(DSRTypes::TRT_invalid),
diff --git a/dcmsr/libsrc/dsrtextn.cc b/dcmsr/libsrc/dsrtextn.cc
index ced26b0..eebae33 100644
--- a/dcmsr/libsrc/dsrtextn.cc
+++ b/dcmsr/libsrc/dsrtextn.cc
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2000-2015, OFFIS e.V.
+ * Copyright (C) 2000-2016, OFFIS e.V.
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation were developed by
@@ -28,6 +28,9 @@
#include "dcmtk/dcmsr/dsrstrvl.h"
#include "dcmtk/dcmsr/dsrxmld.h"
+#include "dcmtk/dcmdata/dcdeftag.h"
+#include "dcmtk/dcmdata/dcvrut.h"
+
DSRTextTreeNode::DSRTextTreeNode(const E_RelationshipType relationshipType)
: DSRDocumentTreeNode(relationshipType, VT_Text),
diff --git a/dcmsr/libsrc/dsrtimtn.cc b/dcmsr/libsrc/dsrtimtn.cc
index 9a24082..a75432e 100644
--- a/dcmsr/libsrc/dsrtimtn.cc
+++ b/dcmsr/libsrc/dsrtimtn.cc
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2000-2015, OFFIS e.V.
+ * Copyright (C) 2000-2016, OFFIS e.V.
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation were developed by
@@ -27,6 +27,9 @@
#include "dcmtk/dcmsr/dsrtimtn.h"
#include "dcmtk/dcmsr/dsrxmld.h"
+#include "dcmtk/dcmdata/dcdeftag.h"
+#include "dcmtk/dcmdata/dcvrtm.h"
+
DSRTimeTreeNode::DSRTimeTreeNode(const E_RelationshipType relationshipType)
: DSRDocumentTreeNode(relationshipType, VT_Time),
diff --git a/dcmsr/libsrc/dsrtypes.cc b/dcmsr/libsrc/dsrtypes.cc
index 1069848..19a4d49 100644
--- a/dcmsr/libsrc/dsrtypes.cc
+++ b/dcmsr/libsrc/dsrtypes.cc
@@ -56,6 +56,12 @@
#include "dcmtk/dcmsr/dsrrrdcc.h"
#include "dcmtk/dcmsr/dsracqcc.h"
+#include "dcmtk/dcmdata/dcuid.h"
+#include "dcmtk/dcmdata/dcvrda.h"
+#include "dcmtk/dcmdata/dcvrdt.h"
+#include "dcmtk/dcmdata/dcvrpn.h"
+#include "dcmtk/dcmdata/dcvrtm.h"
+
#include "dcmtk/ofstd/ofstd.h"
#define INCLUDE_CSTDIO
@@ -144,6 +150,7 @@ const size_t DSRTypes::PF_printNodeID = 1 << 10;
const size_t DSRTypes::PF_indicateEnhancedEncodingMode = 1 << 11;
const size_t DSRTypes::PF_printAnnotation = 1 << 12;
const size_t DSRTypes::PF_hideIncludedTemplateNodes = 1 << 13;
+const size_t DSRTypes::PF_dontCountIncludedTemplateNodes = 1 << 14;
/* shortcuts */
const size_t DSRTypes::PF_printAllCodes = DSRTypes::PF_printConceptNameCodes;
@@ -152,6 +159,12 @@ const size_t DSRTypes::CM_updatePositionString = 1 << 0;
const size_t DSRTypes::CM_updateNodeID = 1 << 1;
const size_t DSRTypes::CM_resetReferenceTargetFlag = 1 << 2;
+/* checkByReferenceRelationships bit masks (avoid conflicts!) */
+const size_t DSRTypes::CB_maskPrintFlags = DSRTypes::PF_dontCountIncludedTemplateNodes;
+const size_t DSRTypes::CB_maskReadFlags = DSRTypes::RF_acceptUnknownRelationshipType |
+ DSRTypes::RF_ignoreRelationshipConstraints |
+ DSRTypes::RF_showCurrentlyProcessedItem;
+
/*---------------------*
* type declarations *
@@ -856,12 +869,18 @@ DSRTypes::E_VerificationFlag DSRTypes::enumeratedValueToVerificationFlag(const O
DSRTypes::E_CharacterSet DSRTypes::definedTermToCharacterSet(const OFString &definedTerm)
{
- E_CharacterSet type = CS_invalid;
- const S_CharacterSetNameMap *iterator = CharacterSetNameMap;
- while ((iterator->Type != CS_last) && (definedTerm != iterator->DefinedTerm))
- iterator++;
- if (definedTerm == iterator->DefinedTerm)
- type = iterator->Type;
+ E_CharacterSet type = CS_default;
+ /* empty defined term means default */
+ if (!definedTerm.empty())
+ {
+ const S_CharacterSetNameMap *iterator = CharacterSetNameMap;
+ while ((iterator->Type != CS_last) && (definedTerm != iterator->DefinedTerm))
+ iterator++;
+ if (definedTerm == iterator->DefinedTerm)
+ type = iterator->Type;
+ else
+ type = CS_invalid;
+ }
return type;
}
@@ -1040,7 +1059,12 @@ OFBool DSRTypes::checkElementValue(DcmElement *delem,
}
} else {
const OFCondition checkResult = delem->checkValue(vm, OFTrue /*oldFormat*/);
- if (checkResult == EC_ValueRepresentationViolated)
+ if (checkResult == EC_InvalidCharacter)
+ {
+ DCMSR_WARN(tagName << " " << tagKey << " contains invalid character(s) in " << module);
+ result = acceptViolation;
+ }
+ else if (checkResult == EC_ValueRepresentationViolated)
{
DCMSR_WARN(tagName << " " << tagKey << " violates VR definition in " << module);
result = acceptViolation;
diff --git a/dcmsr/libsrc/dsruidtn.cc b/dcmsr/libsrc/dsruidtn.cc
index 6ae8cc4..97e50a4 100644
--- a/dcmsr/libsrc/dsruidtn.cc
+++ b/dcmsr/libsrc/dsruidtn.cc
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2000-2015, OFFIS e.V.
+ * Copyright (C) 2000-2016, OFFIS e.V.
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation were developed by
@@ -27,6 +27,9 @@
#include "dcmtk/dcmsr/dsruidtn.h"
#include "dcmtk/dcmsr/dsrxmld.h"
+#include "dcmtk/dcmdata/dcdeftag.h"
+#include "dcmtk/dcmdata/dcvrui.h"
+
DSRUIDRefTreeNode::DSRUIDRefTreeNode(const E_RelationshipType relationshipType)
: DSRDocumentTreeNode(relationshipType, VT_UIDRef),
diff --git a/dcmsr/libsrc/dsrwavch.cc b/dcmsr/libsrc/dsrwavch.cc
index 60b6507..86e44af 100644
--- a/dcmsr/libsrc/dsrwavch.cc
+++ b/dcmsr/libsrc/dsrwavch.cc
@@ -26,6 +26,9 @@
#include "dcmtk/dcmsr/dsrwavch.h"
#include "dcmtk/dcmsr/dsrxmld.h"
+#include "dcmtk/dcmdata/dcdeftag.h"
+#include "dcmtk/dcmdata/dcvrus.h"
+
#define INCLUDE_CSTDIO
#include "dcmtk/ofstd/ofstdinc.h"
diff --git a/dcmsr/libsrc/dsrwavtn.cc b/dcmsr/libsrc/dsrwavtn.cc
index ba6602b..141e6a4 100644
--- a/dcmsr/libsrc/dsrwavtn.cc
+++ b/dcmsr/libsrc/dsrwavtn.cc
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2000-2015, OFFIS e.V.
+ * Copyright (C) 2000-2016, OFFIS e.V.
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation were developed by
@@ -27,6 +27,8 @@
#include "dcmtk/dcmsr/dsrwavtn.h"
#include "dcmtk/dcmsr/dsrxmld.h"
+#include "dcmtk/dcmdata/dcdeftag.h"
+
DSRWaveformTreeNode::DSRWaveformTreeNode(const E_RelationshipType relationshipType)
: DSRDocumentTreeNode(relationshipType, VT_Waveform),
diff --git a/dcmsr/libsrc/dsrwavvl.cc b/dcmsr/libsrc/dsrwavvl.cc
index 4bad97d..9d98647 100644
--- a/dcmsr/libsrc/dsrwavvl.cc
+++ b/dcmsr/libsrc/dsrwavvl.cc
@@ -26,6 +26,8 @@
#include "dcmtk/dcmsr/dsrwavvl.h"
#include "dcmtk/dcmsr/dsrxmld.h"
+#include "dcmtk/dcmdata/dcuid.h"
+
DSRWaveformReferenceValue::DSRWaveformReferenceValue()
: DSRCompositeReferenceValue(),
diff --git a/dcmsr/tests/Makefile.dep b/dcmsr/tests/Makefile.dep
index 90a1413..21d5734 100644
--- a/dcmsr/tests/Makefile.dep
+++ b/dcmsr/tests/Makefile.dep
@@ -1,24 +1,31 @@
mkreport.o: mkreport.cc ../../config/include/dcmtk/config/osconfig.h \
- ../../ofstd/include/dcmtk/ofstd/ofstream.h \
../include/dcmtk/dcmsr/dsrdoc.h ../include/dcmtk/dcmsr/dsrdoctr.h \
../include/dcmtk/dcmsr/dsrdocst.h ../include/dcmtk/dcmsr/dsrtree.h \
- ../include/dcmtk/dcmsr/dsrtypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctk.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
- ../../oflog/include/dcmtk/oflog/oflog.h \
- ../../oflog/include/dcmtk/oflog/logger.h \
- ../../oflog/include/dcmtk/oflog/config.h \
+ ../include/dcmtk/dcmsr/dsrtypes.h ../include/dcmtk/dcmsr/dsdefine.h \
../../ofstd/include/dcmtk/ofstd/ofdefine.h \
../../ofstd/include/dcmtk/ofstd/ofcast.h \
../../ofstd/include/dcmtk/ofstd/ofexport.h \
../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
+ ../../ofstd/include/dcmtk/ofstd/ofthread.h \
+ ../../ofstd/include/dcmtk/ofstd/oftypes.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstream.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstring.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcond.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
+ ../../oflog/include/dcmtk/oflog/oflog.h \
+ ../../oflog/include/dcmtk/oflog/logger.h \
+ ../../oflog/include/dcmtk/oflog/config.h \
../../oflog/include/dcmtk/oflog/config/defines.h \
../../oflog/include/dcmtk/oflog/helpers/threadcf.h \
../../oflog/include/dcmtk/oflog/loglevel.h \
../../ofstd/include/dcmtk/ofstd/ofvector.h \
- ../../ofstd/include/dcmtk/ofstd/oftypes.h \
../../oflog/include/dcmtk/oflog/tstring.h \
- ../../ofstd/include/dcmtk/ofstd/ofstring.h \
../../oflog/include/dcmtk/oflog/tchar.h \
../../oflog/include/dcmtk/oflog/spi/apndatch.h \
../../oflog/include/dcmtk/oflog/appender.h \
@@ -37,66 +44,80 @@ mkreport.o: mkreport.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofcmdln.h \
../../ofstd/include/dcmtk/ofstd/oflist.h \
../../ofstd/include/dcmtk/ofstd/ofconsol.h \
- ../../ofstd/include/dcmtk/ofstd/ofthread.h \
../../ofstd/include/dcmtk/ofstd/offile.h \
../../ofstd/include/dcmtk/ofstd/ofstd.h \
../../ofstd/include/dcmtk/ofstd/oftraits.h \
- ../../ofstd/include/dcmtk/ofstd/ofcond.h \
../../ofstd/include/dcmtk/ofstd/oflimits.h \
../../config/include/dcmtk/config/arith.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
- ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
+ ../include/dcmtk/dcmsr/dsrtncsr.h ../include/dcmtk/dcmsr/dsrposcn.h \
+ ../include/dcmtk/dcmsr/dsrtnant.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstack.h \
+ ../../ofstd/include/dcmtk/ofstd/ofutil.h \
+ ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
+ ../include/dcmtk/dcmsr/dsrdoctn.h ../include/dcmtk/dcmsr/dsrcodvl.h \
+ ../../ofstd/include/dcmtk/ofstd/ofexbl.h \
+ ../include/dcmtk/dcmsr/dsrdncsr.h ../include/dcmtk/dcmsr/dsrcitem.h \
+ ../include/dcmtk/dcmsr/dsrnumvl.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
+ ../include/dcmtk/dcmsr/dsrscovl.h ../include/dcmtk/dcmsr/dsrscogr.h \
+ ../include/dcmtk/dcmsr/dsrtlist.h ../include/dcmtk/dcmsr/dsrsc3vl.h \
+ ../include/dcmtk/dcmsr/dsrsc3gr.h ../include/dcmtk/dcmsr/dsrtcovl.h \
+ ../include/dcmtk/dcmsr/dsrtcodt.h ../include/dcmtk/dcmsr/dsrtcosp.h \
+ ../include/dcmtk/dcmsr/dsrtcoto.h ../include/dcmtk/dcmsr/dsrcomvl.h \
+ ../include/dcmtk/dcmsr/dsrimgvl.h ../include/dcmtk/dcmsr/dsrimgfr.h \
+ ../include/dcmtk/dcmsr/dsrimgse.h ../include/dcmtk/dcmsr/dsrwavvl.h \
+ ../include/dcmtk/dcmsr/dsrwavch.h \
+ ../../ofstd/include/dcmtk/ofstd/ofmem.h ../include/dcmtk/dcmsr/dsrrtpl.h \
+ ../include/dcmtk/dcmsr/dsrctpl.h ../include/dcmtk/dcmsr/dsrsoprf.h \
+ ../include/dcmtk/dcmsr/dsrrefin.h ../include/dcmtk/dcmsr/dsrcsidl.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
+ ../../ofstd/include/dcmtk/ofstd/ofdate.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
+ ../../ofstd/include/dcmtk/ofstd/oftime.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
+ ../include/dcmtk/dcmsr/codes/ucum.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \
../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctag.h \
../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \
../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \
../../dcmdata/include/dcmtk/dcmdata/dcdict.h \
../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
- ../../dcmdata/include/dcmtk/dcmdata/dclist.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
../../dcmdata/include/dcmtk/dcmdata/dcmetinf.h \
../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \
../../dcmdata/include/dcmtk/dcmdata/dcdicdir.h \
../../ofstd/include/dcmtk/ofstd/ofmap.h \
- ../../ofstd/include/dcmtk/ofstd/ofutil.h \
- ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
../../dcmdata/include/dcmtk/dcmdata/dcdirrec.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrulup.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
../../dcmdata/include/dcmtk/dcmdata/dcpixseq.h \
../../dcmdata/include/dcmtk/dcmdata/dcofsetl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrae.h \
../../dcmdata/include/dcmtk/dcmdata/dcvras.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
- ../../ofstd/include/dcmtk/ofstd/ofdate.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrds.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrdt.h \
../../ofstd/include/dcmtk/ofstd/ofdatime.h \
- ../../ofstd/include/dcmtk/ofstd/oftime.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrur.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrlt.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrst.h \
../../dcmdata/include/dcmtk/dcmdata/dcvruc.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrut.h \
@@ -107,30 +128,11 @@ mkreport.o: mkreport.cc ../../config/include/dcmtk/config/osconfig.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
- ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
- ../include/dcmtk/dcmsr/dsdefine.h ../include/dcmtk/dcmsr/dsrtncsr.h \
- ../../ofstd/include/dcmtk/ofstd/ofstack.h \
- ../include/dcmtk/dcmsr/dsrposcn.h ../include/dcmtk/dcmsr/dsrtnant.h \
- ../include/dcmtk/dcmsr/dsrdoctn.h ../include/dcmtk/dcmsr/dsrcodvl.h \
- ../../ofstd/include/dcmtk/ofstd/ofexbl.h \
- ../include/dcmtk/dcmsr/dsrcitem.h ../include/dcmtk/dcmsr/dsrnumvl.h \
- ../include/dcmtk/dcmsr/dsrscovl.h ../include/dcmtk/dcmsr/dsrscogr.h \
- ../include/dcmtk/dcmsr/dsrtlist.h ../include/dcmtk/dcmsr/dsrsc3vl.h \
- ../include/dcmtk/dcmsr/dsrsc3gr.h ../include/dcmtk/dcmsr/dsrtcovl.h \
- ../include/dcmtk/dcmsr/dsrtcodt.h ../include/dcmtk/dcmsr/dsrtcosp.h \
- ../include/dcmtk/dcmsr/dsrtcoto.h ../include/dcmtk/dcmsr/dsrcomvl.h \
- ../include/dcmtk/dcmsr/dsrimgvl.h ../include/dcmtk/dcmsr/dsrimgfr.h \
- ../include/dcmtk/dcmsr/dsrimgse.h ../include/dcmtk/dcmsr/dsrwavvl.h \
- ../include/dcmtk/dcmsr/dsrwavch.h \
- ../../ofstd/include/dcmtk/ofstd/ofmem.h ../include/dcmtk/dcmsr/dsrrtpl.h \
- ../include/dcmtk/dcmsr/dsrctpl.h ../include/dcmtk/dcmsr/dsrsoprf.h \
- ../include/dcmtk/dcmsr/dsrrefin.h ../include/dcmtk/dcmsr/dsrcsidl.h
+ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h
tests.o: tests.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/oftest.h \
../../ofstd/include/dcmtk/ofstd/ofconapp.h \
@@ -219,85 +221,37 @@ tsrcmr.o: tsrcmr.cc ../../config/include/dcmtk/config/osconfig.h \
../../oflog/include/dcmtk/oflog/logmacro.h \
../../oflog/include/dcmtk/oflog/helpers/snprintf.h \
../../oflog/include/dcmtk/oflog/tracelog.h \
- ../include/dcmtk/dcmsr/dsrdoc.h ../include/dcmtk/dcmsr/dsrdoctr.h \
- ../include/dcmtk/dcmsr/dsrdocst.h ../include/dcmtk/dcmsr/dsrtree.h \
- ../include/dcmtk/dcmsr/dsrtypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctk.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
- ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dctag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \
- ../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdict.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
../../dcmdata/include/dcmtk/dcmdata/dclist.h \
../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcmetinf.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
+ ../include/dcmtk/dcmsr/dsrdoc.h ../include/dcmtk/dcmsr/dsrdoctr.h \
+ ../include/dcmtk/dcmsr/dsrdocst.h ../include/dcmtk/dcmsr/dsrtree.h \
+ ../include/dcmtk/dcmsr/dsrtypes.h ../include/dcmtk/dcmsr/dsdefine.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicdir.h \
- ../../ofstd/include/dcmtk/ofstd/ofmap.h \
+ ../include/dcmtk/dcmsr/dsrtncsr.h ../include/dcmtk/dcmsr/dsrposcn.h \
+ ../include/dcmtk/dcmsr/dsrtnant.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstack.h \
../../ofstd/include/dcmtk/ofstd/ofutil.h \
../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdirrec.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrulup.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixseq.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcofsetl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrae.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvras.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
- ../../ofstd/include/dcmtk/ofstd/ofdate.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrds.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrdt.h \
- ../../ofstd/include/dcmtk/ofstd/ofdatime.h \
- ../../ofstd/include/dcmtk/ofstd/oftime.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrur.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlt.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrst.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvruc.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrut.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrobow.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixel.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpobw.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcovlay.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
- ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
- ../include/dcmtk/dcmsr/dsdefine.h ../include/dcmtk/dcmsr/dsrtncsr.h \
- ../../ofstd/include/dcmtk/ofstd/ofstack.h \
- ../include/dcmtk/dcmsr/dsrposcn.h ../include/dcmtk/dcmsr/dsrtnant.h \
../include/dcmtk/dcmsr/dsrdoctn.h ../include/dcmtk/dcmsr/dsrcodvl.h \
../../ofstd/include/dcmtk/ofstd/ofexbl.h \
- ../include/dcmtk/dcmsr/dsrcitem.h ../include/dcmtk/dcmsr/dsrnumvl.h \
+ ../include/dcmtk/dcmsr/dsrdncsr.h ../include/dcmtk/dcmsr/dsrcitem.h \
+ ../include/dcmtk/dcmsr/dsrnumvl.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
../include/dcmtk/dcmsr/dsrscovl.h ../include/dcmtk/dcmsr/dsrscogr.h \
../include/dcmtk/dcmsr/dsrtlist.h ../include/dcmtk/dcmsr/dsrsc3vl.h \
../include/dcmtk/dcmsr/dsrsc3gr.h ../include/dcmtk/dcmsr/dsrtcovl.h \
@@ -309,11 +263,24 @@ tsrcmr.o: tsrcmr.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofmem.h ../include/dcmtk/dcmsr/dsrrtpl.h \
../include/dcmtk/dcmsr/dsrctpl.h ../include/dcmtk/dcmsr/dsrsoprf.h \
../include/dcmtk/dcmsr/dsrrefin.h ../include/dcmtk/dcmsr/dsrcsidl.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
+ ../../ofstd/include/dcmtk/ofstd/ofdate.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
+ ../../ofstd/include/dcmtk/ofstd/oftime.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
../include/dcmtk/dcmsr/dsrnumtn.h ../include/dcmtk/dcmsr/codes/dcm.h \
../include/dcmtk/dcmsr/codes/srt.h ../include/dcmtk/dcmsr/codes/ucum.h \
../include/dcmtk/dcmsr/cmr/init.h ../include/dcmtk/dcmsr/cmr/define.h \
../include/dcmtk/dcmsr/cmr/logger.h ../include/dcmtk/dcmsr/cmr/cid29e.h \
../include/dcmtk/dcmsr/cmr/cid29.h ../include/dcmtk/dcmsr/dsrctxgr.h \
+ ../../ofstd/include/dcmtk/ofstd/ofmap.h \
../include/dcmtk/dcmsr/cmr/cid42.h ../include/dcmtk/dcmsr/cmr/cid244e.h \
../include/dcmtk/dcmsr/cmr/cid244.h ../include/dcmtk/dcmsr/cmr/cid4020.h \
../include/dcmtk/dcmsr/cmr/cid4031e.h \
@@ -384,78 +351,24 @@ tsrcodvl.o: tsrcodvl.cc ../../config/include/dcmtk/config/osconfig.h \
../../oflog/include/dcmtk/oflog/logmacro.h \
../../oflog/include/dcmtk/oflog/helpers/snprintf.h \
../../oflog/include/dcmtk/oflog/tracelog.h \
- ../include/dcmtk/dcmsr/dsrcodvl.h ../include/dcmtk/dcmsr/dsrtypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctk.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
- ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dctag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \
- ../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdict.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
../../dcmdata/include/dcmtk/dcmdata/dclist.h \
../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcmetinf.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
+ ../include/dcmtk/dcmsr/dsrcodvl.h ../include/dcmtk/dcmsr/dsrtypes.h \
+ ../include/dcmtk/dcmsr/dsdefine.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicdir.h \
- ../../ofstd/include/dcmtk/ofstd/ofmap.h \
- ../../ofstd/include/dcmtk/ofstd/ofutil.h \
- ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdirrec.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrulup.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixseq.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcofsetl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrae.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvras.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
- ../../ofstd/include/dcmtk/ofstd/ofdate.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrds.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrdt.h \
- ../../ofstd/include/dcmtk/ofstd/ofdatime.h \
- ../../ofstd/include/dcmtk/ofstd/oftime.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrur.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlt.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrst.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvruc.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrut.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrobow.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixel.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpobw.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcovlay.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
- ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
- ../include/dcmtk/dcmsr/dsdefine.h \
../../ofstd/include/dcmtk/ofstd/ofexbl.h
tsrdoc.o: tsrdoc.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/oftest.h \
@@ -503,83 +416,33 @@ tsrdoc.o: tsrdoc.cc ../../config/include/dcmtk/config/osconfig.h \
../../oflog/include/dcmtk/oflog/tracelog.h \
../include/dcmtk/dcmsr/dsrdoc.h ../include/dcmtk/dcmsr/dsrdoctr.h \
../include/dcmtk/dcmsr/dsrdocst.h ../include/dcmtk/dcmsr/dsrtree.h \
- ../include/dcmtk/dcmsr/dsrtypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctk.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
+ ../include/dcmtk/dcmsr/dsrtypes.h ../include/dcmtk/dcmsr/dsdefine.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
- ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dctag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \
- ../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdict.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
../../dcmdata/include/dcmtk/dcmdata/dclist.h \
../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcmetinf.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicdir.h \
- ../../ofstd/include/dcmtk/ofstd/ofmap.h \
+ ../include/dcmtk/dcmsr/dsrtncsr.h ../include/dcmtk/dcmsr/dsrposcn.h \
+ ../include/dcmtk/dcmsr/dsrtnant.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstack.h \
../../ofstd/include/dcmtk/ofstd/ofutil.h \
../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdirrec.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrulup.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixseq.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcofsetl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrae.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvras.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
- ../../ofstd/include/dcmtk/ofstd/ofdate.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrds.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrdt.h \
- ../../ofstd/include/dcmtk/ofstd/ofdatime.h \
- ../../ofstd/include/dcmtk/ofstd/oftime.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrur.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlt.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrst.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvruc.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrut.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrobow.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixel.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpobw.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcovlay.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
- ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
- ../include/dcmtk/dcmsr/dsdefine.h ../include/dcmtk/dcmsr/dsrtncsr.h \
- ../../ofstd/include/dcmtk/ofstd/ofstack.h \
- ../include/dcmtk/dcmsr/dsrposcn.h ../include/dcmtk/dcmsr/dsrtnant.h \
../include/dcmtk/dcmsr/dsrdoctn.h ../include/dcmtk/dcmsr/dsrcodvl.h \
../../ofstd/include/dcmtk/ofstd/ofexbl.h \
- ../include/dcmtk/dcmsr/dsrcitem.h ../include/dcmtk/dcmsr/dsrnumvl.h \
+ ../include/dcmtk/dcmsr/dsrdncsr.h ../include/dcmtk/dcmsr/dsrcitem.h \
+ ../include/dcmtk/dcmsr/dsrnumvl.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
../include/dcmtk/dcmsr/dsrscovl.h ../include/dcmtk/dcmsr/dsrscogr.h \
../include/dcmtk/dcmsr/dsrtlist.h ../include/dcmtk/dcmsr/dsrsc3vl.h \
../include/dcmtk/dcmsr/dsrsc3gr.h ../include/dcmtk/dcmsr/dsrtcovl.h \
@@ -590,7 +453,19 @@ tsrdoc.o: tsrdoc.cc ../../config/include/dcmtk/config/osconfig.h \
../include/dcmtk/dcmsr/dsrwavch.h \
../../ofstd/include/dcmtk/ofstd/ofmem.h ../include/dcmtk/dcmsr/dsrrtpl.h \
../include/dcmtk/dcmsr/dsrctpl.h ../include/dcmtk/dcmsr/dsrsoprf.h \
- ../include/dcmtk/dcmsr/dsrrefin.h ../include/dcmtk/dcmsr/dsrcsidl.h
+ ../include/dcmtk/dcmsr/dsrrefin.h ../include/dcmtk/dcmsr/dsrcsidl.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
+ ../../ofstd/include/dcmtk/ofstd/ofdate.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
+ ../../ofstd/include/dcmtk/ofstd/oftime.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h
tsrdoctr.o: tsrdoctr.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/oftest.h \
../../ofstd/include/dcmtk/ofstd/ofconapp.h \
@@ -637,83 +512,33 @@ tsrdoctr.o: tsrdoctr.cc ../../config/include/dcmtk/config/osconfig.h \
../../oflog/include/dcmtk/oflog/tracelog.h \
../include/dcmtk/dcmsr/dsrdoc.h ../include/dcmtk/dcmsr/dsrdoctr.h \
../include/dcmtk/dcmsr/dsrdocst.h ../include/dcmtk/dcmsr/dsrtree.h \
- ../include/dcmtk/dcmsr/dsrtypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctk.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
+ ../include/dcmtk/dcmsr/dsrtypes.h ../include/dcmtk/dcmsr/dsdefine.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
- ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dctag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \
- ../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdict.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
../../dcmdata/include/dcmtk/dcmdata/dclist.h \
../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcmetinf.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicdir.h \
- ../../ofstd/include/dcmtk/ofstd/ofmap.h \
+ ../include/dcmtk/dcmsr/dsrtncsr.h ../include/dcmtk/dcmsr/dsrposcn.h \
+ ../include/dcmtk/dcmsr/dsrtnant.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstack.h \
../../ofstd/include/dcmtk/ofstd/ofutil.h \
../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdirrec.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrulup.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixseq.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcofsetl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrae.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvras.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
- ../../ofstd/include/dcmtk/ofstd/ofdate.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrds.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrdt.h \
- ../../ofstd/include/dcmtk/ofstd/ofdatime.h \
- ../../ofstd/include/dcmtk/ofstd/oftime.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrur.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlt.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrst.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvruc.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrut.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrobow.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixel.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpobw.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcovlay.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
- ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
- ../include/dcmtk/dcmsr/dsdefine.h ../include/dcmtk/dcmsr/dsrtncsr.h \
- ../../ofstd/include/dcmtk/ofstd/ofstack.h \
- ../include/dcmtk/dcmsr/dsrposcn.h ../include/dcmtk/dcmsr/dsrtnant.h \
../include/dcmtk/dcmsr/dsrdoctn.h ../include/dcmtk/dcmsr/dsrcodvl.h \
../../ofstd/include/dcmtk/ofstd/ofexbl.h \
- ../include/dcmtk/dcmsr/dsrcitem.h ../include/dcmtk/dcmsr/dsrnumvl.h \
+ ../include/dcmtk/dcmsr/dsrdncsr.h ../include/dcmtk/dcmsr/dsrcitem.h \
+ ../include/dcmtk/dcmsr/dsrnumvl.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
../include/dcmtk/dcmsr/dsrscovl.h ../include/dcmtk/dcmsr/dsrscogr.h \
../include/dcmtk/dcmsr/dsrtlist.h ../include/dcmtk/dcmsr/dsrsc3vl.h \
../include/dcmtk/dcmsr/dsrsc3gr.h ../include/dcmtk/dcmsr/dsrtcovl.h \
@@ -725,6 +550,18 @@ tsrdoctr.o: tsrdoctr.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofmem.h ../include/dcmtk/dcmsr/dsrrtpl.h \
../include/dcmtk/dcmsr/dsrctpl.h ../include/dcmtk/dcmsr/dsrsoprf.h \
../include/dcmtk/dcmsr/dsrrefin.h ../include/dcmtk/dcmsr/dsrcsidl.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
+ ../../ofstd/include/dcmtk/ofstd/ofdate.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
+ ../../ofstd/include/dcmtk/ofstd/oftime.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
../include/dcmtk/dcmsr/dsrtpltn.h ../include/dcmtk/dcmsr/dsrstpl.h \
../include/dcmtk/dcmsr/dsrnumtn.h ../include/dcmtk/dcmsr/dsrtextn.h \
../include/dcmtk/dcmsr/dsrstrvl.h
@@ -773,79 +610,25 @@ tsrnumvl.o: tsrnumvl.cc ../../config/include/dcmtk/config/osconfig.h \
../../oflog/include/dcmtk/oflog/helpers/snprintf.h \
../../oflog/include/dcmtk/oflog/tracelog.h \
../include/dcmtk/dcmsr/dsrnumvl.h ../include/dcmtk/dcmsr/dsrcodvl.h \
- ../include/dcmtk/dcmsr/dsrtypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctk.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
+ ../include/dcmtk/dcmsr/dsrtypes.h ../include/dcmtk/dcmsr/dsdefine.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
- ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dctag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \
- ../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdict.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
../../dcmdata/include/dcmtk/dcmdata/dclist.h \
../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcmetinf.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicdir.h \
- ../../ofstd/include/dcmtk/ofstd/ofmap.h \
- ../../ofstd/include/dcmtk/ofstd/ofutil.h \
- ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdirrec.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrulup.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixseq.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcofsetl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrae.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvras.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
- ../../ofstd/include/dcmtk/ofstd/ofdate.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrds.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrdt.h \
- ../../ofstd/include/dcmtk/ofstd/ofdatime.h \
- ../../ofstd/include/dcmtk/ofstd/oftime.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrur.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlt.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrst.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvruc.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrut.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrobow.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixel.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpobw.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcovlay.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
- ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
- ../include/dcmtk/dcmsr/dsdefine.h \
../../ofstd/include/dcmtk/ofstd/ofexbl.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
../include/dcmtk/dcmsr/codes/dcm.h
tsrtpl.o: tsrtpl.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/oftest.h \
@@ -893,83 +676,33 @@ tsrtpl.o: tsrtpl.cc ../../config/include/dcmtk/config/osconfig.h \
../../oflog/include/dcmtk/oflog/tracelog.h \
../include/dcmtk/dcmsr/dsrdoc.h ../include/dcmtk/dcmsr/dsrdoctr.h \
../include/dcmtk/dcmsr/dsrdocst.h ../include/dcmtk/dcmsr/dsrtree.h \
- ../include/dcmtk/dcmsr/dsrtypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctk.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
+ ../include/dcmtk/dcmsr/dsrtypes.h ../include/dcmtk/dcmsr/dsdefine.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
- ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dctag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \
- ../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdict.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
../../dcmdata/include/dcmtk/dcmdata/dclist.h \
../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcmetinf.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicdir.h \
- ../../ofstd/include/dcmtk/ofstd/ofmap.h \
+ ../include/dcmtk/dcmsr/dsrtncsr.h ../include/dcmtk/dcmsr/dsrposcn.h \
+ ../include/dcmtk/dcmsr/dsrtnant.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstack.h \
../../ofstd/include/dcmtk/ofstd/ofutil.h \
../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdirrec.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrulup.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixseq.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcofsetl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrae.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvras.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
- ../../ofstd/include/dcmtk/ofstd/ofdate.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrds.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrdt.h \
- ../../ofstd/include/dcmtk/ofstd/ofdatime.h \
- ../../ofstd/include/dcmtk/ofstd/oftime.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrur.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlt.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrst.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvruc.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrut.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrobow.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixel.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpobw.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcovlay.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
- ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
- ../include/dcmtk/dcmsr/dsdefine.h ../include/dcmtk/dcmsr/dsrtncsr.h \
- ../../ofstd/include/dcmtk/ofstd/ofstack.h \
- ../include/dcmtk/dcmsr/dsrposcn.h ../include/dcmtk/dcmsr/dsrtnant.h \
../include/dcmtk/dcmsr/dsrdoctn.h ../include/dcmtk/dcmsr/dsrcodvl.h \
../../ofstd/include/dcmtk/ofstd/ofexbl.h \
- ../include/dcmtk/dcmsr/dsrcitem.h ../include/dcmtk/dcmsr/dsrnumvl.h \
+ ../include/dcmtk/dcmsr/dsrdncsr.h ../include/dcmtk/dcmsr/dsrcitem.h \
+ ../include/dcmtk/dcmsr/dsrnumvl.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
../include/dcmtk/dcmsr/dsrscovl.h ../include/dcmtk/dcmsr/dsrscogr.h \
../include/dcmtk/dcmsr/dsrtlist.h ../include/dcmtk/dcmsr/dsrsc3vl.h \
../include/dcmtk/dcmsr/dsrsc3gr.h ../include/dcmtk/dcmsr/dsrtcovl.h \
@@ -981,7 +714,19 @@ tsrtpl.o: tsrtpl.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofmem.h ../include/dcmtk/dcmsr/dsrrtpl.h \
../include/dcmtk/dcmsr/dsrctpl.h ../include/dcmtk/dcmsr/dsrsoprf.h \
../include/dcmtk/dcmsr/dsrrefin.h ../include/dcmtk/dcmsr/dsrcsidl.h \
- ../include/dcmtk/dcmsr/dsrstpl.h
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
+ ../../ofstd/include/dcmtk/ofstd/ofdate.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
+ ../../ofstd/include/dcmtk/ofstd/oftime.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
+ ../include/dcmtk/dcmsr/dsrstpl.h ../include/dcmtk/dcmsr/dsrreftn.h
tsrtree.o: tsrtree.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/oftest.h \
../../ofstd/include/dcmtk/ofstd/ofconapp.h \
@@ -1027,76 +772,23 @@ tsrtree.o: tsrtree.cc ../../config/include/dcmtk/config/osconfig.h \
../../oflog/include/dcmtk/oflog/helpers/snprintf.h \
../../oflog/include/dcmtk/oflog/tracelog.h \
../include/dcmtk/dcmsr/dsrtree.h ../include/dcmtk/dcmsr/dsrtypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctk.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
+ ../include/dcmtk/dcmsr/dsdefine.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
- ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dctag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \
- ../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdict.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
../../dcmdata/include/dcmtk/dcmdata/dclist.h \
../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcmetinf.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicdir.h \
- ../../ofstd/include/dcmtk/ofstd/ofmap.h \
- ../../ofstd/include/dcmtk/ofstd/ofutil.h \
- ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdirrec.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrulup.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixseq.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcofsetl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrae.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvras.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
- ../../ofstd/include/dcmtk/ofstd/ofdate.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrds.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrdt.h \
- ../../ofstd/include/dcmtk/ofstd/ofdatime.h \
- ../../ofstd/include/dcmtk/ofstd/oftime.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrur.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrlt.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrst.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvruc.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrut.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrobow.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpixel.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrpobw.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcovlay.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
- ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
- ../include/dcmtk/dcmsr/dsdefine.h ../include/dcmtk/dcmsr/dsrtncsr.h \
+ ../include/dcmtk/dcmsr/dsrtncsr.h ../include/dcmtk/dcmsr/dsrposcn.h \
+ ../include/dcmtk/dcmsr/dsrtnant.h \
../../ofstd/include/dcmtk/ofstd/ofstack.h \
- ../include/dcmtk/dcmsr/dsrposcn.h ../include/dcmtk/dcmsr/dsrtnant.h
+ ../../ofstd/include/dcmtk/ofstd/ofutil.h \
+ ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h
diff --git a/dcmsr/tests/mkreport.cc b/dcmsr/tests/mkreport.cc
index b18703d..7650c35 100644
--- a/dcmsr/tests/mkreport.cc
+++ b/dcmsr/tests/mkreport.cc
@@ -22,10 +22,10 @@
#include "dcmtk/config/osconfig.h" /* make sure OS specific configuration is included first */
-#include "dcmtk/ofstd/ofstream.h"
-#include "dcmtk/dcmsr/dsrdoc.h"
-#include "dcmtk/dcmdata/dcuid.h"
-#include "dcmtk/dcmdata/dcfilefo.h"
+#include "dcmtk/dcmsr/dsrdoc.h" /* for main interface class DSRDocument */
+#include "dcmtk/dcmsr/codes/ucum.h"
+
+#include "dcmtk/dcmdata/dctk.h" /* for typical set of "dcmdata" headers */
// forward declarations
@@ -515,7 +515,7 @@ static void generate_02(DSRDocument *doc, OFString &studyUID_01)
doc->getTree().addContentItem(DSRTypes::RT_contains, DSRTypes::VT_Num);
doc->getTree().getCurrentContentItem().setConceptName(DSRCodedEntryValue("M-02550", "SNM3", "Diameter"));
- doc->getTree().getCurrentContentItem().setNumericValue(DSRNumericMeasurementValue("1.5", DSRCodedEntryValue("cm", "UCUM", "1.4", "centimeter")));
+ doc->getTree().getCurrentContentItem().setNumericValue(DSRNumericMeasurementValue("1.5", CODE_UCUM_Centimeter));
doc->getTree().addContentItem(DSRTypes::RT_contains, DSRTypes::VT_Text);
doc->getTree().getCurrentContentItem().setConceptName(DSRCodedEntryValue("CODE_01", OFFIS_CODING_SCHEME_DESIGNATOR, "Description"));
@@ -531,11 +531,10 @@ static void generate_02(DSRDocument *doc, OFString &studyUID_01)
doc->getTree().getCurrentContentItem().setConceptName(DSRCodedEntryValue("CODE_03", OFFIS_CODING_SCHEME_DESIGNATOR, "Treatment"));
doc->getTree().getCurrentContentItem().setStringValue("The plan of treatment is as follows: 4500 rad, 15 treatment sessions, using 100 kV radiation.\nThe reason for treatment, expected acute reaction, and remote possibility of complication was discussed with this patient at some length, and he accepted therapy as outlined.");
- // add additional information on UCUM coding scheme (UID from CP-372)
- doc->getCodingSchemeIdentification().addItem("UCUM");
- doc->getCodingSchemeIdentification().setCodingSchemeUID("2.16.840.1.113883.6.8");
- doc->getCodingSchemeIdentification().setCodingSchemeName("Unified Code for Units of Measure");
- doc->getCodingSchemeIdentification().setCodingSchemeVersion("1.4");
+ // add additional information on UCUM coding scheme
+ doc->getCodingSchemeIdentification().addItem(CODE_UCUM_CodingSchemeDesignator);
+ doc->getCodingSchemeIdentification().setCodingSchemeUID(CODE_UCUM_CodingSchemeUID);
+ doc->getCodingSchemeIdentification().setCodingSchemeName(CODE_UCUM_CodingSchemeDescription);
doc->getCodingSchemeIdentification().setCodingSchemeResponsibleOrganization("Regenstrief Institute for Health Care, Indianapolis");
}
diff --git a/dcmsr/tests/tests.cc b/dcmsr/tests/tests.cc
index 5a8417a..c688077 100644
--- a/dcmsr/tests/tests.cc
+++ b/dcmsr/tests/tests.cc
@@ -42,6 +42,7 @@ OFTEST_REGISTER(dcmsr_gotoAnnotatedTreeNode);
OFTEST_REGISTER(dcmsr_addContentItem_1);
OFTEST_REGISTER(dcmsr_addContentItem_2);
OFTEST_REGISTER(dcmsr_copyContentItem);
+OFTEST_REGISTER(dcmsr_getCurrentNode);
OFTEST_REGISTER(dcmsr_gotoNamedNode);
OFTEST_REGISTER(dcmsr_gotoAnnotatedNode);
OFTEST_REGISTER(dcmsr_createDocSubTree);
@@ -55,6 +56,7 @@ OFTEST_REGISTER(dcmsr_extractDocSubTree_1);
OFTEST_REGISTER(dcmsr_extractDocSubTree_2);
OFTEST_REGISTER(dcmsr_extractAndInsertDocSubTree_1);
OFTEST_REGISTER(dcmsr_extractAndInsertDocSubTree_2);
+OFTEST_REGISTER(dcmsr_setSpecificCharacterSet);
OFTEST_REGISTER(dcmsr_changeDocumentType_1);
OFTEST_REGISTER(dcmsr_changeDocumentType_2);
OFTEST_REGISTER(dcmsr_setDocumentTree);
diff --git a/dcmsr/tests/tsrcmr.cc b/dcmsr/tests/tsrcmr.cc
index 267ea3a..0cb2efd 100644
--- a/dcmsr/tests/tsrcmr.cc
+++ b/dcmsr/tests/tsrcmr.cc
@@ -25,6 +25,9 @@
#include "dcmtk/ofstd/oftest.h"
+#include "dcmtk/dcmdata/dcdeftag.h"
+#include "dcmtk/dcmdata/dcdatset.h"
+
#include "dcmtk/dcmsr/dsrdoc.h"
#include "dcmtk/dcmsr/dsrnumvl.h"
#include "dcmtk/dcmsr/dsrnumtn.h"
diff --git a/dcmsr/tests/tsrcodvl.cc b/dcmsr/tests/tsrcodvl.cc
index 63919d9..121017b 100644
--- a/dcmsr/tests/tsrcodvl.cc
+++ b/dcmsr/tests/tsrcodvl.cc
@@ -24,6 +24,10 @@
#include "dcmtk/config/osconfig.h" /* make sure OS specific configuration is included first */
#include "dcmtk/ofstd/oftest.h"
+
+#include "dcmtk/dcmdata/dcdeftag.h"
+#include "dcmtk/dcmdata/dcdatset.h"
+
#include "dcmtk/dcmsr/dsrcodvl.h"
diff --git a/dcmsr/tests/tsrdoc.cc b/dcmsr/tests/tsrdoc.cc
index cba3e69..86cdcf2 100644
--- a/dcmsr/tests/tsrdoc.cc
+++ b/dcmsr/tests/tsrdoc.cc
@@ -24,9 +24,36 @@
#include "dcmtk/config/osconfig.h" /* make sure OS specific configuration is included first */
#include "dcmtk/ofstd/oftest.h"
+
#include "dcmtk/dcmsr/dsrdoc.h"
+OFTEST(dcmsr_setSpecificCharacterSet)
+{
+ /* first, create an SR document and set the character set */
+ DSRDocument doc;
+ OFCHECK_EQUAL(doc.getSpecificCharacterSetType(), DSRTypes::CS_ASCII);
+ OFCHECK(doc.setSpecificCharacterSet("ISO_IR 100").good());
+ /* then pass a value with special or invalid characters to a setXXX() method */
+ OFCHECK(doc.setPatientName("Riesmeier^J\366rg", OFTrue /*check*/).good());
+ OFCHECK(doc.setPatientName("^^^^^^", OFTrue /*check*/).bad());
+ OFCHECK(doc.setPatientName("^^^^^^", OFFalse /*check*/).good());
+ OFCHECK(doc.setStudyDescription("not allowed: \n\010\r\014", OFTrue /*check*/).bad());
+ OFCHECK(doc.setStudyDescription("not allowed: \n\010\r\014", OFFalse /*check*/).good());
+ /* disable VR checker by setting and invalid character set and try again */
+ OFCHECK(doc.setSpecificCharacterSet("UNKNOWN").good());
+ OFCHECK_EQUAL(doc.getSpecificCharacterSetType(), DSRTypes::CS_invalid);
+ OFCHECK(doc.setPatientName("^^^^^^", OFTrue /*check*/).good());
+ OFCHECK(doc.setStudyDescription("not allowed: \n\010\r\014", OFTrue /*check*/).good());
+ /* set default character repertoire (ASCII) and try again */
+ OFCHECK(doc.setSpecificCharacterSet("").good());
+ OFCHECK_EQUAL(doc.getSpecificCharacterSetType(), DSRTypes::CS_ASCII);
+ OFCHECK(doc.setPatientName("Riesmeier^J\366rg", OFTrue /*check*/).bad());
+ OFCHECK(doc.setSpecificCharacterSet("ISO_IR 6").good());
+ OFCHECK_EQUAL(doc.getSpecificCharacterSetType(), DSRTypes::CS_ASCII);
+}
+
+
OFTEST(dcmsr_changeDocumentType_1)
{
/* first, create an SR document to get an empty SR tree */
diff --git a/dcmsr/tests/tsrdoctr.cc b/dcmsr/tests/tsrdoctr.cc
index 911da11..b1dc5c9 100644
--- a/dcmsr/tests/tsrdoctr.cc
+++ b/dcmsr/tests/tsrdoctr.cc
@@ -25,6 +25,7 @@
#include "dcmtk/config/osconfig.h" /* make sure OS specific configuration is included first */
#include "dcmtk/ofstd/oftest.h"
+
#include "dcmtk/dcmsr/dsrdoc.h"
#include "dcmtk/dcmsr/dsrtpltn.h"
#include "dcmtk/dcmsr/dsrnumtn.h"
@@ -107,6 +108,26 @@ OFTEST(dcmsr_copyContentItem)
}
+OFTEST(dcmsr_getCurrentNode)
+{
+ /* first, create a new SR document */
+ DSRDocument doc(DSRTypes::DT_ComprehensiveSR);
+ DSRDocumentTree &tree = doc.getTree();
+ /* then add some content items */
+ OFCHECK(tree.addContentItem(DSRTypes::RT_isRoot, DSRTypes::VT_Container, DSRCodedEntryValue("121111", "DCM", "Summary")).good());
+ OFCHECK(tree.addChildContentItem(DSRTypes::RT_contains, DSRTypes::VT_Num, DSRCodedEntryValue("121206", "DCM", "Distance")).good());
+ /* and check the current node */
+ const DSRDocumentTreeNode *treeNode = tree.getCurrentNode();
+ if (treeNode != NULL)
+ {
+ OFCHECK_EQUAL(treeNode->getRelationshipType(), DSRTypes::RT_contains);
+ OFCHECK_EQUAL(treeNode->getValueType(), DSRTypes::VT_Num);
+ OFCHECK_EQUAL(treeNode->getConceptName().getCodeMeaning(), "Distance");
+ } else
+ OFCHECK_FAIL("could not get read-only access to current node");
+}
+
+
OFTEST(dcmsr_gotoNamedNode)
{
/* first, create a new SR document */
diff --git a/dcmsr/tests/tsrnumvl.cc b/dcmsr/tests/tsrnumvl.cc
index 3df8266..08f642f 100644
--- a/dcmsr/tests/tsrnumvl.cc
+++ b/dcmsr/tests/tsrnumvl.cc
@@ -24,6 +24,7 @@
#include "dcmtk/config/osconfig.h" /* make sure OS specific configuration is included first */
#include "dcmtk/ofstd/oftest.h"
+
#include "dcmtk/dcmsr/dsrnumvl.h"
#include "dcmtk/dcmsr/codes/dcm.h"
diff --git a/dcmsr/tests/tsrtpl.cc b/dcmsr/tests/tsrtpl.cc
index 711fc7e..7e1407d 100644
--- a/dcmsr/tests/tsrtpl.cc
+++ b/dcmsr/tests/tsrtpl.cc
@@ -24,10 +24,12 @@
#include "dcmtk/config/osconfig.h" /* make sure OS specific configuration is included first */
#include "dcmtk/ofstd/oftest.h"
+
#include "dcmtk/dcmsr/dsrdoc.h"
#include "dcmtk/dcmsr/dsrdocst.h"
#include "dcmtk/dcmsr/dsrrtpl.h"
#include "dcmtk/dcmsr/dsrstpl.h"
+#include "dcmtk/dcmsr/dsrreftn.h"
/* minimal test class for root template (Basic Diagnostic Imaging Report) */
@@ -278,12 +280,20 @@ OFTEST(dcmsr_templateWithByReferenceRelationship_1)
/* check whether the correct content item has been found */
OFCHECK(templ.getCurrentContentItem().getValueType() == DSRTypes::VT_Num);
/* and, finally, check whether the by-reference relationship is still valid */
+ OFCHECK(templ.updateByReferenceRelationships().good());
OFCHECK(templ.gotoChild() > 0);
OFCHECK(templ.getCurrentContentItem().getValueType() == DSRTypes::VT_byReference);
OFCHECK(templ.getCurrentContentItem().getReferencedNodeID() > 0);
-
- // tbd: by-reference relationships do not yet work correctly if contained
- // in an "included template" content item, i.e. in a nested subtree
+ const DSRDocumentTreeNode *treeNode = templ.getTree().getCurrentNode();
+ if (treeNode != NULL)
+ {
+ if (treeNode->getValueType() == DSRTypes::VT_byReference)
+ {
+ const DSRByReferenceTreeNode *node = OFstatic_cast(const DSRByReferenceTreeNode *, treeNode);
+ OFCHECK_EQUAL(node->getReferencedContentItem(), "1.3.1");
+ }
+ } else
+ OFCHECK_FAIL("could not get read-only access to current node");
}
@@ -297,14 +307,28 @@ OFTEST(dcmsr_templateWithByReferenceRelationship_2)
/* then, create a root template with a CONTAINER content item */
SRTestRootTemplate rootTempl;
OFCHECK_EQUAL(rootTempl.countNodes(), 1);
- /* and insert the sub-template into it */
+ /* insert the sub-template into it */
OFCHECK(rootTempl.insertTemplate(subTempl).good());
OFCHECK_EQUAL(rootTempl.countNodes(), 5);
OFCHECK_EQUAL(rootTempl.countNodes(OFTrue /*searchIntoSubTemplates*/, OFFalse /*countIncludedTemplateNodes*/), 8);
- /* finally, set its content as the document tree */
+ /* check whether the by-reference relationship is still valid */
+ OFCHECK(rootTempl.updateByReferenceRelationships(OFTrue /*includedTemplates*/).good());
+ DSRIncludedTemplateNodeCursor cursor;
+ if (rootTempl.getTree().getCursorToRootNode(cursor))
+ {
+ do {
+ const DSRDocumentTreeNode *treeNode = cursor.getNode();
+ if (treeNode != NULL)
+ {
+ if (treeNode->getValueType() == DSRTypes::VT_byReference)
+ {
+ const DSRByReferenceTreeNode *node = OFstatic_cast(const DSRByReferenceTreeNode *, treeNode);
+ OFCHECK_EQUAL(node->getReferencedContentItem(), "1.1.3.1.1");
+ }
+ }
+ } while (cursor.iterate());
+ }
+ /* and, finally, set its content as the document tree */
OFCHECK(doc.setTreeFromRootTemplate(rootTempl, OFTrue /*expandTree*/).good());
OFCHECK_EQUAL(doc.getTree().countNodes(), 8);
-
- // tbd: by-reference relationships do not yet work correctly if contained
- // in an "included template" content item, i.e. in a nested subtree
}
diff --git a/dcmsr/tests/tsrtree.cc b/dcmsr/tests/tsrtree.cc
index ef861f6..6fc6191 100644
--- a/dcmsr/tests/tsrtree.cc
+++ b/dcmsr/tests/tsrtree.cc
@@ -24,6 +24,7 @@
#include "dcmtk/config/osconfig.h" /* make sure OS specific configuration is included first */
#include "dcmtk/ofstd/oftest.h"
+
#include "dcmtk/dcmsr/dsrtree.h"
diff --git a/dcmtract/CMakeLists.txt b/dcmtract/CMakeLists.txt
new file mode 100644
index 0000000..55ccfd0
--- /dev/null
+++ b/dcmtract/CMakeLists.txt
@@ -0,0 +1,10 @@
+# declare project
+PROJECT(dcmtract)
+
+# declare include directories which hold for all subdirectories
+INCLUDE_DIRECTORIES(${dcmtract_SOURCE_DIR}/include ${dcmiod_SOURCE_DIR}/include ${dcmdata_SOURCE_DIR}/include ${ofstd_SOURCE_DIR}/include ${oflog_SOURCE_DIR}/include ${ZLIB_INCDIR})
+
+# recurse into subdirectories
+FOREACH(SUBDIR libsrc include)
+ ADD_SUBDIRECTORY(${SUBDIR})
+ENDFOREACH(SUBDIR)
diff --git a/dcmtract/Makefile.in b/dcmtract/Makefile.in
new file mode 100644
index 0000000..1f52412
--- /dev/null
+++ b/dcmtract/Makefile.in
@@ -0,0 +1,86 @@
+#
+# Makefile for dcmtract
+#
+
+ at SET_MAKE@
+
+SHELL = /bin/sh
+VPATH = @srcdir@:@top_srcdir@/include:@top_srcdir@/@configdir@/include
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+configdir = @top_srcdir@/@configdir@
+
+include $(configdir)/@common_makefile@
+
+
+all: include-all libsrc-all tests-all
+
+install: install-doc install-support
+
+install-doc: docs-install
+
+install-data: data-install
+
+install-etc: etc-install
+
+install-include: include-install
+
+install-lib: libsrc-install install-include
+
+install-support: install-data install-etc
+
+
+include-all:
+ (cd include && $(MAKE) ARCH="$(ARCH)" all)
+
+libsrc-all: include-all
+ (cd libsrc && $(MAKE) ARCH="$(ARCH)" all)
+
+tests-all: libsrc-all
+ (cd tests && $(MAKE) ARCH="$(ARCH)" all)
+
+
+check: tests-all
+ (cd tests && $(MAKE) check)
+
+check-exhaustive: tests-all
+ (cd tests && $(MAKE) check-exhaustive)
+
+
+include-install:
+ (cd include && $(MAKE) ARCH="$(ARCH)" install)
+
+libsrc-install: libsrc-all
+ (cd libsrc && $(MAKE) ARCH="$(ARCH)" install)
+
+docs-install:
+ (cd docs && $(MAKE) install)
+
+data-install:
+ (cd data && $(MAKE) install)
+
+etc-install:
+ (cd etc && $(MAKE) install)
+
+
+clean:
+ (cd include && $(MAKE) clean)
+ (cd libsrc && $(MAKE) clean)
+ (cd tests && $(MAKE) clean)
+ (cd docs && $(MAKE) clean)
+ (cd data && $(MAKE) clean)
+ (cd etc && $(MAKE) clean)
+ rm -f $(TRASH)
+
+distclean:
+ (cd include && $(MAKE) distclean)
+ (cd libsrc && $(MAKE) distclean)
+ (cd tests && $(MAKE) distclean)
+ (cd docs && $(MAKE) distclean)
+ (cd data && $(MAKE) distclean)
+ (cd etc && $(MAKE) distclean)
+ rm -f $(DISTTRASH)
+
+dependencies:
+ (cd libsrc && touch $(DEP) && $(MAKE) dependencies)
+ (cd tests && touch $(DEP) && $(MAKE) dependencies)
diff --git a/dcmtract/configure b/dcmtract/configure
new file mode 100755
index 0000000..3877a6a
--- /dev/null
+++ b/dcmtract/configure
@@ -0,0 +1,53 @@
+#! /bin/sh
+
+parentdir=`pwd`
+thisdir=$parentdir
+
+# The following test constructs relative path from the module
+# directory to the configuration directory. If you know this path
+# you can substitute this with
+# configdir=<relative_path>
+# It is very important that the configdir path is relative.
+
+configdir="configdir"
+
+while test "$parentdir" != "/" -a "$configdir" = "configdir"; do
+ if test -d "$parentdir/config" ; then
+ configdir=$parentdir/config
+ else
+ parentdir=`echo $parentdir | sed 's/\/[^\/]*$//'`
+ fi
+done
+
+if test "$configdir" = "configdir" ; then
+ echo "Cannot find configure directory"
+ exit 1
+fi
+
+if test $# != 0; then
+ case $1 in
+ -a)
+ shift
+ cd "$configdir"
+ echo "running configure in config-directory"
+ ./configure $*
+ cd $thisdir
+ echo "running configure for this module"
+ sh "$configdir/confmod" --srcdir=. $*
+ ;;
+ -c)
+ shift
+ cd "$configdir"
+ echo "running configure in config-directory"
+ ./configure $*
+ ;;
+ *)
+ echo "running configure for this module"
+ sh "$configdir/confmod" --srcdir=. $*
+ ;;
+ esac
+else
+ echo "running configure for this module"
+ sh "$configdir/confmod" --srcdir=. $*
+fi
+
diff --git a/dcmtract/data/Makefile.in b/dcmtract/data/Makefile.in
new file mode 100644
index 0000000..6ea7b09
--- /dev/null
+++ b/dcmtract/data/Makefile.in
@@ -0,0 +1,23 @@
+#
+# Makefile for dcmtract/data
+#
+
+ at SET_MAKE@
+
+SHELL = /bin/sh
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+configdir = @top_srcdir@/@configdir@
+
+include $(configdir)/@common_makefile@
+
+
+all:
+
+install:
+
+clean:
+ rm -f $(TRASH)
+
+distclean:
+ rm -f $(DISTTRASH)
diff --git a/dcmtract/docs/Makefile.in b/dcmtract/docs/Makefile.in
new file mode 100644
index 0000000..c02c8c0
--- /dev/null
+++ b/dcmtract/docs/Makefile.in
@@ -0,0 +1,23 @@
+#
+# Makefile for dcmtract/docs
+#
+
+ at SET_MAKE@
+
+SHELL = /bin/sh
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+configdir = @top_srcdir@/@configdir@
+
+include $(configdir)/@common_makefile@
+
+
+all:
+
+install:
+
+clean:
+ rm -f $(TRASH)
+
+distclean:
+ rm -f $(DISTTRASH)
diff --git a/dcmtract/docs/dcmtract.dox b/dcmtract/docs/dcmtract.dox
new file mode 100644
index 0000000..12566ff
--- /dev/null
+++ b/dcmtract/docs/dcmtract.dox
@@ -0,0 +1,159 @@
+/*!
+
+\page mod_dcmtract dcmtract: a library for working with Tractography Results
+
+This module contains classes to deal with DICOM Tractography Results objects.
+It is able to create, load and access the contained fiber tracks and the related
+meta information.
+
+The module fully supports Measurements and Statistics (on a per-track and track
+set) basis as defined in the standard.
+
+Several checks (as possible) make sure that only valid Tractography objects can
+be written. However, this module is not meant to \e modify existing
+Tractography Result objects but only to create them from scratch. This means
+that loading a file and then modify it \e may lead to inconsistent DICOM objects
+when saved.
+
+This module makes heavy use of the \ref mod_dcmiod "dcmiod" module for managing
+common IOD attributes as found in the Patient, General Study or General Series
+Module.
+
+The main class of this module is:
+\li \b TrcTractographyResults
+
+
+\section Examples
+
+The following (complete) example shows how to load a DICOM Tractography Results
+object and dump an overview of the contained data:
+
+\code
+#include "dcmtk/config/osconfig.h" /* make sure OS specific configuration is included first */
+#include "dcmtk/dcmtract/trctractographyresults.h"
+#include "dcmtk/dcmtract/trctrack.h"
+
+// Main routine of test app
+int main(int argc, char *argv[])
+{
+ if (argc < 2)
+ {
+ CERR << "Usage: read <inputfile>" << OFendl;
+ return 1;
+ }
+ OFCondition result;
+ TrcTractographyResults *trc = NULL;
+ result = TrcTractographyResults::loadFile(argv[1], trc);
+ if (result.bad())
+ {
+ CERR << "Unable to load Tractography Results file: " << result.text();
+ return 1;
+ }
+ OFString val;
+ trc->getPatient().getPatientName(val);
+ COUT << "Patient Name: " << val << OFendl;
+ trc->getStudy().getStudyInstanceUID(val);
+ COUT << "Study : " << val << OFendl;
+ trc->getSeries().getSeriesInstanceUID(val);
+ COUT << "Series : " << val << OFendl;
+ trc->getSOPCommon().getSOPInstanceUID(val);
+ COUT << "Instance : " << val << OFendl;
+ COUT << "-------------------------------------------------------------------------" << OFendl;
+ size_t numTrackSets = trc->getNumberOfTrackSets();
+ COUT << "Track Sets (total: " << numTrackSets << ")" << OFendl;
+ OFVector<TrcTrackSet*>& sets = trc->getTrackSets();
+ for (size_t ts = 0; ts < numTrackSets; ts++)
+ {
+ size_t numTracks = sets[ts]->getNumberOfTracks();
+ COUT << " Track Set #" << ts << ": " << numTracks << " Tracks, "
+ << sets[ts]->getNumberOfTrackSetStatistics() << " Track Set Statistics, "
+ << sets[ts]->getNumberOfTrackStatistics() << " Track Statistics, "
+ << sets[ts]->getNumberOfMeasurements() << " Measurements " << OFendl;
+ for (size_t t = 0; t < numTracks; t++)
+ {
+ TrcTrack* track = sets[ts]->getTracks()[t];
+ const Float32* vals = NULL;
+ size_t numPoints = track->getTrackData(vals);
+ COUT << " Track #" << t << "'s first 3/" << numTracks << " points: ";
+ for (size_t v = 0; (v < 3) && (v < numPoints); v++)
+ {
+ COUT << "(" << vals[v] << "," << vals[v+1] << "," << vals[v+2] << ") " ;
+ }
+ COUT << OFendl;
+ }
+ }
+ delete trc;
+ return 0;
+}
+\endcode
+
+The following (complete) example demonstrates creation of a minimal Tractography
+Results object (single TrackSet with one Track and no Statistics or
+Measurements). All IDs, UIDs and Track values are, of course, just meaningless
+examples:
+
+\code
+#include "dcmtk/config/osconfig.h" /* make sure OS specific configuration is included first */
+#include "dcmtk/dcmtract/trctractographyresults.h"
+
+// Main routine of test app
+int main(int argc, char *argv[])
+{
+ // Create tractography results object
+ OFCondition result;
+ // Instance Number, Label, Description, Creator's Name
+ ContentIdentificationMacro id("1", "MINI_TRACT", "Minimal Tractography object for demonstration", "Open Connections GmbH");
+ // Manufacturer, model name, serial number, software version(s)
+ IODEnhGeneralEquipmentModule::EquipmentInfo equipment("Open Connections Gmbh", "dcmtract library", "0815", OFFIS_DCMTK_VERSION_STRING);
+ IODReferences refs;
+ // We need at least one image reference this Tractography Results object is based on.
+ // We provide: Patient ID, Study Instance UID, Series Instance UID, SOP Instance UID, SOP Class UID
+ IODImageReference* ref = new IODImageReference("PAT_ID_4711", "1.2.3", "4.5.6", "7.8.9", UID_MRImageStorage);
+ refs.add(ref);
+ OFString contentDate = "20160601";
+ OFString contentTime = "120000";
+ TrcTractographyResults *trc = NULL;
+ TrcTractographyResults::create(id, contentDate, contentTime, equipment, refs, trc);
+
+ // Create track set
+ CodeWithModifiers anatomy;
+ anatomy.set("T-A0095", "SRT", "White matter of brain and spinal cord");
+ // Every CodeSequenceMacro has: Code Value, Coding Scheme Designator, Code Meaning
+ CodeSequenceMacro diffusionModel("113231", "DCM", "Single Tensor");
+ CodeSequenceMacro algorithmId("113211", "DCM", "Deterministic");
+ TrcTrackSet *set = NULL;
+ trc->addTrackSet("First and last Track Set", "Mini description", anatomy, diffusionModel, algorithmId, set);
+
+ // Create track
+ Uint16 cieLabColor[3]; // color the whole track with this color; we use some blue
+ cieLabColor[0] = 30000; // L
+ cieLabColor[1] = 0 ; // a
+ cieLabColor[2] = 0 ; // b
+ Float32 pointData[30]; // actual data, 10 data points with x,y,z coordinates
+ for (size_t f = 0; f < 10; f++)
+ {
+ // x coordinate, varies
+ pointData[f*3] = f;
+ // static y coordinate
+ pointData[f*3+1] = 1;
+ // static z coordinate
+ pointData[f*3+2] = 2;
+ }
+ TrcTrack* track = NULL;
+ set->addTrack(pointData, 10, cieLabColor, 1 /* numColors */, track);
+
+ // Frame of Reference is required; could be the same as from related MR series
+ trc->getFrameOfReference().setFrameOfReferenceUID("10.11.12");
+
+ // Set some optional data
+ trc->getPatient().setPatientID("4711");
+ trc->getPatient().setPatientName("Doe^John");
+ trc->getSeries().setSeriesDescription("This is just a test series with a single Tractography Results object inside");
+
+ // Save file
+ trc->saveFile("/tmp/create_demo.dcm");
+ delete trc;
+ return 0;
+}
+\endcode
+*/
diff --git a/dcmtract/etc/Makefile.in b/dcmtract/etc/Makefile.in
new file mode 100644
index 0000000..7b0eba0
--- /dev/null
+++ b/dcmtract/etc/Makefile.in
@@ -0,0 +1,23 @@
+#
+# Makefile for dcmtract/etc
+#
+
+ at SET_MAKE@
+
+SHELL = /bin/sh
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+configdir = @top_srcdir@/@configdir@
+
+include $(configdir)/@common_makefile@
+
+
+all:
+
+install:
+
+clean:
+ rm -f $(TRASH)
+
+distclean:
+ rm -f $(DISTTRASH)
diff --git a/dcmtract/include/CMakeLists.txt b/dcmtract/include/CMakeLists.txt
new file mode 100644
index 0000000..8e86d4f
--- /dev/null
+++ b/dcmtract/include/CMakeLists.txt
@@ -0,0 +1,2 @@
+# declare installation files
+INSTALL(DIRECTORY dcmtk/dcmtract DESTINATION ${DCMTK_INSTALL_INCDIR}/dcmtk COMPONENT include FILES_MATCHING PATTERN "*.h" PATTERN "CVS" EXCLUDE)
diff --git a/dcmtract/include/Makefile.in b/dcmtract/include/Makefile.in
new file mode 100644
index 0000000..39a1cc1
--- /dev/null
+++ b/dcmtract/include/Makefile.in
@@ -0,0 +1,27 @@
+#
+# Makefile for dcmtract/include
+#
+
+ at SET_MAKE@
+
+SHELL = /bin/sh
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+configdir = @top_srcdir@/@configdir@
+
+include $(configdir)/@common_makefile@
+
+
+all:
+
+install:
+ $(configdir)/mkinstalldirs $(DESTDIR)$(includedir)/dcmtk/dcmtract
+ for file in dcmtk/dcmtract/*.h ; do \
+ $(INSTALL_DATA) $$file $(DESTDIR)$(includedir)/dcmtk/dcmtract ;\
+ done
+
+clean:
+ rm -f $(TRASH)
+
+distclean:
+ rm -f $(DISTTRASH)
diff --git a/dcmtract/include/dcmtk/dcmtract/trcdef.h b/dcmtract/include/dcmtk/dcmtract/trcdef.h
new file mode 100644
index 0000000..556da53
--- /dev/null
+++ b/dcmtract/include/dcmtk/dcmtract/trcdef.h
@@ -0,0 +1,37 @@
+/*
+ *
+ * Copyright (C) 2016, Open Connections GmbH
+ * All rights reserved. See COPYRIGHT file for details.
+ *
+ * This software and supporting documentation are maintained by
+ *
+ * OFFIS e.V.
+ * R&D Division Health
+ * Escherweg 2
+ * D-26121 Oldenburg, Germany
+ *
+ *
+ * Module: dcmtract
+ *
+ * Author: Michael Onken
+ *
+ * Purpose: Contains preprocessor definitions
+ *
+ */
+
+
+#ifndef TRCDEF_H
+#define TRCDEF_H
+
+#include "dcmtk/config/osconfig.h"
+#include "dcmtk/ofstd/ofdefine.h"
+
+// definitions for DLL/shared library exports
+
+#ifdef dcmtract_EXPORTS
+#define DCMTK_DCMTRACT_EXPORT DCMTK_DECL_EXPORT
+#else
+#define DCMTK_DCMTRACT_EXPORT DCMTK_DECL_IMPORT
+#endif
+
+#endif // TRCDEF_H
diff --git a/dcmtract/include/dcmtk/dcmtract/trcmeasurement.h b/dcmtract/include/dcmtk/dcmtract/trcmeasurement.h
new file mode 100644
index 0000000..01fe2be
--- /dev/null
+++ b/dcmtract/include/dcmtk/dcmtract/trcmeasurement.h
@@ -0,0 +1,248 @@
+/*
+ *
+ * Copyright (C) 2016, Open Connections GmbH
+ * All rights reserved. See COPYRIGHT file for details.
+ *
+ * This software and supporting documentation are maintained by
+ *
+ * OFFIS e.V.
+ * R&D Division Health
+ * Escherweg 2
+ * D-26121 Oldenburg, Germany
+ *
+ *
+ * Module: dcmtract
+ *
+ * Author: Michael Onken
+ *
+ * Purpose: Track Set's Measurement from a Tractography Results IOD
+ *
+ */
+
+
+#ifndef TRCMEASUREMENT_H
+#define TRCMEASUREMENT_H
+
+#include "dcmtk/config/osconfig.h"
+#include "dcmtk/dcmiod/modbase.h"
+#include "dcmtk/dcmiod/iodutil.h"
+#include "dcmtk/dcmiod/iodmacro.h" // for CodeSequenceMacro
+#include "dcmtk/dcmtract/trctypes.h"
+
+
+/** Class representing a Measurement within the Tractography Results IOD. A
+ * measurement provides measurement values for all tracks in the related
+ * track set. Measurement values can be defined for all points in a track,
+ * or only selected point indices.
+ */
+class DCMTK_DCMTRACT_EXPORT TrcMeasurement
+: public IODComponent
+{
+
+public:
+
+ /** Class that holds actual measurement values.
+ */
+ class DCMTK_DCMTRACT_EXPORT Values : public IODComponent
+ {
+ public:
+
+ // Allow read/write functions in DcmIODUtil to access class internals
+ friend class DcmIODUtil;
+
+ /** Create TrcMeasurement::Values from minimal data.
+ * @param dataValues The measurement values
+ * @param numValues The number of measurement values. Must be equal
+ * to the numbers of data points in the related track.
+ * @param values The measurement values
+ * @return EC_Normal if creating was successful, error otherwise
+ */
+ static OFCondition create(const Float32* dataValues,
+ const unsigned long numValues,
+ TrcMeasurement::Values*& values /* result */);
+
+ /** Create TrcMeasurement::Values from minimal data by providing
+ * measurement values as well as indices of those points those
+ * measurement values apply to.
+ * @param dataValues The measurement values
+ * @param numValues The number of measurement values, must be equal or
+ * less to number of data points in the related track.
+ * @param trackPointIndices The indices of the points the measurement
+ * values apply to
+ * @param values The measurement values
+ * @return EC_Normal if creating was successful, error otherwise
+ */
+ static OFCondition createWithIndices(const Float32* dataValues,
+ const unsigned long numValues,
+ const Uint32* trackPointIndices,
+ TrcMeasurement::Values*& values /* result */);
+
+ /** Get measurement values and the point indices (if applicable)
+ * @param dataValues Pointer to memory buffer with returned values
+ * @param numValues The number of measurement values returned in
+ * dataValues
+ * @param trackPointIndices The indices of the points the measurement
+ * values apply to. If there is a measurement value for each
+ * points in the track, NULL will be returned here.
+ * @return EC_Normal if measurement values could be retrieved, error
+ * otherwise.
+ */
+ virtual OFCondition get(const Float32*& dataValues,
+ unsigned long& numValues,
+ const Uint32*& trackPointIndices);
+
+ /** Destructor, frees memory
+ */
+ virtual ~Values();
+
+ /** Resets rules to their original values
+ */
+ virtual void resetRules();
+
+ /** Get name of component
+ * @return Name of the module ("MeasurementValuesSequenceItem")
+ */
+ virtual OFString getName() const;
+
+ protected:
+
+ /** Protected constructor, use create() method to create a new track set
+ */
+ Values();
+ };
+
+ // Allow read/write functions in DcmIODUtil to access class internals
+ friend class DcmIODUtil;
+
+ /** Create TrcMeasurement from minimal data
+ * @param measurementCode Code describing what is measured. Code must be
+ * taken from CID 7263 "Diffusion Tractography Measurement Types"
+ * @param measurementUnitCodes Code describing the physical unit measured.
+ * Code must taken from CID 82 "Units of Measurement" (based on UCUM)
+ * @param measurement The measurement, if it could be created, NULL otherwise
+ * @return EC_Normal if measurement could be created, error otherwise
+ */
+ static OFCondition create(const CodeSequenceMacro& measurementCode,
+ const CodeSequenceMacro& measurementUnitCodes,
+ TrcMeasurement*& measurement /* result */);
+
+ /** Destructor, frees memory
+ */
+ virtual ~TrcMeasurement();
+
+ /** Get measurement data for a selected track
+ * @param trackNumber The track whose measurement data should be retrieved
+ * @param type Returns the type of measurement
+ * @param units Returns the units of measurement
+ * @param measurementData Returns the measurement data values
+ * @param numMeasurementData Returns the number of measurement values in
+ * measurementData
+ * @param pointIndices Returns the point indices the measurement data
+ * values refer to. If they refer to all points in the track,
+ * NULL is returned here
+ * @return EC_Normal if measurement could be retrieved, error otherwise.
+ */
+ virtual OFCondition get(const size_t trackNumber,
+ CodeSequenceMacro& type,
+ CodeSequenceMacro& units,
+ const Float32*& measurementData,
+ unsigned long& numMeasurementData,
+ const Uint32*& pointIndices);
+
+ /** Set measurement values for a single track. Requires measurement value for
+ * all points in the track.
+ * @param trackNumber The number of the track to set values for (0 for
+ * first track)
+ * @param measurementValues The measurement values
+ * @param numValues Number of measurement values in measurementValues, must
+ * be equal to number of values in track.
+ * @return EC_Normal if values could be set, error code otherwise
+ */
+ virtual OFCondition setTrackValues(const size_t trackNumber,
+ const Float32* measurementValues,
+ const unsigned long& numValues);
+
+ /** Set measurement values for a single track. Requires list of indices to
+ * those points in track for which the measurement values are defined for.
+ * @param trackNumber The number of the track to set values for (0 for
+ * first track)
+ * @param measurementValues The measurement values
+ * @param numValues Number of measurement values in measurementValues, must
+ * be equal or less to number of values in track.
+ * @param pointIndices Indices of the points in the track that the
+ * measurement values apply to. Number of values must be equal to
+ * numValues.
+ * @return EC_Normal if values could be set, error code otherwise
+ */
+ virtual OFCondition setTrackValues(const size_t trackNumber,
+ const Float32* measurementValues,
+ const unsigned long& numValues,
+ const Uint32* pointIndices);
+
+ /** Read attributes from given item into this class
+ * @param source The source to read from
+ * @param clearOldData If OFTrue, old data is cleared before reading. Otherwise
+ * old data is overwritten (or amended)
+ * @result EC_Normal if reading was successful, error otherwise
+ */
+ virtual OFCondition read(DcmItem& source,
+ const OFBool clearOldData = OFTrue);
+
+ /** Write attributes from this class into given item
+ * @param destination The item to write to
+ * @result EC_Normal if writing was successful, error otherwise
+ */
+ virtual OFCondition write(DcmItem& destination);
+
+ /** Get measurement values for all tracks
+ * @return Reference to measurement values for all tracks
+ */
+ virtual OFVector<TrcMeasurement::Values*>& getValues();
+
+ /** Get reference to type of measurement code
+ * @return Reference to type of measurement code
+ */
+ virtual CodeSequenceMacro& getType();
+
+ /** Get reference to measurement units code
+ * @return Reference to measurement units code
+ */
+ virtual CodeSequenceMacro& getUnits();
+
+ /** Resets rules to their original values
+ */
+ virtual void resetRules();
+
+ /** Get name of component
+ * @return Name of the module ("MeasurementsSequenceItem")
+ */
+ virtual OFString getName() const;
+
+ /** Clear all data
+ */
+ virtual void clearData();
+
+protected:
+
+ /** Protected constructor, use create() method to create a new track set
+ */
+ TrcMeasurement();
+
+ /** Check whether measurement values for all tracks are set
+ * @return OFTrue if values are completely present, OFFalse otherwise
+ */
+ virtual OFBool checkValuesComplete();
+
+private:
+
+ /// Single item from Concept Name Code Sequence (type of measurement)
+ CodeSequenceMacro m_Type;
+
+ /// Single item from Measurement Units Code Sequence (units of measurement)
+ CodeSequenceMacro m_Units;
+
+ /// Items from from Measurement Values Sequence
+ OFVector<TrcMeasurement::Values*> m_Values;
+};
+
+#endif // TRCMEASUREMENT_H
diff --git a/dcmtract/include/dcmtk/dcmtract/trcmodtractresults.h b/dcmtract/include/dcmtk/dcmtract/trcmodtractresults.h
new file mode 100644
index 0000000..97a7110
--- /dev/null
+++ b/dcmtract/include/dcmtk/dcmtract/trcmodtractresults.h
@@ -0,0 +1,174 @@
+/*
+ *
+ * Copyright (C) 2016, Open Connections GmbH
+ * All rights reserved. See COPYRIGHT file for details.
+ *
+ * This software and supporting documentation are maintained by
+ *
+ * OFFIS e.V.
+ * R&D Division Health
+ * Escherweg 2
+ * D-26121 Oldenburg, Germany
+ *
+ *
+ * Module: dcmtract
+ *
+ * Author: Michael Onken
+ *
+ * Purpose: Class representing the Tractography Results Module
+ *
+ */
+
+#ifndef TRCMODTRACTRESULTS_H
+#define TRCMODTRACTRESULTS_H
+
+#include "dcmtk/config/osconfig.h"
+#include "dcmtk/ofstd/ofstring.h"
+#include "dcmtk/dcmiod/modbase.h"
+#include "dcmtk/dcmiod/iodmacro.h" // for Content Identification Macro
+#include "dcmtk/dcmiod/iodreferences.h"
+#include "dcmtk/dcmtract/trctrackset.h"
+
+
+/** Class representing the Tractography Results Module
+ */
+class TrcTractographyResultsModule : public IODModule
+{
+
+public:
+
+ /** Constructor
+ * @param item The item to be used for data storage. If NULL, the
+ * class creates an empty data container.
+ * @param rules The rule set for this class. If NULL, the class creates
+ * a new set of rules and adds its own rules to it.
+ */
+ TrcTractographyResultsModule(OFshared_ptr<DcmItem> item,
+ OFshared_ptr<IODRules> rules);
+
+ /** Constructor
+ */
+ TrcTractographyResultsModule();
+
+ /** Destructor
+ */
+ virtual ~TrcTractographyResultsModule();
+
+ /** Read data into this module from given item
+ * @param source The item to read from
+ * @param clearOldData If OFTrue, old data in this module is cleared first
+ * (default: OFTrue)
+ * @return EC_Normal if reading was successful, error otherwise
+ */
+ virtual OFCondition read(DcmItem& source,
+ const OFBool clearOldData = OFTrue);
+
+ /** Write this module to given item
+ * @param destination The item to write to
+ * @return EC_Normal if writing was successful, error otherwise
+ */
+ virtual OFCondition write(DcmItem& destination);
+
+ /** Clear (removes) all attributes handled by the modules of this component.
+ * Rules are not reset.
+ */
+ virtual void clearData();
+
+ /** Resets rules to their original values
+ */
+ virtual void resetRules();
+
+ /** Get name of macro
+ * @return Name of the module ("TractographyResultsModule")
+ */
+ virtual OFString getName() const;
+
+ /** Get track sets
+ * @return Reference to track sets
+ */
+ virtual OFVector<TrcTrackSet*>& getTrackSets();
+
+ /** Get Content Identification Macro
+ * @return Reference to Content Identification Macro
+ */
+ virtual ContentIdentificationMacro& getContentIdentification();
+
+ /** Return references to images that contributed to the Tractography Results
+ * object. The references is populated from the content of the Referenced
+ * Instance Sequence (and will be used for populating it when writing)
+ */
+ virtual IODReferences& getReferencedInstances();
+
+ /** Get Content Date
+ * @param value Reference to variable in which the value should be stored
+ * @param pos Index of the value to get (0..vm-1), -1 for all components
+ * @return EC_Normal if successful, an error code otherwise
+ */
+ virtual OFCondition getContentDate(OFString &value,
+ const signed long pos = 0);
+
+ /** Get Content Time
+ * @param value Reference to variable in which the value should be stored
+ * @param pos Index of the value to get (0..vm-1), -1 for all components
+ * @return EC_Normal if successful, an error code otherwise
+ */
+ virtual OFCondition getContentTime(OFString &value,
+ const signed long pos = 0);
+
+ /** Set Content Date
+ * @param value Value to be set (single value only).
+ * @param checkValue Check 'value' for conformance with VR (DA) and VM (1) if enabled
+ * @return EC_Normal if successful, an error code otherwise
+ */
+ virtual OFCondition setContentDate(const OFString &value,
+ const OFBool checkValue = OFTrue);
+
+ /** Set Content Time
+ * @param value Value to be set (single value only).
+ * @param checkValue Check 'value' for conformance with VR (TM) and VM (1) if enabled
+ * @return EC_Normal if successful, an error code otherwise
+ */
+ virtual OFCondition setContentTime(const OFString &value,
+ const OFBool checkValue = OFTrue);
+
+ /** Add reference to image which was used to create this Tractography Results
+ * object. Alternatively, getReferencedInstances() can be used.
+ * @param imageRef The image reference to add
+ * @return EC_Normal if adding was successful, error otherwise
+ */
+ virtual OFCondition addImageReference(const IODReference& imageRef);
+
+ /** Check whether this component's data satisfies the underlying
+ * rules
+ * @param quiet If OFTrue, not error / warning messages will be produced. Only
+ * the returned error code will indicate error or OK. Per default,
+ * logging output is produced (OFFalse).
+ * @result EC_Normal if rules are satisfied, error otherwise
+ */
+ virtual OFCondition check(const OFBool quiet = OFFalse);
+
+protected:
+
+ /** Check whether color information is valid, i.e. coloring is either
+ * (for each Track Set): Per Track Set, per Track or Data Point-specific.
+ * @result EC_Normal if rules are satisfied, error otherwise
+ */
+ virtual OFCondition checkColoring();
+
+private:
+
+ /// Content Identification for this Tractography Results object
+ ContentIdentificationMacro m_ContentIdentification;
+
+ /// Content Identification for this Tractography Results object
+ OFVector<TrcTrackSet*> m_TrackSets;
+
+ /// Referenced instances, represents content of Referenced Instance Sequence
+ IODReferences m_ReferencedInstances;
+
+ /// The module's name ("TractographyResultsModule")
+ static const OFString m_ModuleName;
+
+};
+
+#endif // TRCMODTRACTRESULTS_H
diff --git a/dcmtract/include/dcmtk/dcmtract/trcstatistic.h b/dcmtract/include/dcmtk/dcmtract/trcstatistic.h
new file mode 100755
index 0000000..6752221
--- /dev/null
+++ b/dcmtract/include/dcmtk/dcmtract/trcstatistic.h
@@ -0,0 +1,318 @@
+/*
+ *
+ * Copyright (C) 2016, Open Connections GmbH
+ * All rights reserved. See COPYRIGHT file for details.
+ *
+ * This software and supporting documentation are maintained by
+ *
+ * OFFIS e.V.
+ * R&D Division Health
+ * Escherweg 2
+ * D-26121 Oldenburg, Germany
+ *
+ *
+ * Module: dcmtract
+ *
+ * Author: Michael Onken
+ *
+ * Purpose: Statistics from a Tractography Results IOD
+ *
+ */
+
+
+#ifndef TRCSTATISTIC_H
+#define TRCSTATISTIC_H
+
+#include "dcmtk/config/osconfig.h"
+#include "dcmtk/dcmiod/modbase.h"
+#include "dcmtk/dcmiod/iodutil.h"
+#include "dcmtk/dcmiod/iodmacro.h"
+#include "dcmtk/dcmtract/trctypes.h"
+
+// Forward declarations
+
+class CodeSequenceMacro;
+
+/** Base class representing a statistic within the "Tractography Results" IOD. A
+ * statistic is of a certain type and applies to a specific region of interest.
+ * For each Track Set and for each track there may be one or more statistics
+ * defined. The specializations can be found in classes TrcTracksStatistic and
+ * TrcTrackSetStatistic.
+ */
+class DCMTK_DCMTRACT_EXPORT TrcStatistic
+: public IODComponent
+{
+
+public:
+
+ // Allow read/write functions in DcmIODUtil to access class internals
+ friend class DcmIODUtil;
+
+ /** Constructor
+ */
+ TrcStatistic();
+
+ /** Destructor, frees memory
+ */
+ virtual ~TrcStatistic();
+
+ /** Clears all data
+ */
+ virtual void clearData();
+
+ /** Read attributes from given item into this class
+ * @param source The source to read from
+ * @param clearOldData If OFTrue, old data is cleared before reading. Otherwise
+ * old data is overwritten (or amended)
+ * @result EC_Normal if reading was successful, error otherwise
+ */
+ virtual OFCondition read(DcmItem& source,
+ const OFBool clearOldData = OFTrue);
+
+ /** Write attributes from this class into given item
+ * @param destination The item to write to
+ * @result EC_Normal if writing was successful, error otherwise
+ */
+ virtual OFCondition write(DcmItem& destination);
+
+ /** Set descriptive information of statistic
+ * @param typeCode The type of statistic, DICOM prescribes codes from
+ * CID 7263 "Diffusion Tractography Measurement Types"
+ * @param typeModifierCode Defines the region of interest, DICOM prescribes
+ * code from CID 7464 "General Region of Interest Measurement
+ * Modifiers"
+ * @param unitsCode The physical units of the statistic value, DICOM
+ * prescribes code from CID 82 "Units of Measurement" (UCUM).
+ * @return EC_Normal if setting was successful, error otherwise.
+ */
+ virtual OFCondition set(const CodeSequenceMacro& typeCode,
+ const CodeSequenceMacro& typeModifierCode,
+ const CodeSequenceMacro& unitsCode);
+
+ /** Get descriptive information of statistic
+ * @param typeCode Returns type of statistic
+ * @param typeModifierCode Returns region of interest
+ * @param unitsCode Returns physical units of the statistic value
+ * @return EC_Normal if getting was successful, error otherwise.
+ */
+ virtual OFCondition get(CodeSequenceMacro& typeCode,
+ CodeSequenceMacro& typeModifierCode,
+ CodeSequenceMacro& unitsCode);
+
+ /** Resets rules to their original values
+ */
+ virtual void resetRules();
+
+protected:
+
+ /// Single item from Concept Name Code Sequence
+ CodeSequenceMacro m_Type;
+
+ /// Single item from Modifier Code Sequence
+ CodeSequenceMacro m_TypeModifier;
+
+ /// Single item from Unit Code Sequence
+ CodeSequenceMacro m_Units;
+
+ /// Floating Point Value(s), one for each Track in Track Set (for Track
+ /// Statistic), or a single value in case of Track Set Statistic
+ OFVector<Float32*> m_Values;
+};
+
+
+/** Class representing a statistic for Tracks in Track Set. Besides describing
+ * information like type of statistic, region o interest and units of the
+ * statistic values, the statistic defines a single statistic value for each
+ * track. Thus the number of statistic values must be identical to the number
+ * of tracks in the containing Track Set.
+ */
+class TrcTracksStatistic : public TrcStatistic
+{
+public:
+
+ /** Constructor
+ */
+ TrcTracksStatistic();
+
+ /** Destructor, frees memory
+ */
+ ~TrcTracksStatistic();
+
+ /** Create track statistic by providing the required information
+ * @param typeCode The value for which the statistic is a summary. DICOM
+ * prescribes code from CID 7263 "Diffusion Tractography Measurement
+ * Types"
+ * @param typeModifierCode The region of interest of the statistic. DICOM
+ * prescribes code from CID 7464 "General Region of Interest
+ * Measurement Modifiers"
+ * @param unitsCode The physical units of the statistic value. DICOM
+ * prescribes code from CID 82 "Units of Measurement".
+ * @param statisticValues The statistic values
+ * @param numValues The number of statistic values in statisticValues, must
+ * be equal to number of Tracks in the Track Set that this statistic
+ * applies to
+ * @param statistic Returns the resulting TrcTracksStatistic object (NULL
+ * in case of any error)
+ * @return EC_Normal if creation was successful, error otherwise
+ */
+ static OFCondition create(const CodeSequenceMacro& typeCode,
+ const CodeSequenceMacro& typeModifierCode,
+ const CodeSequenceMacro& unitsCode,
+ const Float32* statisticValues,
+ const size_t numValues,
+ TrcTracksStatistic*& statistic /* result */);
+
+ /** Read attributes from given item into this class
+ * @param source The source to read from
+ * @param clearOldData If OFTrue, old data is cleared before reading. Otherwise
+ * old data is overwritten (or amended)
+ * @result EC_Normal if reading was successful, error otherwise
+ */
+ virtual OFCondition read(DcmItem& source,
+ const OFBool clearOldData = OFTrue);
+
+ /** Write attributes from this class into given item
+ * @param destination The item to write to
+ * @result EC_Normal if writing was successful, error otherwise
+ */
+ virtual OFCondition write(DcmItem& destination);
+
+ /** Resets rules to their original values
+ */
+ virtual void resetRules();
+
+ /** Get name of component
+ * @return Name of the module ("TrackStatisticsSequenceItem")
+ */
+ virtual OFString getName() const;
+
+ /** Set Track statistic
+ * @param typeCode The value for which the statistic is a summary. DICOM
+ * prescribes code from CID 7263 "Diffusion Tractography Measurement
+ * Types"
+ * @param typeModifierCode The region of interest of the statistic. DICOM
+ * prescribes code from CID 7464 "General Region of Interest
+ * Measurement Modifiers"
+ * @param unitsCode The physical units of the statistic value. DICOM
+ * prescribes code from CID 82 "Units of Measurement".
+ * @param statisticValues The statistic values
+ * @param numValues The number of statistic values in statisticValues, must
+ * equal the number of tracks in containing Track Set
+ * @return EC_Normal if setting was successful, error otherwise
+ */
+ virtual OFCondition set(const CodeSequenceMacro& typeCode,
+ const CodeSequenceMacro& typeModifierCode,
+ const CodeSequenceMacro& unitsCode,
+ const Float32* statisticValues,
+ const size_t numValues);
+
+ /** Get Track statistic information
+ * @param typeCode Returns value for which the statistic is a summary.
+ * @param typeModifierCode Returns region of interest of the statistic.
+ * @param unitsCode Returns physical units of the statistic value.
+ * @param statisticValues Returns statistic values
+ * @param numValues Returns number of statistic values in statisticValues,
+ * should be equal to number of tracks in containing Track Set
+ * @return EC_Normal if data could be retrieved, error otherwise
+ */
+ virtual OFCondition get(CodeSequenceMacro& typeCode,
+ CodeSequenceMacro& typeModifierCode,
+ CodeSequenceMacro& unitsCode,
+ const Float32*& statisticValues,
+ unsigned long& numValues);
+};
+
+/** Class representing a Track Set statistic, i.e. a single statistic value that
+ * is amended by information about type of statistic, region of interest it as
+ * well as physical unit of the value. A Track Set can define 0 or more
+ * statistics.
+ */
+class TrcTrackSetStatistic : public TrcStatistic
+{
+public:
+
+ /** Constructor
+ */
+ TrcTrackSetStatistic();
+
+ /** Destructor, frees memory
+ */
+ virtual ~TrcTrackSetStatistic();
+
+ /** Create track statistic by providing the required information
+ * @param typeCode The value for which the statistic is a summary. DICOM
+ * prescribes code from CID 7263 "Diffusion Tractography Measurement
+ * Types"
+ * @param typeModifierCode The region of interest of the statistic. DICOM
+ * prescribes code from CID 7464 "General Region of Interest
+ * Measurement Modifiers"
+ * @param unitsCode The physical units of the statistic value. DICOM
+ * prescribes code from CID 82 "Units of Measurement".
+ * @param statisticValue The statistic value
+ * @param statistic Returns the resulting TrcTrackSetStatistic object (NULL
+ * in case of any error)
+ * @return EC_Normal if creation was successful, error otherwise
+ */
+ static OFCondition create(const CodeSequenceMacro& typeCode,
+ const CodeSequenceMacro& typeModifierCode,
+ const CodeSequenceMacro& unitsCode,
+ const Float64 statisticValue,
+ TrcTrackSetStatistic*& statistic /* result */);
+
+ /** Read attributes from given item into this class
+ * @param source The source to read from
+ * @param clearOldData If OFTrue, old data is cleared before reading. Otherwise
+ * old data is overwritten (or amended)
+ * @result EC_Normal if reading was successful, error otherwise
+ */
+ virtual OFCondition read(DcmItem& source,
+ const OFBool clearOldData = OFTrue);
+
+ /** Write attributes from this class into given item
+ * @param destination The item to write to
+ * @result EC_Normal if writing was successful, error otherwise
+ */
+ virtual OFCondition write(DcmItem& destination);
+
+ /** Resets rules to their original values
+ */
+ virtual void resetRules();
+
+ /** Get name of component
+ * @return Name of the module ("TrackSetStatisticsSequenceItem")
+ */
+ virtual OFString getName() const;
+
+ /** Set Track Set statistic
+ * @param typeCode The value for which the statistic is a summary. DICOM
+ * prescribes code from CID 7263 "Diffusion Tractography Measurement
+ * Types"
+ * @param typeModifierCode The region of interest of the statistic. DICOM
+ * prescribes code from CID 7464 "General Region of Interest
+ * Measurement Modifiers"
+ * @param unitsCode The physical units of the statistic value. DICOM
+ * prescribes code from CID 82 "Units of Measurement".
+ * @param statisticValue The statistic value
+ * @return EC_Normal if setting was successful, error otherwise
+ */
+ virtual OFCondition set(const CodeSequenceMacro& typeCode,
+ const CodeSequenceMacro& typeModifierCode,
+ const CodeSequenceMacro& unitsCode,
+ const Float64 statisticValue);
+
+ /** Get Track Set statistic information
+ * @param typeCode Returns value for which the statistic is a summary.
+ * @param typeModifierCode Returns region of interest of the statistic.
+ * @param unitsCode Returns physical units of the statistic value.
+ * @param statisticValue Returns the statistic value
+ * @return EC_Normal if data could be retrieved, error otherwise
+ */
+ virtual OFCondition get(CodeSequenceMacro& typeCode,
+ CodeSequenceMacro& typeModifierCode,
+ CodeSequenceMacro& unitsCode,
+ Float64& statisticValue);
+
+};
+
+
+#endif // TRCSTATISTIC_H
diff --git a/dcmtract/include/dcmtk/dcmtract/trctrack.h b/dcmtract/include/dcmtk/dcmtract/trctrack.h
new file mode 100644
index 0000000..a18409d
--- /dev/null
+++ b/dcmtract/include/dcmtk/dcmtract/trctrack.h
@@ -0,0 +1,201 @@
+/*
+ *
+ * Copyright (C) 2016, Open Connections GmbH
+ * All rights reserved. See COPYRIGHT file for details.
+ *
+ * This software and supporting documentation are maintained by
+ *
+ * OFFIS e.V.
+ * R&D Division Health
+ * Escherweg 2
+ * D-26121 Oldenburg, Germany
+ *
+ *
+ * Module: dcmtract
+ *
+ * Author: Michael Onken
+ *
+ * Purpose: Class representing a Track from a Tractography Results IOD
+ *
+ */
+
+
+#ifndef TCRTRACK_H
+#define TCRTRACK_H
+
+#include "dcmtk/config/osconfig.h"
+#include "dcmtk/dcmiod/modbase.h"
+#include "dcmtk/dcmtract/trctypes.h"
+
+
+/** Class representing a Track of of the "Tractography Results" IOD. This
+ * is the data contained in the items of the Track Sequence.
+ */
+class DCMTK_DCMTRACT_EXPORT TrcTrack
+: public IODComponent
+{
+
+public:
+
+ // Allow read/write functions in DcmIODUtil to access class internals
+ friend class DcmIODUtil;
+
+ /** Create TrcTrack object from required data
+ * @param trackDataPoints The data points of the track. Each point consists
+ * of x,y and z coordinate.
+ * @param numPoints The number of data points (i.e. number of coordinates
+ * divided by 3!)
+ * @param colors Optional parameter that defines the recommended display
+ * colors for all points. Each color is defined in CIELab space,
+ * which means "L", "a" and "b" value must be defined for each color.
+ * In DICOM, the value range must be 0 <= value <= 65535.
+ * @param numColors The number of colors in the colors parameter (i.e. number
+ * of L,a,b components divided by 3!). Alternatively, a single
+ * CIELab color can be provided, independent from the number of
+ * points in the track. In that case the color is used to color
+ * all points in the track. See also
+ * setRecommendedDisplayCIELabValues() for more explanations.
+ * @param trackSet Returns the resulting TrcTrack object (NULL in case of
+ * any error)
+ * @return EC_Normal if Track could be created, error otherwise
+ */
+ static OFCondition create(const Float32* trackDataPoints,
+ const size_t numPoints,
+ const Uint16* colors,
+ const size_t numColors,
+ TrcTrack*& trackSet /* result */);
+
+ /** Destructor, frees memory
+ */
+ virtual ~TrcTrack();
+
+ /** Get name of component
+ * @return Name of the module ("TrackSequenceItem")
+ */
+ virtual OFString getName() const;
+
+ /** Resets rules to their original values
+ */
+ virtual void resetRules();
+
+ /** Clear all data
+ */
+ virtual void clearData();
+
+ /** Check whether this component's data satisfies the underlying
+ * rules
+ * @param quiet If OFTrue, not error / warning messages will be produced. Only
+ * the returned error code will indicate error or OK. Per default,
+ * logging output is produced (OFFalse).
+ * @result EC_Normal if rules are satisfied, error otherwise
+ */
+ virtual OFCondition check(const OFBool quiet = OFFalse);
+
+ /** Read attributes from given item into this class
+ * @param source The source to read from
+ * @param clearOldData If OFTrue, old data is cleared before reading. Otherwise
+ * old data is overwritten (or amended)
+ * @result EC_Normal if reading was successful, error otherwise
+ */
+ virtual OFCondition read(DcmItem& source,
+ const OFBool clearOldData = OFTrue);
+
+ /** Write attributes from this class into given item
+ * @param destination The item to write to
+ * @result EC_Normal if writing was successful, error otherwise
+ */
+ virtual OFCondition write(DcmItem& destination);
+
+ /** Get Track Data
+ * @param data Pointer to the point data
+ * @return Returns number of points in the track or 0 if no points could
+ * be found.
+ * @return EC_Normal if successful, an error code otherwise
+ */
+ virtual size_t getTrackData(const Float32*& data) const;
+
+ /** Get Number of data points
+ */
+ virtual size_t getNumDataPoints();
+
+ /** Get Recommended Display CIELab Value. This will only return a result
+ * if a single value is defined to color the Track. Otherwise
+ * getRecommendedDisplayCIELabValueList() must be used.
+ * @param L Returns L component of CIELab color
+ * @param a Returns a component of CIELab color
+ * @param b Returns b component of CIELab color
+ * @return EC_Normal if successful, an error code otherwise
+ */
+ virtual OFBool getRecommendedDisplayCIELabValue(Uint16& L,
+ Uint16& a,
+ Uint16& b);
+
+ /** Get Recommended Display CIELab Value List. This will only return a result
+ * if one color per data point is defined.
+ * @param colors Returns list of colors, each consisting of
+ * L,a,b components
+ * @return Number of colors (i.e. number of components divided
+ * by 3!). If no colors are defined for data points, 0 is returned.
+ */
+ size_t getRecommendedDisplayCIELabValueList(const Uint16*& colors);
+
+ /** Returns the coloring mode, i.e. whether color is defined for all points
+ * in the track separately, or defined by a single color for the track, or
+ * if the track does not provide color information in which case the Track
+ * Set must provide a color (note that this is not checked, though).
+ * @return The coloring mode
+ */
+ TrcTypes::E_TrackColorMode getRecommendedDisplayCIELabMode();
+
+ /** Set Track Data
+ * @param trackDataPoints Array of values to be set, all points
+ * after another with each point consisting of x, y and z component.
+ * @param numPoints Number of points in array (one point consists
+ * of x, y, and z coordinates)
+ * @return EC_Normal if successful, an error code otherwise
+ */
+ virtual OFCondition setTrackData(const Float32* trackDataPoints,
+ const size_t numPoints);
+
+ /** Set Recommended Display CIELab Value (List)
+ * Depending on how many colors are provided, different DICOM is produced
+ * when writing the Track later:
+ * 0: No color information for this Track is stored (i.e. neither "Recommended
+ * Display CIELab Value" is set nor "Recommended Display CIELab Value List".
+ * Thus there must be a color definition on Track Set level instead.
+ * 1: The given color (consisting of L,a,b component) is recommended to be
+ * used for coloring every point in this track. This color will got to the
+ * element "Recommended Display CIELab value" for this particular track. In
+ * that case, the related Track Set must not have any color recommendation.
+ * >1: The number of colors must be equal to the number of data points. Each
+ * data point color is separately specified. This setting will lead to the
+ * element "Recommended Display CIELab Value List" to be written later.
+ * The related Track Set must not contain any color recommendation at all
+ * in that case.
+ * Note that if the third option (>1) is chosen, it must be provided for
+ * every track in the related Track Set!
+ * @param colors Array of color values to be set, all colors one
+ * after another with each color consisting of L, a and b component.
+ * @param numColors Number of colors in array (one point consists
+ * of x, y, and z coordinates).
+ * @return EC_Normal if successful, an error code otherwise
+ */
+ virtual OFCondition setRecommendedDisplayCIELabValues(const Uint16* colors,
+ const size_t numColors);
+
+protected:
+
+ /** Protected constructor, use create() method to create a new track set
+ */
+ TrcTrack();
+
+ /** Cut off point data in the end if the number of components is not dividable
+ * by 3 (each point must have x,y and z component)
+ * @return OFTrue if situation is ok (after fixing if applicable), otherwise
+ * OFFalse (e.g. in case of an internal error)
+ */
+ OFBool fixPointCoordinatesDataVM();
+
+};
+
+#endif // TCRTRACK_H
diff --git a/dcmtract/include/dcmtk/dcmtract/trctrackset.h b/dcmtract/include/dcmtk/dcmtract/trctrackset.h
new file mode 100644
index 0000000..671bd52
--- /dev/null
+++ b/dcmtract/include/dcmtk/dcmtract/trctrackset.h
@@ -0,0 +1,468 @@
+ /*
+ *
+ * Copyright (C) 2016, Open Connections GmbH
+ * All rights reserved. See COPYRIGHT file for details.
+ *
+ * This software and supporting documentation are maintained by
+ *
+ * OFFIS e.V.
+ * R&D Division Health
+ * Escherweg 2
+ * D-26121 Oldenburg, Germany
+ *
+ *
+ * Module: dcmtract
+ *
+ * Author: Michael Onken
+ *
+ * Purpose: Class representing a Track Set from a Tractography Results IOD
+ *
+ */
+
+
+#ifndef TRCTRACKSET_H
+#define TRCTRACKSET_H
+
+#include "dcmtk/config/osconfig.h"
+#include "dcmtk/dcmiod/modbase.h"
+#include "dcmtk/dcmiod/iodutil.h"
+#include "dcmtk/dcmiod/iodmacro.h" // for CodeSequenceMacro and CodeWithModifiers
+#include "dcmtk/dcmtract/trctypes.h"
+
+
+// Forward declarations
+class TrcTracksStatistic;
+class TrcTrackSetStatistic;
+class TrcTrack;
+class TrcMeasurement;
+
+/** Class representing a Track Set within the Tractography Results IOD. A Track
+ * Set is a set of tracks (really), and might define a measurements and
+ * statistics which then must be populated for all tracks in the set.
+ *
+ */
+class DCMTK_DCMTRACT_EXPORT TrcTrackSet
+: public IODComponent
+{
+
+public:
+
+ // Allow read/write functions in DcmIODUtil to access class internals
+ friend class DcmIODUtil;
+
+ /** Create TrcTrackSet object by proving required data
+ * @param trackSetLabel Label for the Track Set (256 chars max, VR=LO)
+ * @param trackSetDescription Description for the Track Set (2^32-2 bytes
+ * maximum, VR=UT)
+ * @param trackSetAnatomy Code for the anatomy the Track Set covers. DICOM
+ * proposes CID 7710 "Tractography Anatomic Sites" (Baseline)
+ * @param trackSetDiffusionModelCode Code for diffusion model used for Track
+ * Set. DICOM prescribes code from CID 7261 "Diffusion Model Value
+ * Types"
+ * @param trackSetAlgorithmIdentification Algorithm used in order to
+ * create Track Set. DICOM prescribes code from CID 7262 "Diffusion
+ * Tractography Algorithm Families".
+ * @param trackSet Returns the created Track Set, if successfull (NULL
+ * otherwise)
+ * @return EC_Normal if creation was successful, error otherwise
+ */
+ static OFCondition create(const OFString& trackSetLabel,
+ const OFString& trackSetDescription,
+ const CodeWithModifiers& trackSetAnatomy,
+ const CodeSequenceMacro& trackSetDiffusionModelCode,
+ const CodeSequenceMacro& trackSetAlgorithmIdentification,
+ TrcTrackSet*& trackSet /* result */);
+
+ /** Destructor, frees memory
+ */
+ virtual ~TrcTrackSet();
+
+ /** Resets rules to their original values
+ */
+ virtual void resetRules();
+
+ /** Set missing values by inventing "default values". Automatically
+ * called during write() by IODComponent.
+ */
+ virtual void inventMissing();
+
+ /** Get name of component
+ * @return Name of the module ("TrackSetSequenceItem")
+ */
+ virtual OFString getName() const;
+
+ /** Clear all data
+ */
+ virtual void clearData();
+
+ /** Read attributes from given item into this class
+ * @param source The source to read from
+ * @param clearOldData If OFTrue, old data is cleared before reading. Otherwise
+ * old data is overwritten (or amended)
+ * @result EC_Normal if reading was successful, error otherwise
+ */
+ virtual OFCondition read(DcmItem& source,
+ const OFBool clearOldData = OFTrue);
+
+ /** Get Tracks of this Track Set
+ * @return Reference to Tracks of this Track Set
+ */
+ virtual const OFVector<TrcTrack*>& getTracks();
+
+ /** Write attributes from this class into given item
+ * @param destination The item to write to
+ * @result EC_Normal if writing was successful, error otherwise
+ */
+ virtual OFCondition write(DcmItem& destination);
+
+ /** Get Track Set Number (should be 1-n)
+ * @param value Reference to variable in which the value should be stored
+ * @param pos Index of the value to get (0..vm-1)
+ * @return EC_Normal if successful, an error code otherwise
+ */
+ virtual OFCondition getTrackSetNumber(Uint16 &value,
+ const unsigned long pos = 0) const;
+
+ /** Get Track Set Label
+ * @param value Reference to variable in which the value should be stored
+ * @param pos Index of the value to get (0..vm-1), -1 for all components
+ * @return EC_Normal if successful, an error code otherwise
+ */
+ virtual OFCondition getTrackSetLabel(OFString &value,
+ const signed long pos = 0) const;
+
+ /** Get Track Set Description
+ * @param value Reference to variable in which the value should be stored
+ * @param pos Index of the value to get (0..vm-1), -1 for all components
+ * @return EC_Normal if successful, an error code otherwise
+ */
+ virtual OFCondition getTrackSetDescription(OFString &value,
+ const signed long pos = 0) const;
+
+ /** Get reference to Track Set Anatomical Type Code
+ * @return Reference to the code
+ */
+ virtual CodeWithModifiers& getTrackSetAnatomy();
+
+ /** Get copy of Recommended Display CIELab Value
+ * @param L Returns CIELab L value
+ * @param a Returns CIELab a value
+ * @param b Returns CIELab b value
+ * @return EC_Normal if successful, an error code otherwise
+ */
+ virtual OFCondition getRecommendedDisplayCIELabValue(Uint16& L,
+ Uint16& a,
+ Uint16& b);
+
+ /** Get Recommended Line Thickness
+ * @param value Reference to the variable in which the value should be stored
+ * @param pos Index of the value to get (0..vm-1)
+ * @return EC_Normal if successful, an error code otherwise
+ */
+ virtual OFCondition getRecommendedLineThickness(Float32& value,
+ const unsigned long pos = 0);
+ /** Get Laterality.
+ * @param laterality Reference to the variable in which the value should be stored.
+ * If value in dataset is not set at all, LAT_UNKNOWN is returned. If
+ * a value is present that is not covered by the standard LAT_ERROR
+ * is returned.
+ * @return EC_Normal if successful (i.e. not LAT_ERROR), error code otherwise
+ */
+ virtual OFCondition getLaterality(TrcTypes::E_TrackSetLaterality& laterality);
+
+
+ /** Find measurements of a specific type. They can be retrieved afterwards by
+ * using getMeasurement().
+ * @param type The measurement type to look for
+ * @param measurementNumbers Returns the measurement indexes that are
+ * of specified type.
+ * @return Always returns EC_Normal (for now).
+ */
+ virtual OFCondition findMeasurementsByType(const CodeSequenceMacro& type,
+ OFVector<size_t>& measurementNumbers);
+
+ /** Get measurement by index. The index can be identified by using
+ * findMeasurementsByType() or getMeasurementInfos()
+ * @param measurementIndex The index of the measurement (starting from 0)
+ * @param measurement Returns a reference to the measurement requested
+ * @return Returns EC_Normal if measurement exists, TRC_EC_NoSuchMeasurement
+ * otherwise
+ */
+ virtual OFCondition getMeasurement(const size_t measurementIndex,
+ const TrcMeasurement*& measurement);
+
+ /** Get descriptive information of all measurements
+ * @param typesAndUnits Returns vector of pairs, which each pair holding
+ * a code for type of measurement and its physical units.
+ */
+ virtual void getMeasurementInfos(OFVector<OFPair<CodeSequenceMacro, CodeSequenceMacro> >& typesAndUnits);
+
+ /** Get access to all statistics defined for the Tracks in this Track Set
+ * @return Returns reference to all Track statistics
+ */
+ virtual const OFVector<TrcTracksStatistic*>& getTrackStatistics();
+
+ /** Get access to all statistics defined for the Tracks in this Track Set
+ * @return Returns reference to all Track statistics
+ */
+ virtual const OFVector<TrcTrackSetStatistic*>& getTrackSetStatistics();
+
+ /** Get access to diffusion acquisition code
+ * @returns Returns reference to diffusion acquisition code
+ */
+ virtual CodeSequenceMacro& getDiffusionAcquisitionCode();
+
+ /** Get access to diffusion model code used
+ * @return Returns reference to diffusion model code
+ */
+ virtual CodeSequenceMacro& getDiffusionModelCode();
+
+ /** Get access to tracking algorithm identification codes
+ * @return Reference to tracking algorithm identification codes
+ */
+ virtual OFVector<CodeSequenceMacro*>& getTrackingAlgorithmIdentification();
+
+ /** Returns number of Tracks in Track Set
+ * @return Number of Tracks in Track Set
+ */
+ size_t getNumberOfTracks();
+
+ /** Returns number of Track Set Statistics in Track Set
+ * @return Number of Track Set Statistics in Track Set
+ */
+ size_t getNumberOfTrackSetStatistics();
+
+ /** Returns number of Track Statistics in Track Set
+ * @return Number of Track Statistics in Track Set
+ */
+ size_t getNumberOfTrackStatistics();
+
+ /** Returns number of Measurements in Track Set
+ * @return Number of Measurements in Track Set
+ */
+ size_t getNumberOfMeasurements();
+
+ /** Add track to Track Set
+ * @param pointData Array of points (x,y,z coordinate for each point)
+ * @param numPoints Number of points in pointData (i.e. number of point
+ * coordinates divided by 3)
+ * @param recommendedCIELabColors Recommended display color(s) as CIELab
+ * values, i.e. L,a,b component(s). There are 3 modes:
+ * 1) Single color: All points in track will be colored in that color
+ * 2) No color (NULL): Color is not defined on a per-track basis but
+ * must be defined on Track Set level
+ * 3) One color per point: Colors for all points are provided
+ * separately.
+ * @param numColors Number of colors defined in recommendedCIELabColors
+ * (must be either 0, 1 or numPoints)
+ * @param result Returns the resulting Track if creation was successful,
+ * error otherwise
+ */
+ virtual OFCondition addTrack(const Float32* pointData,
+ const size_t numPoints,
+ const Uint16* recommendedCIELabColors,
+ const size_t numColors,
+ TrcTrack*& result);
+
+ /** Add measurement for this Track Set
+ * @param measurementCode The type of measurement. DICOM prescribes a code
+ * from CID 7263 "Diffusion Tractography Measurement Types"
+ * @param measurementUnitCodes The physical units of the measured value.
+ * DICOM prescribes a code from CID 82 "Units of Measurement".
+ * @param measurement The created measurement, if successful, NULL otherwise
+ * @return EC_Normal if successful, error otherwise
+ */
+ virtual OFCondition addMeasurement(const CodeSequenceMacro& measurementCode,
+ const CodeSequenceMacro& measurementUnitCodes,
+ TrcMeasurement*& measurement /* result */);
+
+ /** Add Track Statistic, i.e. statistic that is defined once and where a single
+ * value must be provided for all tracks.
+ * @param typeCode The type of statistic, DICOM prescribes code from CID
+ * 7263 "Diffusion Tractography Measurement Types".
+ * @param typeModifierCode The region of interest of this statistic. DICOM
+ * prescribes code from CID 7464 "General Region of Interest
+ * Measurement Modifiers"
+ * @param unitsCode The physical units of the measured value. DICOM
+ * prescribes a code from CID 82 "Units of Measurement".
+ * @param values The statistical values, one for each track
+ * @param numValues The number of values in statisticValues (must be equal to
+ * number of tracks in this Track Set)
+ * @param statistic Returns the created statistic, if successful. NULL
+ * otherwise
+ * @return Returns EC_Normal if successful, error otherwise
+ */
+ virtual OFCondition addTrackStatistics(const CodeSequenceMacro& typeCode,
+ const CodeSequenceMacro& typeModifierCode,
+ const CodeSequenceMacro& unitsCode,
+ const Float32* values,
+ const size_t numValues,
+ TrcTracksStatistic*& statistic /* result */);
+
+ /** Add Track Set Statistic, i.e. a statistical value computed for the whole
+ * Track Set.
+ * @param typeCode The type of statistic, DICOM prescribes code from CID
+ * 7263 "Diffusion Tractography Measurement Types".
+ * @param typeModifierCode The region of interest of this statistic. DICOM
+ * prescribes code from CID 7464 "General Region of Interest
+ * Measurement Modifiers"
+ * @param unitsCode The physical units of the measured value. DICOM
+ * prescribes a code from CID 82 "Units of Measurement".
+ * @param value The statistical value
+ * @param statistic Returns the created statistic, if successful. NULL
+ * otherwise
+ */
+ virtual OFCondition addTrackSetStatistic(const CodeSequenceMacro& typeCode,
+ const CodeSequenceMacro& typeModifierCode,
+ const CodeSequenceMacro& unitsCode,
+ const Float64 value,
+ TrcTrackSetStatistic*& statistic /* result */);
+
+ /** Set Track Set Label
+ * @param value Value to be set (single value only) or "" for no value
+ * @param checkValue Check 'value' for conformance with VR (LO) and VM (1)
+ * if enabled
+ * @return EC_Normal if successful, an error code otherwise
+ */
+ virtual OFCondition setTrackSetLabel(const OFString &value,
+ const OFBool checkValue = OFTrue);
+
+ /** Set Track Set Description
+ * @param value Value to be set (single value only) or "" for no value
+ * @param checkValue Check 'value' for conformance with VR (UT) and VM (1)
+ * if enabled
+ * @return EC_Normal if successful, an error code otherwise
+ */
+ virtual OFCondition setTrackSetDescription(const OFString &value,
+ const OFBool checkValue = OFTrue);
+
+ /** Set Recommended Display CIELab Value
+ * @param L CIELab L component value
+ * @param a CIELab a component value
+ * @param b CIELab b component value
+ * @return EC_Normal if successful, an error code otherwise
+ */
+ virtual OFCondition setRecommendedDisplayCIELabValue(const Uint16 L,
+ const Uint16 a,
+ const Uint16 b);
+
+ /** Set Recommended Line Thickness
+ * @param value Value to be set. The units shall be the same as the units
+ * of the coordinate system in which the point coordinates are specified.
+ * @param checkValue Check 'value' for conformance with VR (FL)
+ * if enabled
+ * @return EC_Normal if successful, an error code otherwise
+ */
+ virtual OFCondition setRecommendedLineThickness(const Float32& value,
+ const OFBool checkValue = OFTrue);
+
+ /** Set Laterality
+ * @param value Value to be set
+ * @param checkValue Check 'value' for conformance if enabled. Parameter is
+ * not used but present for consistency with other functions.
+ * @return EC_Normal if successful, an error code otherwise
+ */
+ virtual OFCondition setLaterality(const TrcTypes::E_TrackSetLaterality value,
+ const OFBool checkValue = OFTrue);
+
+protected:
+
+ /** Protected constructor, use create() method to create a new Track Set
+ */
+ TrcTrackSet();
+
+ /** Reads Track statistics from item into dedicated structures
+ * @param source The item to read from, must contain Track Set Statistics
+ * Sequence
+ * @return EC_Normal if reading was successful, error otherwise
+ */
+ OFCondition readTrackStatistics(DcmItem& source);
+
+ /** Reads Track Set statistics from item into dedicated structures
+ * @param source The item to read from, must contain Track Statistics
+ * Sequence
+ * @return EC_Normal if reading was successful, error otherwise
+ */
+ OFCondition readTrackSetStatistics(DcmItem& source);
+
+ OFCondition readMeasurements(DcmItem& source);
+
+ /** Reads Tracks from item into dedicated structures
+ * @param source The item to read from, must contain Track Sequence
+ * @return EC_Normal if reading was successful, error otherwise
+ */
+ OFCondition readTracks(DcmItem& source);
+
+ /** Write Track Statistics to given item
+ * @param result Returns EC_Normal if writing was successful, error otherwise
+ * or if result has not been EC_Normal when calling
+ * @param destination The destination item to write to. The Track Statistic
+ * Sequence will be written by this method.
+ */
+ void writeTrackStatistics(OFCondition& result,
+ DcmItem& destination);
+
+ /** Write Track Statistics to given item
+ * @param result Returns EC_Normal if writing was successful, error otherwise
+ * or if result has not been EC_Normal when calling
+ * @param destination The destination item to write to. The Track Set
+ * Statistic Sequence will be written by this method.
+ */
+ void writeTrackSetStatistics(OFCondition& result,
+ DcmItem& destination);
+
+ /** Write Measurements to given item
+ * @param result Returns EC_Normal if writing was successful, error otherwise
+ * or if result has not been EC_Normal when calling
+ * @param destination The destination item to write to. The Measurements
+ * Sequence will be written by this method.
+ * @return Same as parameter "result"
+ */
+ OFCondition writeMeasurements(OFCondition& result,
+ DcmItem& destination);
+
+ /** Write Tracks to given item
+ * @param result Returns EC_Normal if writing was successful, error otherwise
+ * or if result has not been EC_Normal when calling
+ * @param destination The destination item to write to. The Tracks Sequence
+ * will be written by this method.
+ * @return Same as parameter "result"
+ */
+ OFCondition writeTracks(OFCondition& result,
+ DcmItem& destination);
+
+ /** Check whether measurements have data for all tracks
+ * @return EC_Normal measurement data is complete, TRC_EC_MeasurementDataMissing
+ * otherwise
+ */
+ OFCondition checkMeasurements();
+
+private:
+
+ /// Data for all tracks (i.e. content of Track Sequence)
+ OFVector<TrcTrack*> m_Tracks;
+
+ /// Anatomy code for this Track Set
+ CodeWithModifiers m_Anatomy;
+
+ /// Measurements for this Track Set
+ OFVector<TrcMeasurement*> m_Measurements;
+
+ /// Statistics for Tracks in this Track Set
+ OFVector<TrcTracksStatistic*> m_TrackStatistics;
+
+ /// Statistics for Track Set
+ OFVector<TrcTrackSetStatistic*> m_TrackSetStatistics;
+
+ /// Code for diffusion acquisition used for this Track Set
+ CodeSequenceMacro m_DiffusionAcquisitionCode;
+
+ /// Code for diffusion model used for this Track Set
+ CodeSequenceMacro m_DiffusionModelCode;
+
+ /// Codes for algorithms used to create this Track Set
+ OFVector<CodeSequenceMacro*> m_TrackingAlgorithmIdentification;
+
+};
+
+#endif // TRCTRACKSET_H
diff --git a/dcmtract/include/dcmtk/dcmtract/trctractographyresults.h b/dcmtract/include/dcmtk/dcmtract/trctractographyresults.h
new file mode 100644
index 0000000..c2f1fc3
--- /dev/null
+++ b/dcmtract/include/dcmtk/dcmtract/trctractographyresults.h
@@ -0,0 +1,302 @@
+/*
+ *
+ * Copyright (C) 2016, Open Connections GmbH
+ * All rights reserved. See COPYRIGHT file for details.
+ *
+ * This software and supporting documentation are maintained by
+ *
+ * OFFIS e.V.
+ * R&D Division Health
+ * Escherweg 2
+ * D-26121 Oldenburg, Germany
+ *
+ *
+ * Module: dcmtract
+ *
+ * Author: Michael Onken
+ *
+ * Purpose: Class representing a Tractography Results object
+ *
+ */
+
+#ifndef TRCTRACTOGRAPHYRESULTS_H
+#define TRCTRACTOGRAPHYRESULTS_H
+
+#include "dcmtk/config/osconfig.h" // include OS configuration first
+#include "dcmtk/ofstd/ofvector.h" // for OFVector
+#include "dcmtk/dcmiod/iodcommn.h"
+#include "dcmtk/dcmiod/iodmacro.h"
+#include "dcmtk/dcmiod/modenhequipment.h" // for Enhanced General Equipment Module
+#include "dcmtk/dcmtract/trctypes.h" // for Tractography Results data types
+#include "dcmtk/dcmtract/trctrackset.h" // for Track Set
+#include "dcmtk/dcmtract/trcmodtractresults.h" // for Tractography Results Module
+#include "dcmtk/dcmtract/trcdef.h"
+
+// Forward declaration
+class IODReferences;
+
+/** Class representing an object of the "Tractography Results" object IOD.
+ */
+class DCMTK_DCMTRACT_EXPORT TrcTractographyResults
+: public DcmIODCommon
+{
+
+public:
+
+ // -------------------- creation ----------------------------------
+
+ /** Create new Tractography Results object. The resulting object then can
+ * be filled by using addTrackSet().
+ * @param contentIdentification Content identification for this object
+ * @param contentDate The date the content creation started
+ * @param contentTime The time the content creation started
+ * @param equipment Equipment used to produce this object
+ * @param imageReferences References to images that played a role when
+ * creating this object. Usually these are MR images that were used
+ * to compute the tracks in this object.
+ * @param result Returns the created object if successful, otherwise NULL
+ * @return EC_Normal if creation was successful, error otherwise
+ */
+ static OFCondition create(const ContentIdentificationMacro& contentIdentification,
+ const OFString& contentDate,
+ const OFString& contentTime,
+ const IODEnhGeneralEquipmentModule::EquipmentInfo& equipment,
+ const IODReferences& imageReferences,
+ TrcTractographyResults*& result);
+
+ /** Take over general information for Patient, Study, Series and/or Frame of Reference
+ * from existing file
+ * @param filename The filename to read from
+ * @param usePatient If OFTrue, Patient level information is imported
+ * @param useStudy If OFTrue, Study level information is imported
+ * @param useSeries If OFTrue, Series level information is imported
+ * @param useFoR If OFTrue, Frame of Reference information is imported
+ * @param updateCommonInstanceReferences If OFTrue (default), all
+ * references in the Common Instance Reference Module will be updated
+ * using the reference data provided earlier in the create() call. The
+ * reason is that the study and series information (including UIDs)
+ * are likely to change during this call, which requires another
+ * sorting of references inside the Common Instance Reference module.
+ * @return EC_Normal if reading was successful (i.e.\ if any information could
+ * be read), otherwise an error is returned
+ */
+ virtual OFCondition importPatientStudyFoR(const OFString& filename,
+ const OFBool usePatient,
+ const OFBool useStudy,
+ const OFBool useSeries,
+ const OFBool useFoR = OFFalse,
+ const OFBool updateCommonInstanceReferences = OFTrue);
+
+ /** Add Track Set to object. If successful, the resulting Track Set can be
+ * filled by calling addTrack() (and other methods) on it.
+ * @param trackSetLabel Label for this Track Set with a maximum of 256
+ * characters (VR = LO)
+ * @param trackSetDescription Text description for this Track Set with a
+ * maximum of 2^32-2 bytes (VR = UT).
+ * @param anatomyCode Code describing the anatomy covered by the Track Set.
+ * DICOM proposes a code from CID 7710 "Tractography Anatomic Sites"
+ * (Baseline). Laterality can be set later on the resulting
+ * Track Set.
+ * @param diffusionModelCode Code describing the diffusion model this Track
+ * Set is based on. DICOM proposes a code from CID 7261 "Diffusion
+ * Model Value Types"
+ * @param algoIdentCode Code describing the algorithm identification. DICOM
+ * prescribes code from CID 7262 "Diffusion Tractography Algorithm
+ * Families".
+ * @param trackSet Returns the resulting Track Set if successful, NULL
+ * otherwise.
+ * @return EC_Normal if creation was successful, error otherwise
+ */
+ virtual OFCondition addTrackSet(const OFString& trackSetLabel,
+ const OFString& trackSetDescription,
+ const CodeWithModifiers& anatomyCode,
+ const CodeSequenceMacro& diffusionModelCode,
+ const CodeSequenceMacro& algoIdentCode,
+ TrcTrackSet*& trackSet);
+
+ // -------------------- destruction -------------------------------
+
+ /** Destructor, frees memory
+ */
+ virtual ~TrcTractographyResults();
+
+ // -------------------- loading and saving ---------------------
+
+ /** Load Tractography Results object from item file
+ * @param filename The file to read from
+ * @param tractography The resulting Tractography Results object. NULL if
+ * dataset could not be read successfully.
+ * @return EC_Normal if reading was successful, error otherwise
+ */
+ static OFCondition loadFile(const OFString& filename,
+ TrcTractographyResults*& tractography);
+
+ /** Load Tractography Results object from item object.
+ * @param dataset The dataset to read from
+ * @param tractography The resulting Tractography Results object. NULL if
+ * dataset could not be read successfully.
+ * @return EC_Normal if reading was successful, error otherwise
+ */
+ static OFCondition loadDataset(DcmDataset& dataset,
+ TrcTractographyResults*& tractography);
+
+ /** Save current object to given filename
+ * @param filename The file to write to
+ * @param writeXfer The transfer syntax to be used
+ * @return EC_Normal if writing was successful, error otherwise.
+ */
+ virtual OFCondition saveFile(const OFString& filename,
+ const E_TransferSyntax writeXfer = EXS_LittleEndianExplicit);
+
+ /** Write current object to given item
+ * @param dataset The item to write to
+ * @return EC_Normal if writing was successful, error otherwise.
+ */
+ virtual OFCondition writeDataset(DcmItem& dataset);
+
+
+ // -------------------- access ---------------------
+
+ /** Get Modality (overwrite from DcmIODCommon. DICOM enforces "MR" for
+ * Tractography Result objects, and thus it is always returned.
+ * @param value Reference to variable in which the value should be stored
+ * @param pos Index of the value to get. Not evaluated (here for
+ * consistency with other setter functions).
+ * @return status, EC_Normal if successful, an error code otherwise
+ */
+ virtual OFCondition getModality(OFString &value,
+ const signed long pos = 0)
+ {
+ (void)pos;
+ value = "MR";
+ return EC_Normal;
+ }
+
+ /** Get Content Date (from Tractography Results Module)
+ * @param value Reference to variable in which the value should be stored
+ * @param pos Index of the value to get (0..vm-1), -1 for all components
+ * @return EC_Normal if successful, an error code otherwise
+ */
+ virtual OFCondition getContentDate(OFString &value,
+ const signed long pos = 0);
+
+ /** Get Content Time (from Tractography Results Module)
+ * @param value Reference to variable in which the value should be stored
+ * @param pos Index of the value to get (0..vm-1), -1 for all components
+ * @return EC_Normal if successful, an error code otherwise
+ */
+ virtual OFCondition getContentTime(OFString &value,
+ const signed long pos = 0);
+
+ /** Get referenced instances (from Tractography Results Module)
+ * @return Reference to instances referenced in Referenced Instance Sequence
+ */
+ virtual IODReferences& getReferencedInstances();
+
+ /** Get reference to Equipment information
+ * @return Reference to information from Enhanced General Equipment Module
+ */
+ virtual IODEnhGeneralEquipmentModule& getEquipment();
+
+ /** Return reference to content identification of this Tractography Results
+ * object (from Tractography Results Module)
+ * @return Reference to content identification data
+ */
+ virtual ContentIdentificationMacro& getContentIdentification();
+
+ /** Returns number of Track Sets in Tractography Results object
+ * @return Number of Track Sets in object
+ */
+ virtual size_t getNumberOfTrackSets();
+
+ /** Return Track Sets (from Tractography Results Module)
+ * @return Reference to Track Sets
+ */
+ virtual OFVector<TrcTrackSet*>& getTrackSets();
+
+protected:
+
+ /** Protected default constructor. Library users should the factory create..()
+ * method in order to create an object from scratch
+ */
+ TrcTractographyResults();
+
+ /** Overwrites DcmIODCommon::read()
+ * @param dataset The dataset to read from
+ * @return EC_Normal if reading succeeded, error otherwise
+ */
+ virtual OFCondition read(DcmItem &dataset);
+
+ /** Overwrites DcmIODCommon::write()
+ * @param dataset The dataset to write to
+ * @return EC_Normal if writing succeeded, error otherwise
+ */
+ virtual OFCondition write(DcmItem &dataset);
+
+ /** Initialize IOD rules
+ */
+ virtual void initIODRules();
+
+private:
+
+ // Modules supported:
+ //
+ // Patient Module (through DcmIODCommon)
+ // Patient Study Module (through DcmIODCommon)
+ // General Study Module (through DcmIODCommon)
+ // General Series Module (through DcmIODCommon)
+ // Tractography Results Series (through this class)
+ // Frame of Reference Module (through DcmIODCommon)
+ // General Equipment Module (through DcmIODCommon)
+ // Enhanced General Equipment Module (through IODEnhGeneralEquipmentModule)
+ // Tractography Results Module (through TrcTractographyResultsModule)
+ // Common Instance Reference Module (through DcmIODCommon)
+ // SOP Common Module (through DcmIODCommon)
+
+ /// Enhanced General Equipment Module
+ IODEnhGeneralEquipmentModule m_EnhancedGeneralEquipmentModule;
+
+ /// Tractography Results Module
+ TrcTractographyResultsModule m_TractographyResultsModule;
+
+ /// References used when creating Tractography Results objects. When calling
+ /// create() in order to create a Tractography Results object, the references
+ /// provided in the call are used to initialize those in the Common Instance
+ /// Reference Module as well as the Tractography Results module's Referenced
+ /// Instance Sequence. However, in the case of Common Instance Reference, the
+ /// internal reference structure is distinguishes between reference within
+ /// the same study as "this" object as well as other objects outside this study.
+ /// If the user calls later importPatientStudyFoR() after creation, the study
+ /// is most likely to change (away from the automatically created new study when
+ /// calling create() to the imported study information) which requires to
+ /// re-build the Common Instance Refernence Module's references. Thus, this
+ /// member is used to store store the references provided by create() for
+ /// this use case.
+ IODReferences m_References;
+
+ // --------------- private helper functions -------------------
+
+ /** Clear old data
+ */
+ void clearData();
+
+ /** Check whether Tractography Results object is ready for writing
+ * @return OFTrue, if object can be written, OFFalse otherwise
+ */
+ OFBool check();
+
+ /** Loads file
+ * @param dcmff The file format to load into
+ * @param filename The filename of the file to load
+ * @param dset Pointer to dataset after loading
+ * @return EC_Normal if loading was successful, error otherwise
+ */
+ static OFCondition loadFile(DcmFileFormat& dcmff,
+ const OFString& filename,
+ DcmDataset*& dset);
+
+ // --------------- members ------------------------------------
+
+};
+
+#endif // TRCTRACTOGRAPHYRESULTS_H
diff --git a/dcmtract/include/dcmtk/dcmtract/trctypes.h b/dcmtract/include/dcmtk/dcmtract/trctypes.h
new file mode 100644
index 0000000..ca4f957
--- /dev/null
+++ b/dcmtract/include/dcmtk/dcmtract/trctypes.h
@@ -0,0 +1,111 @@
+/*
+ *
+ * Copyright (C) 2016, Open Connections GmbH
+ * All rights reserved. See COPYRIGHT file for details.
+ *
+ * This software and supporting documentation are maintained by
+ *
+ * OFFIS e.V.
+ * R&D Division Health
+ * Escherweg 2
+ * D-26121 Oldenburg, Germany
+ *
+ *
+ * Module: dcmtract
+ *
+ * Author: Michael Onken
+ *
+ * Purpose: Class and definitions managing various tractography-typical types
+ *
+ */
+
+#ifndef TRCTYPES_H
+#define TRCTYPES_H
+
+#include "dcmtk/config/osconfig.h"
+#include "dcmtk/oflog/oflog.h"
+#include "dcmtk/dcmdata/dcdeftag.h"
+#include "dcmtk/dcmtract/trcdef.h"
+
+/*
+ * Logging
+ */
+
+extern DCMTK_DCMTRACT_EXPORT OFLogger DCM_dcmtractLogger;
+
+#define DCMTRACT_TRACE(msg) OFLOG_TRACE(DCM_dcmtractLogger, msg)
+#define DCMTRACT_DEBUG(msg) OFLOG_DEBUG(DCM_dcmtractLogger, msg)
+#define DCMTRACT_INFO(msg) OFLOG_INFO(DCM_dcmtractLogger, msg)
+#define DCMTRACT_WARN(msg) OFLOG_WARN(DCM_dcmtractLogger, msg)
+#define DCMTRACT_ERROR(msg) OFLOG_ERROR(DCM_dcmtractLogger, msg)
+#define DCMTRACT_FATAL(msg) OFLOG_FATAL(DCM_dcmtractLogger, msg)
+
+
+/*
+ * Definition of error codes
+ */
+
+/// Invalid Point Coordinates Data
+extern DCMTK_DCMTRACT_EXPORT const OFConditionConst TRC_EC_InvalidPointCoordinatesData;
+/// Invalid Color Information
+extern DCMTK_DCMTRACT_EXPORT const OFConditionConst TRC_EC_InvalidColorInformation;
+/// No such Track
+extern DCMTK_DCMTRACT_EXPORT const OFConditionConst TRC_EC_NoSuchTrack;
+/// No such Measurement
+extern DCMTK_DCMTRACT_EXPORT const OFConditionConst TRC_EC_NoSuchMeasurement;
+/// Measurement Data Missing
+extern DCMTK_DCMTRACT_EXPORT const OFConditionConst TRC_EC_MeasurementDataMissing;
+/// Invalid Statistic Data
+extern DCMTK_DCMTRACT_EXPORT const OFConditionConst TRC_EC_InvalidStatisticData;
+/// Invalid Track Data
+extern DCMTK_DCMTRACT_EXPORT const OFConditionConst TRC_EC_InvalidTrackData;
+
+/**
+ * Types specific to this module
+ */
+
+class TrcTypes
+{
+public:
+
+ /** Tractography coloring modes
+ */
+ enum E_TrackColorMode
+ {
+ /// Unknown (default value if not initialized)
+ CM_UNKNOWN,
+ /// Recommended CIELab value is provided as one color per track
+ CM_TRACK,
+ /// Recommended CIELab values are provided as separate colors for each point
+ /// within track
+ CM_POINTS,
+ /// Recommended CIELab value is provided per track set and not for single tracks.
+ /// Is returned from Trackset if corresponding CIELab attribute is set, and by Tracks
+ /// whose CIELab attributes are not provided at all
+ CM_TRACKSET,
+ /// Erroneous setting of color mode, i.e. Recommended CIELab Value or
+ /// Recommended CIELab Value List are both set or wrongly set on a track
+ CM_ERROR
+ };
+
+ /** Tractography Track Set laterality types.
+ * Laterality of (paired) body part examined.
+ */
+ enum E_TrackSetLaterality
+ {
+ /// Unknown (default value if not initialized)
+ LAT_UNKNOWN,
+ /// Error: In case an invalid value is used
+ LAT_ERROR,
+ /// Left body part
+ LAT_LEFT,
+ /// Right body part
+ LAT_RIGHT,
+ /// Left and right body part
+ LAT_RIGHT_AND_LEFT,
+ /// Either left or right body part
+ LAT_UNILATERAL
+ };
+};
+
+#endif // TRCTYPES_H
diff --git a/dcmtract/libsrc/CMakeLists.txt b/dcmtract/libsrc/CMakeLists.txt
new file mode 100644
index 0000000..71d1cdf
--- /dev/null
+++ b/dcmtract/libsrc/CMakeLists.txt
@@ -0,0 +1,5 @@
+# create library from source files
+DCMTK_ADD_LIBRARY(dcmtract trctypes trctrackset trctrack trcmeasurement trcstatistic trcmodtractresults trctractographyresults)
+
+DCMTK_TARGET_LINK_MODULES(dcmtract dcmiod dcmdata ofstd oflog)
+DCMTK_TARGET_LINK_LIBRARIES(dcmtract ${ZLIB_LIBS} ${WIN32_STD_LIBRARIES})
diff --git a/dcmseg/libsrc/Makefile.dep b/dcmtract/libsrc/Makefile.dep
similarity index 63%
copy from dcmseg/libsrc/Makefile.dep
copy to dcmtract/libsrc/Makefile.dep
index 0ce0c2b..16a7637 100644
--- a/dcmseg/libsrc/Makefile.dep
+++ b/dcmtract/libsrc/Makefile.dep
@@ -1,4 +1,5 @@
-segdoc.o: segdoc.cc ../../config/include/dcmtk/config/osconfig.h \
+trcmeasurement.o: trcmeasurement.cc \
+ ../../config/include/dcmtk/config/osconfig.h \
../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
../../ofstd/include/dcmtk/ofstd/oftypes.h \
../../ofstd/include/dcmtk/ofstd/ofdefine.h \
@@ -7,26 +8,24 @@ segdoc.o: segdoc.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
../../ofstd/include/dcmtk/ofstd/ofstream.h \
../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
- ../include/dcmtk/dcmseg/segdoc.h \
- ../../ofstd/include/dcmtk/ofstd/ofvector.h \
- ../../dcmiod/include/dcmtk/dcmiod/iodimage.h \
- ../../dcmiod/include/dcmtk/dcmiod/iodcommn.h \
- ../../dcmiod/include/dcmtk/dcmiod/iodrules.h \
- ../../ofstd/include/dcmtk/ofstd/ofstring.h \
- ../../ofstd/include/dcmtk/ofstd/ofmap.h \
- ../../ofstd/include/dcmtk/ofstd/ofutil.h \
+ ../../dcmiod/include/dcmtk/dcmiod/iodutil.h \
../../ofstd/include/dcmtk/ofstd/oftraits.h \
- ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
- ../../ofstd/include/dcmtk/ofstd/oflist.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstring.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
+ ../../ofstd/include/dcmtk/ofstd/ofthread.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
../../ofstd/include/dcmtk/ofstd/ofcond.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
- ../../dcmiod/include/dcmtk/dcmiod/iodtypes.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
../../oflog/include/dcmtk/oflog/oflog.h \
../../oflog/include/dcmtk/oflog/logger.h \
../../oflog/include/dcmtk/oflog/config.h \
../../oflog/include/dcmtk/oflog/config/defines.h \
../../oflog/include/dcmtk/oflog/helpers/threadcf.h \
../../oflog/include/dcmtk/oflog/loglevel.h \
+ ../../ofstd/include/dcmtk/ofstd/ofvector.h \
../../oflog/include/dcmtk/oflog/tstring.h \
../../oflog/include/dcmtk/oflog/tchar.h \
../../oflog/include/dcmtk/oflog/spi/apndatch.h \
@@ -44,38 +43,42 @@ segdoc.o: segdoc.cc ../../config/include/dcmtk/config/osconfig.h \
../../oflog/include/dcmtk/oflog/tracelog.h \
../../ofstd/include/dcmtk/ofstd/ofconapp.h \
../../ofstd/include/dcmtk/ofstd/ofcmdln.h \
+ ../../ofstd/include/dcmtk/ofstd/oflist.h \
../../ofstd/include/dcmtk/ofstd/ofconsol.h \
- ../../ofstd/include/dcmtk/ofstd/ofthread.h \
../../ofstd/include/dcmtk/ofstd/offile.h \
../../ofstd/include/dcmtk/ofstd/ofstd.h \
../../ofstd/include/dcmtk/ofstd/oflimits.h \
../../config/include/dcmtk/config/arith.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdatutl.h \
../../dcmiod/include/dcmtk/dcmiod/ioddef.h \
- ../../dcmiod/include/dcmtk/dcmiod/modpatient.h \
+ ../../dcmiod/include/dcmtk/dcmiod/iodrules.h \
+ ../../ofstd/include/dcmtk/ofstd/ofmap.h \
+ ../../ofstd/include/dcmtk/ofstd/ofutil.h \
+ ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
+ ../../dcmiod/include/dcmtk/dcmiod/iodtypes.h \
+ ../../dcmiod/include/dcmtk/dcmiod/cielabutil.h \
+ ../include/dcmtk/dcmtract/trcmeasurement.h \
+ ../../dcmiod/include/dcmtk/dcmiod/modbase.h \
../../ofstd/include/dcmtk/ofstd/ofmem.h \
+ ../../dcmiod/include/dcmtk/dcmiod/iodmacro.h \
../../dcmdata/include/dcmtk/dcmdata/dctk.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
- ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctag.h \
../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \
../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \
../../dcmdata/include/dcmtk/dcmdata/dcdict.h \
../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
- ../../dcmdata/include/dcmtk/dcmdata/dclist.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
../../dcmdata/include/dcmtk/dcmdata/dcmetinf.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \
../../dcmdata/include/dcmtk/dcmdata/dcdicdir.h \
../../dcmdata/include/dcmtk/dcmdata/dcdirrec.h \
@@ -119,39 +122,9 @@ segdoc.o: segdoc.cc ../../config/include/dcmtk/config/osconfig.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
- ../../dcmiod/include/dcmtk/dcmiod/modbase.h \
- ../../dcmiod/include/dcmtk/dcmiod/modpatientstudy.h \
- ../../ofstd/include/dcmtk/ofstd/ofoption.h \
- ../../ofstd/include/dcmtk/ofstd/ofalign.h \
- ../../dcmiod/include/dcmtk/dcmiod/modgeneralstudy.h \
- ../../dcmiod/include/dcmtk/dcmiod/iodmacro.h \
- ../../dcmiod/include/dcmtk/dcmiod/modequipment.h \
- ../../dcmiod/include/dcmtk/dcmiod/modgeneralseries.h \
- ../../dcmiod/include/dcmtk/dcmiod/modfor.h \
- ../../dcmiod/include/dcmtk/dcmiod/modsopcommon.h \
- ../../dcmiod/include/dcmtk/dcmiod/modcommoninstanceref.h \
- ../../dcmiod/include/dcmtk/dcmiod/modgeneralimage.h \
- ../../dcmiod/include/dcmtk/dcmiod/modimagepixel.h \
- ../../dcmiod/include/dcmtk/dcmiod/modsegmentationseries.h \
- ../../dcmiod/include/dcmtk/dcmiod/modenhequipment.h \
- ../../dcmiod/include/dcmtk/dcmiod/modmultiframefg.h \
- ../../dcmiod/include/dcmtk/dcmiod/modmultiframedimension.h \
- ../../dcmfg/include/dcmtk/dcmfg/fginterface.h \
- ../../dcmfg/include/dcmtk/dcmfg/fgtypes.h \
- ../../dcmfg/include/dcmtk/dcmfg/fgdefine.h \
- ../../dcmfg/include/dcmtk/dcmfg/fg.h \
- ../../dcmfg/include/dcmtk/dcmfg/fgbase.h \
- ../../dcmfg/include/dcmtk/dcmfg/fgfracon.h \
- ../include/dcmtk/dcmseg/segtypes.h ../include/dcmtk/dcmseg/segdef.h \
- ../include/dcmtk/dcmseg/segment.h ../include/dcmtk/dcmseg/segutils.h \
- ../../dcmiod/include/dcmtk/dcmiod/iodutil.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdatutl.h \
- ../../dcmfg/include/dcmtk/dcmfg/fgseg.h \
- ../../dcmfg/include/dcmtk/dcmfg/fgplanpo.h \
- ../../dcmfg/include/dcmtk/dcmfg/fgplanor.h \
- ../../dcmfg/include/dcmtk/dcmfg/fgfact.h \
- ../../dcmfg/include/dcmtk/dcmfg/fgderimg.h
-segment.o: segment.cc ../../config/include/dcmtk/config/osconfig.h \
+ ../include/dcmtk/dcmtract/trctypes.h ../include/dcmtk/dcmtract/trcdef.h
+trcmodtractresults.o: trcmodtractresults.cc \
+ ../../config/include/dcmtk/config/osconfig.h \
../../dcmiod/include/dcmtk/dcmiod/iodutil.h \
../../ofstd/include/dcmtk/ofstd/oftraits.h \
../../ofstd/include/dcmtk/ofstd/oftypes.h \
@@ -216,8 +189,10 @@ segment.o: segment.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofutil.h \
../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
../../dcmiod/include/dcmtk/dcmiod/iodtypes.h \
- ../include/dcmtk/dcmseg/segment.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \
+ ../../dcmiod/include/dcmtk/dcmiod/cielabutil.h \
+ ../include/dcmtk/dcmtract/trcmodtractresults.h \
+ ../../dcmiod/include/dcmtk/dcmiod/modbase.h \
+ ../../ofstd/include/dcmtk/ofstd/ofmem.h \
../../dcmiod/include/dcmtk/dcmiod/iodmacro.h \
../../dcmdata/include/dcmtk/dcmdata/dctk.h \
../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
@@ -264,6 +239,7 @@ segment.o: segment.cc ../../config/include/dcmtk/config/osconfig.h \
../../dcmdata/include/dcmtk/dcmdata/dcovlay.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
@@ -271,51 +247,29 @@ segment.o: segment.cc ../../config/include/dcmtk/config/osconfig.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
- ../../dcmiod/include/dcmtk/dcmiod/modbase.h \
- ../../ofstd/include/dcmtk/ofstd/ofmem.h \
- ../include/dcmtk/dcmseg/segtypes.h ../include/dcmtk/dcmseg/segdef.h \
- ../include/dcmtk/dcmseg/segdoc.h \
- ../../dcmiod/include/dcmtk/dcmiod/iodimage.h \
- ../../dcmiod/include/dcmtk/dcmiod/iodcommn.h \
- ../../dcmiod/include/dcmtk/dcmiod/modpatient.h \
- ../../dcmiod/include/dcmtk/dcmiod/modpatientstudy.h \
- ../../ofstd/include/dcmtk/ofstd/ofoption.h \
- ../../ofstd/include/dcmtk/ofstd/ofalign.h \
- ../../dcmiod/include/dcmtk/dcmiod/modgeneralstudy.h \
- ../../dcmiod/include/dcmtk/dcmiod/modequipment.h \
- ../../dcmiod/include/dcmtk/dcmiod/modgeneralseries.h \
- ../../dcmiod/include/dcmtk/dcmiod/modfor.h \
- ../../dcmiod/include/dcmtk/dcmiod/modsopcommon.h \
- ../../dcmiod/include/dcmtk/dcmiod/modcommoninstanceref.h \
- ../../dcmiod/include/dcmtk/dcmiod/modgeneralimage.h \
- ../../dcmiod/include/dcmtk/dcmiod/modimagepixel.h \
- ../../dcmiod/include/dcmtk/dcmiod/modsegmentationseries.h \
- ../../dcmiod/include/dcmtk/dcmiod/modenhequipment.h \
- ../../dcmiod/include/dcmtk/dcmiod/modmultiframefg.h \
- ../../dcmiod/include/dcmtk/dcmiod/modmultiframedimension.h \
- ../../dcmfg/include/dcmtk/dcmfg/fginterface.h \
- ../../dcmfg/include/dcmtk/dcmfg/fgtypes.h \
- ../../dcmfg/include/dcmtk/dcmfg/fgdefine.h \
- ../../dcmfg/include/dcmtk/dcmfg/fg.h \
- ../../dcmfg/include/dcmtk/dcmfg/fgbase.h \
- ../../dcmfg/include/dcmtk/dcmfg/fgfracon.h
-segtypes.o: segtypes.cc ../../config/include/dcmtk/config/osconfig.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
- ../../ofstd/include/dcmtk/ofstd/ofcond.h \
+ ../../dcmiod/include/dcmtk/dcmiod/iodreferences.h \
+ ../include/dcmtk/dcmtract/trctrackset.h \
+ ../include/dcmtk/dcmtract/trctypes.h ../include/dcmtk/dcmtract/trcdef.h \
+ ../include/dcmtk/dcmtract/trctrack.h
+trcstatistic.o: trcstatistic.cc \
+ ../../config/include/dcmtk/config/osconfig.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
../../ofstd/include/dcmtk/ofstd/oftypes.h \
../../ofstd/include/dcmtk/ofstd/ofdefine.h \
../../ofstd/include/dcmtk/ofstd/ofcast.h \
../../ofstd/include/dcmtk/ofstd/ofexport.h \
../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
../../ofstd/include/dcmtk/ofstd/ofstream.h \
- ../../ofstd/include/dcmtk/ofstd/ofstring.h \
../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
../../dcmiod/include/dcmtk/dcmiod/iodutil.h \
../../ofstd/include/dcmtk/ofstd/oftraits.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstring.h \
../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
../../ofstd/include/dcmtk/ofstd/ofglobal.h \
../../ofstd/include/dcmtk/ofstd/ofthread.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcond.h \
../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
../../oflog/include/dcmtk/oflog/oflog.h \
@@ -364,12 +318,15 @@ segtypes.o: segtypes.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofutil.h \
../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
../../dcmiod/include/dcmtk/dcmiod/iodtypes.h \
+ ../../dcmiod/include/dcmtk/dcmiod/cielabutil.h \
+ ../include/dcmtk/dcmtract/trcstatistic.h \
+ ../../dcmiod/include/dcmtk/dcmiod/modbase.h \
+ ../../ofstd/include/dcmtk/ofstd/ofmem.h \
../../dcmiod/include/dcmtk/dcmiod/iodmacro.h \
../../dcmdata/include/dcmtk/dcmdata/dctk.h \
../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \
../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \
../../dcmdata/include/dcmtk/dcmdata/dcdict.h \
@@ -418,16 +375,27 @@ segtypes.o: segtypes.cc ../../config/include/dcmtk/config/osconfig.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
- ../../dcmiod/include/dcmtk/dcmiod/modbase.h \
- ../../ofstd/include/dcmtk/ofstd/ofmem.h \
- ../include/dcmtk/dcmseg/segtypes.h ../include/dcmtk/dcmseg/segdef.h
-segutils.o: segutils.cc ../../config/include/dcmtk/config/osconfig.h \
- ../include/dcmtk/dcmseg/segutils.h ../include/dcmtk/dcmseg/segdef.h \
+ ../include/dcmtk/dcmtract/trctypes.h ../include/dcmtk/dcmtract/trcdef.h
+trctrack.o: trctrack.cc ../../config/include/dcmtk/config/osconfig.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
+ ../../ofstd/include/dcmtk/ofstd/oftypes.h \
../../ofstd/include/dcmtk/ofstd/ofdefine.h \
../../ofstd/include/dcmtk/ofstd/ofcast.h \
../../ofstd/include/dcmtk/ofstd/ofexport.h \
../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
- ../include/dcmtk/dcmseg/segtypes.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstream.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
+ ../../dcmiod/include/dcmtk/dcmiod/iodutil.h \
+ ../../ofstd/include/dcmtk/ofstd/oftraits.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstring.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
+ ../../ofstd/include/dcmtk/ofstd/ofthread.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcond.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
../../oflog/include/dcmtk/oflog/oflog.h \
../../oflog/include/dcmtk/oflog/logger.h \
../../oflog/include/dcmtk/oflog/config.h \
@@ -435,10 +403,7 @@ segutils.o: segutils.cc ../../config/include/dcmtk/config/osconfig.h \
../../oflog/include/dcmtk/oflog/helpers/threadcf.h \
../../oflog/include/dcmtk/oflog/loglevel.h \
../../ofstd/include/dcmtk/ofstd/ofvector.h \
- ../../ofstd/include/dcmtk/ofstd/oftypes.h \
- ../../ofstd/include/dcmtk/ofstd/ofstream.h \
../../oflog/include/dcmtk/oflog/tstring.h \
- ../../ofstd/include/dcmtk/ofstd/ofstring.h \
../../oflog/include/dcmtk/oflog/tchar.h \
../../oflog/include/dcmtk/oflog/spi/apndatch.h \
../../oflog/include/dcmtk/oflog/appender.h \
@@ -457,45 +422,242 @@ segutils.o: segutils.cc ../../config/include/dcmtk/config/osconfig.h \
../../ofstd/include/dcmtk/ofstd/ofcmdln.h \
../../ofstd/include/dcmtk/ofstd/oflist.h \
../../ofstd/include/dcmtk/ofstd/ofconsol.h \
- ../../ofstd/include/dcmtk/ofstd/ofthread.h \
../../ofstd/include/dcmtk/ofstd/offile.h \
../../ofstd/include/dcmtk/ofstd/ofstd.h \
+ ../../ofstd/include/dcmtk/ofstd/oflimits.h \
+ ../../config/include/dcmtk/config/arith.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdatutl.h \
+ ../../dcmiod/include/dcmtk/dcmiod/ioddef.h \
+ ../../dcmiod/include/dcmtk/dcmiod/iodrules.h \
+ ../../ofstd/include/dcmtk/ofstd/ofmap.h \
+ ../../ofstd/include/dcmtk/ofstd/ofutil.h \
+ ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
+ ../../dcmiod/include/dcmtk/dcmiod/iodtypes.h \
+ ../../dcmiod/include/dcmtk/dcmiod/cielabutil.h \
+ ../include/dcmtk/dcmtract/trctrack.h \
+ ../../dcmiod/include/dcmtk/dcmiod/modbase.h \
+ ../../ofstd/include/dcmtk/ofstd/ofmem.h \
+ ../include/dcmtk/dcmtract/trctypes.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
+ ../include/dcmtk/dcmtract/trcdef.h
+trctrackset.o: trctrackset.cc \
+ ../../config/include/dcmtk/config/osconfig.h \
+ ../../ofstd/include/dcmtk/ofstd/ofutil.h \
../../ofstd/include/dcmtk/ofstd/oftraits.h \
+ ../../ofstd/include/dcmtk/ofstd/oftypes.h \
+ ../../ofstd/include/dcmtk/ofstd/ofdefine.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcast.h \
+ ../../ofstd/include/dcmtk/ofstd/ofexport.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstream.h \
+ ../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
+ ../../dcmiod/include/dcmtk/dcmiod/iodutil.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstring.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
+ ../../ofstd/include/dcmtk/ofstd/ofthread.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
../../ofstd/include/dcmtk/ofstd/ofcond.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
+ ../../oflog/include/dcmtk/oflog/oflog.h \
+ ../../oflog/include/dcmtk/oflog/logger.h \
+ ../../oflog/include/dcmtk/oflog/config.h \
+ ../../oflog/include/dcmtk/oflog/config/defines.h \
+ ../../oflog/include/dcmtk/oflog/helpers/threadcf.h \
+ ../../oflog/include/dcmtk/oflog/loglevel.h \
+ ../../ofstd/include/dcmtk/ofstd/ofvector.h \
+ ../../oflog/include/dcmtk/oflog/tstring.h \
+ ../../oflog/include/dcmtk/oflog/tchar.h \
+ ../../oflog/include/dcmtk/oflog/spi/apndatch.h \
+ ../../oflog/include/dcmtk/oflog/appender.h \
+ ../../ofstd/include/dcmtk/ofstd/ofaptr.h \
+ ../../oflog/include/dcmtk/oflog/layout.h \
+ ../../oflog/include/dcmtk/oflog/streams.h \
+ ../../oflog/include/dcmtk/oflog/helpers/pointer.h \
+ ../../oflog/include/dcmtk/oflog/thread/syncprim.h \
+ ../../oflog/include/dcmtk/oflog/spi/filter.h \
+ ../../oflog/include/dcmtk/oflog/helpers/lockfile.h \
+ ../../oflog/include/dcmtk/oflog/spi/logfact.h \
+ ../../oflog/include/dcmtk/oflog/logmacro.h \
+ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \
+ ../../oflog/include/dcmtk/oflog/tracelog.h \
+ ../../ofstd/include/dcmtk/ofstd/ofconapp.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \
+ ../../ofstd/include/dcmtk/ofstd/oflist.h \
+ ../../ofstd/include/dcmtk/ofstd/ofconsol.h \
+ ../../ofstd/include/dcmtk/ofstd/offile.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstd.h \
../../ofstd/include/dcmtk/ofstd/oflimits.h \
../../config/include/dcmtk/config/arith.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dclist.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdatutl.h \
+ ../../dcmiod/include/dcmtk/dcmiod/ioddef.h \
+ ../../dcmiod/include/dcmtk/dcmiod/iodrules.h \
+ ../../ofstd/include/dcmtk/ofstd/ofmap.h \
+ ../../dcmiod/include/dcmtk/dcmiod/iodtypes.h \
+ ../../dcmiod/include/dcmtk/dcmiod/cielabutil.h \
+ ../include/dcmtk/dcmtract/trctrackset.h \
+ ../../dcmiod/include/dcmtk/dcmiod/modbase.h \
+ ../../ofstd/include/dcmtk/ofstd/ofmem.h \
../../dcmiod/include/dcmtk/dcmiod/iodmacro.h \
../../dcmdata/include/dcmtk/dcmdata/dctk.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
- ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
- ../../dcmdata/include/dcmtk/dcmdata/dctag.h \
../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \
../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \
../../dcmdata/include/dcmtk/dcmdata/dcdict.h \
../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcmetinf.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdicdir.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdirrec.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrulup.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcpixseq.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcofsetl.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcbytstr.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrae.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvras.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrcs.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrda.h \
+ ../../ofstd/include/dcmtk/ofstd/ofdate.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrds.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrdt.h \
+ ../../ofstd/include/dcmtk/ofstd/ofdatime.h \
+ ../../ofstd/include/dcmtk/ofstd/oftime.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvris.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrtm.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrui.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrur.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcchrstr.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrlo.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrlt.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrpn.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrsh.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrst.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvruc.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrut.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrobow.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcpixel.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrpobw.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcovlay.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrat.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrss.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrus.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrsl.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrfl.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrfd.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrof.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
+ ../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
+ ../include/dcmtk/dcmtract/trctypes.h ../include/dcmtk/dcmtract/trcdef.h \
+ ../include/dcmtk/dcmtract/trctrack.h \
+ ../include/dcmtk/dcmtract/trcmeasurement.h \
+ ../include/dcmtk/dcmtract/trcstatistic.h
+trctractographyresults.o: trctractographyresults.cc \
+ ../../config/include/dcmtk/config/osconfig.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcuid.h \
+ ../../ofstd/include/dcmtk/ofstd/oftypes.h \
+ ../../ofstd/include/dcmtk/ofstd/ofdefine.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcast.h \
+ ../../ofstd/include/dcmtk/ofstd/ofexport.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstream.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
+ ../../dcmiod/include/dcmtk/dcmiod/iodutil.h \
+ ../../ofstd/include/dcmtk/ofstd/oftraits.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstring.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
../../dcmdata/include/dcmtk/dcmdata/dcobject.h \
+ ../../ofstd/include/dcmtk/ofstd/ofglobal.h \
+ ../../ofstd/include/dcmtk/ofstd/ofthread.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcond.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcxfer.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctypes.h \
+ ../../oflog/include/dcmtk/oflog/oflog.h \
+ ../../oflog/include/dcmtk/oflog/logger.h \
+ ../../oflog/include/dcmtk/oflog/config.h \
+ ../../oflog/include/dcmtk/oflog/config/defines.h \
+ ../../oflog/include/dcmtk/oflog/helpers/threadcf.h \
+ ../../oflog/include/dcmtk/oflog/loglevel.h \
+ ../../ofstd/include/dcmtk/ofstd/ofvector.h \
+ ../../oflog/include/dcmtk/oflog/tstring.h \
+ ../../oflog/include/dcmtk/oflog/tchar.h \
+ ../../oflog/include/dcmtk/oflog/spi/apndatch.h \
+ ../../oflog/include/dcmtk/oflog/appender.h \
+ ../../ofstd/include/dcmtk/ofstd/ofaptr.h \
+ ../../oflog/include/dcmtk/oflog/layout.h \
+ ../../oflog/include/dcmtk/oflog/streams.h \
+ ../../oflog/include/dcmtk/oflog/helpers/pointer.h \
+ ../../oflog/include/dcmtk/oflog/thread/syncprim.h \
+ ../../oflog/include/dcmtk/oflog/spi/filter.h \
+ ../../oflog/include/dcmtk/oflog/helpers/lockfile.h \
+ ../../oflog/include/dcmtk/oflog/spi/logfact.h \
+ ../../oflog/include/dcmtk/oflog/logmacro.h \
+ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \
+ ../../oflog/include/dcmtk/oflog/tracelog.h \
+ ../../ofstd/include/dcmtk/ofstd/ofconapp.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \
+ ../../ofstd/include/dcmtk/ofstd/oflist.h \
+ ../../ofstd/include/dcmtk/ofstd/ofconsol.h \
+ ../../ofstd/include/dcmtk/ofstd/offile.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstd.h \
+ ../../ofstd/include/dcmtk/ofstd/oflimits.h \
+ ../../config/include/dcmtk/config/arith.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcvr.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctag.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
../../dcmdata/include/dcmtk/dcmdata/dcstack.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcelem.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
../../dcmdata/include/dcmtk/dcmdata/dclist.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcmetinf.h \
../../dcmdata/include/dcmtk/dcmdata/dcdatset.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcsequen.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \
- ../../dcmdata/include/dcmtk/dcmdata/dcdicdir.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcitem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcpcache.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdatutl.h \
+ ../../dcmiod/include/dcmtk/dcmiod/ioddef.h \
+ ../../dcmiod/include/dcmtk/dcmiod/iodrules.h \
../../ofstd/include/dcmtk/ofstd/ofmap.h \
../../ofstd/include/dcmtk/ofstd/ofutil.h \
../../ofstd/include/dcmtk/ofstd/variadic/tuplefwd.h \
+ ../../dcmiod/include/dcmtk/dcmiod/iodtypes.h \
+ ../../dcmiod/include/dcmtk/dcmiod/cielabutil.h \
+ ../../dcmiod/include/dcmtk/dcmiod/modcommoninstanceref.h \
+ ../../ofstd/include/dcmtk/ofstd/ofmem.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctk.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcswap.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcistrma.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcostrma.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdicent.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dchashdi.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdict.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcmetinf.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcfilefo.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdicdir.h \
../../dcmdata/include/dcmtk/dcmdata/dcdirrec.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrulup.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrul.h \
@@ -537,8 +699,68 @@ segutils.o: segutils.cc ../../config/include/dcmtk/config/osconfig.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrod.h \
../../dcmdata/include/dcmtk/dcmdata/dcvrol.h \
../../dcmdata/include/dcmtk/dcmdata/cmdlnarg.h \
- ../../dcmiod/include/dcmtk/dcmiod/iodrules.h \
- ../../dcmiod/include/dcmtk/dcmiod/iodtypes.h \
- ../../dcmiod/include/dcmtk/dcmiod/ioddef.h \
../../dcmiod/include/dcmtk/dcmiod/modbase.h \
- ../../ofstd/include/dcmtk/ofstd/ofmem.h
+ ../../dcmiod/include/dcmtk/dcmiod/iodmacro.h \
+ ../../dcmiod/include/dcmtk/dcmiod/iodreferences.h \
+ ../include/dcmtk/dcmtract/trctractographyresults.h \
+ ../../dcmiod/include/dcmtk/dcmiod/iodcommn.h \
+ ../../dcmiod/include/dcmtk/dcmiod/modpatient.h \
+ ../../dcmiod/include/dcmtk/dcmiod/modpatientstudy.h \
+ ../../ofstd/include/dcmtk/ofstd/ofoption.h \
+ ../../ofstd/include/dcmtk/ofstd/ofalign.h \
+ ../../dcmiod/include/dcmtk/dcmiod/modgeneralstudy.h \
+ ../../dcmiod/include/dcmtk/dcmiod/modequipment.h \
+ ../../dcmiod/include/dcmtk/dcmiod/modgeneralseries.h \
+ ../../dcmiod/include/dcmtk/dcmiod/modfor.h \
+ ../../dcmiod/include/dcmtk/dcmiod/modsopcommon.h \
+ ../../dcmiod/include/dcmtk/dcmiod/modenhequipment.h \
+ ../include/dcmtk/dcmtract/trctypes.h ../include/dcmtk/dcmtract/trcdef.h \
+ ../include/dcmtk/dcmtract/trctrackset.h \
+ ../include/dcmtk/dcmtract/trcmodtractresults.h
+trctypes.o: trctypes.cc ../../config/include/dcmtk/config/osconfig.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcerror.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcond.h \
+ ../../ofstd/include/dcmtk/ofstd/oftypes.h \
+ ../../ofstd/include/dcmtk/ofstd/ofdefine.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcast.h \
+ ../../ofstd/include/dcmtk/ofstd/ofexport.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstdinc.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstream.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstring.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdefine.h \
+ ../include/dcmtk/dcmtract/trctypes.h \
+ ../../oflog/include/dcmtk/oflog/oflog.h \
+ ../../oflog/include/dcmtk/oflog/logger.h \
+ ../../oflog/include/dcmtk/oflog/config.h \
+ ../../oflog/include/dcmtk/oflog/config/defines.h \
+ ../../oflog/include/dcmtk/oflog/helpers/threadcf.h \
+ ../../oflog/include/dcmtk/oflog/loglevel.h \
+ ../../ofstd/include/dcmtk/ofstd/ofvector.h \
+ ../../oflog/include/dcmtk/oflog/tstring.h \
+ ../../oflog/include/dcmtk/oflog/tchar.h \
+ ../../oflog/include/dcmtk/oflog/spi/apndatch.h \
+ ../../oflog/include/dcmtk/oflog/appender.h \
+ ../../ofstd/include/dcmtk/ofstd/ofaptr.h \
+ ../../oflog/include/dcmtk/oflog/layout.h \
+ ../../oflog/include/dcmtk/oflog/streams.h \
+ ../../oflog/include/dcmtk/oflog/helpers/pointer.h \
+ ../../oflog/include/dcmtk/oflog/thread/syncprim.h \
+ ../../oflog/include/dcmtk/oflog/spi/filter.h \
+ ../../oflog/include/dcmtk/oflog/helpers/lockfile.h \
+ ../../oflog/include/dcmtk/oflog/spi/logfact.h \
+ ../../oflog/include/dcmtk/oflog/logmacro.h \
+ ../../oflog/include/dcmtk/oflog/helpers/snprintf.h \
+ ../../oflog/include/dcmtk/oflog/tracelog.h \
+ ../../ofstd/include/dcmtk/ofstd/ofconapp.h \
+ ../../ofstd/include/dcmtk/ofstd/ofcmdln.h \
+ ../../ofstd/include/dcmtk/ofstd/oflist.h \
+ ../../ofstd/include/dcmtk/ofstd/ofconsol.h \
+ ../../ofstd/include/dcmtk/ofstd/ofthread.h \
+ ../../ofstd/include/dcmtk/ofstd/offile.h \
+ ../../ofstd/include/dcmtk/ofstd/ofstd.h \
+ ../../ofstd/include/dcmtk/ofstd/oftraits.h \
+ ../../ofstd/include/dcmtk/ofstd/oflimits.h \
+ ../../config/include/dcmtk/config/arith.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dcdeftag.h \
+ ../../dcmdata/include/dcmtk/dcmdata/dctagkey.h \
+ ../include/dcmtk/dcmtract/trcdef.h
diff --git a/dcmtract/libsrc/Makefile.in b/dcmtract/libsrc/Makefile.in
new file mode 100644
index 0000000..a4d7f75
--- /dev/null
+++ b/dcmtract/libsrc/Makefile.in
@@ -0,0 +1,56 @@
+#
+# Makefile for dcmtract/libsrc
+#
+
+ at SET_MAKE@
+
+SHELL = /bin/sh
+VPATH = @srcdir@:@top_srcdir@/include:@top_srcdir@/@configdir@/include
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+configdir = @top_srcdir@/@configdir@
+
+include $(configdir)/@common_makefile@
+
+ofstddir = $(top_srcdir)/../ofstd
+oflogdir = $(top_srcdir)/../oflog
+dcmdatadir = $(top_srcdir)/../dcmdata
+dcmioddir = $(top_srcdir)/../dcmiod
+dcmfgdir = $(top_srcdir)/../dcmfg
+
+LOCALINCLUDES = -I$(ofstddir)/include -I$(oflogdir)/include \
+ -I$(dcmdatadir)/include -I$(dcmioddir)/include \
+ -I$(dcmfgdir)/include
+
+LOCALDEFS =
+
+objs = trcmeasurement.o trcmodtractresults.o trcstatistic.o trctrack.o trctrackset.o trctractographyresults.o trctypes.o
+
+
+library = libdcmtract.$(LIBEXT)
+
+
+all: $(library)
+
+install: $(library)
+ $(configdir)/mkinstalldirs $(DESTDIR)$(libdir)
+ $(INSTALL_DATA) $(library) $(DESTDIR)$(libdir)/$(library)
+ $(RANLIB) $(DESTDIR)$(libdir)/$(library)
+
+
+$(library): $(objs)
+ $(AR) $(ARFLAGS) $@ $(objs)
+ $(RANLIB) $@
+
+
+clean:
+ rm -f $(objs) $(library) $(TRASH)
+
+distclean:
+ rm -f $(objs) $(library) $(DISTTRASH)
+
+
+dependencies:
+ $(CXX) -MM $(defines) $(includes) $(CPPFLAGS) $(CXXFLAGS) *.cc > $(DEP)
+
+include $(DEP)
diff --git a/dcmtract/libsrc/trcmeasurement.cc b/dcmtract/libsrc/trcmeasurement.cc
new file mode 100644
index 0000000..d51f158
--- /dev/null
+++ b/dcmtract/libsrc/trcmeasurement.cc
@@ -0,0 +1,345 @@
+/*
+ *
+ * Copyright (C) 2016, Open Connections GmbH
+ * All rights reserved. See COPYRIGHT file for details.
+ *
+ * This software and supporting documentation are maintained by
+ *
+ * OFFIS e.V.
+ * R&D Division Health
+ * Escherweg 2
+ * D-26121 Oldenburg, Germany
+ *
+ *
+ * Module: dcmtract
+ *
+ * Author: Michael Onken
+ *
+ * Purpose: Track Set's Measurement from a Tractography Results IOD
+ *
+ */
+#include "dcmtk/config/osconfig.h"
+#include "dcmtk/dcmdata/dcuid.h"
+#include "dcmtk/dcmiod/iodutil.h"
+#include "dcmtk/dcmtract/trcmeasurement.h"
+
+// default constructor (protected, instance creation via create() function)
+TrcMeasurement::TrcMeasurement()
+: IODComponent(),
+ m_Type(),
+ m_Units(),
+ m_Values()
+{
+ TrcMeasurement::resetRules();
+ // Reserve space for 100 tracks, will grow if more are added
+ m_Values.reserve(100);
+}
+
+
+void TrcMeasurement::resetRules()
+{
+ // Set rules for the attributes within this component
+ getRules()->addRule(new IODRule(DCM_ConceptNameCodeSequence, "1","1", getName(), DcmIODTypes::IE_INSTANCE), OFTrue);
+ getRules()->addRule(new IODRule(DCM_MeasurementUnitsCodeSequence, "1","1", getName(), DcmIODTypes::IE_INSTANCE), OFTrue);
+ getRules()->addRule(new IODRule(DCM_MeasurementValuesSequence, "1-n","1", getName(), DcmIODTypes::IE_INSTANCE), OFTrue);
+}
+
+OFCondition TrcMeasurement::create(const CodeSequenceMacro& typeCode,
+ const CodeSequenceMacro& unitCode,
+ TrcMeasurement*& measurement)
+{
+ measurement = new TrcMeasurement();
+ if (!measurement)
+ return EC_MemoryExhausted;
+
+ OFCondition result = OFconst_cast(CodeSequenceMacro*, &typeCode)->check();
+ if (result.good())
+ {
+ measurement->m_Type = typeCode;
+ result = OFconst_cast(CodeSequenceMacro*, &unitCode)->check();
+ if (result.good())
+ {
+ measurement->m_Units = unitCode;
+ }
+ }
+ if (result.bad())
+ {
+ delete measurement;
+ measurement = NULL;
+ }
+ return result;
+}
+
+
+OFCondition TrcMeasurement::get(const size_t trackNumber,
+ CodeSequenceMacro& type,
+ CodeSequenceMacro& units,
+ const Float32*& measurementData,
+ long unsigned int& numMeasurementData,
+ const Uint32*& pointIndices)
+{
+ type = m_Type;
+ units = m_Units;
+ if (trackNumber < m_Values.size() -1 )
+ {
+ return TRC_EC_NoSuchMeasurement;
+ }
+ TrcMeasurement::Values* v = m_Values[trackNumber];
+ if (v == NULL)
+ {
+ return TRC_EC_NoSuchMeasurement;
+ }
+ OFCondition result = v->get(measurementData, numMeasurementData, pointIndices);
+ return result;
+}
+
+
+OFCondition TrcMeasurement::setTrackValues(const size_t trackNumber,
+ const Float32* measurementValues,
+ const long unsigned int& numValues)
+{
+ if (trackNumber +1 > m_Values.size())
+ {
+ m_Values.resize(trackNumber+1, NULL);
+ }
+ else if (m_Values[trackNumber])
+ {
+ delete m_Values[trackNumber];
+ m_Values[trackNumber] = NULL;
+ }
+
+ TrcMeasurement::Values* v = NULL;
+ OFCondition result = TrcMeasurement::Values::create(measurementValues, numValues, v);
+ if (result.good())
+ m_Values[trackNumber] = v;
+
+ return result;
+}
+
+
+OFCondition TrcMeasurement::setTrackValues(const size_t trackNumber,
+ const Float32* measurementValues,
+ const long unsigned int& numValues,
+ const Uint32* pointIndices)
+{
+ if (trackNumber +1 > m_Values.size())
+ {
+ m_Values.resize(trackNumber+1, NULL);
+ }
+ else if (m_Values[trackNumber])
+ {
+ delete m_Values[trackNumber];
+ m_Values[trackNumber] = NULL;
+ }
+
+ TrcMeasurement::Values* v = NULL;
+ OFCondition result = TrcMeasurement::Values::createWithIndices(
+ measurementValues,
+ numValues,
+ pointIndices,
+ v);
+
+ if (result.good())
+ {
+ m_Values[trackNumber] = v;
+ }
+ return result;
+}
+
+
+
+OFCondition TrcMeasurement::read(DcmItem& source,
+ const OFBool clearOldData)
+{
+ if (clearOldData)
+ this->clearData();
+ // Read as much as possible. In order to return success at minimum the tracks
+ // must be readable.
+ IODComponent::read(source, OFFalse /* we cleared data before */);
+ DcmIODUtil::readSingleItem(source, DCM_ConceptNameCodeSequence, m_Type, getRules()->getByTag(DCM_ConceptNameCodeSequence));
+ DcmIODUtil::readSingleItem(source, DCM_MeasurementUnitsCodeSequence, m_Units, getRules()->getByTag(DCM_MeasurementUnitsCodeSequence));
+ DcmIODUtil::readSubSequence(source, DCM_MeasurementValuesSequence, m_Values, getRules()->getByTag(DCM_MeasurementValuesSequence));
+ return EC_Normal;
+}
+
+
+OFCondition TrcMeasurement::write(DcmItem& destination)
+{
+ if (!checkValuesComplete())
+ {
+ return TRC_EC_MeasurementDataMissing;
+ }
+ OFCondition result;
+ DcmIODUtil::writeSingleItem(result, DCM_ConceptNameCodeSequence, m_Type, getData(), getRules()->getByTag(DCM_ConceptNameCodeSequence));
+ DcmIODUtil::writeSingleItem(result, DCM_MeasurementUnitsCodeSequence, m_Units, getData(), getRules()->getByTag(DCM_MeasurementUnitsCodeSequence));
+ DcmIODUtil::writeSubSequence(result, DCM_MeasurementValuesSequence, m_Values, getData(), getRules()->getByTag(DCM_MeasurementValuesSequence));
+ if (result.good()) result = result = IODComponent::write(destination);
+ return result;
+}
+
+
+void TrcMeasurement::clearData()
+{
+ m_Type.clearData();
+ m_Units.clearData();
+ DcmIODUtil::freeContainer(m_Values);
+ IODComponent::clearData();
+}
+
+
+TrcMeasurement::~TrcMeasurement()
+{
+ DcmIODUtil::freeContainer(m_Values);
+}
+
+
+OFString TrcMeasurement::getName() const
+{
+ return "MeasurementsSequenceItem";
+}
+
+
+CodeSequenceMacro& TrcMeasurement::getType()
+{
+ return m_Type;
+}
+
+
+CodeSequenceMacro& TrcMeasurement::getUnits()
+{
+ return m_Units;
+}
+
+
+OFVector<TrcMeasurement::Values*>& TrcMeasurement::getValues()
+{
+ return m_Values;
+}
+
+
+OFBool TrcMeasurement::checkValuesComplete()
+{
+ OFBool complete = OFTrue;
+ size_t count = m_Values.size();
+ for (size_t v = 0; v < count; v++)
+ {
+ if (m_Values[v] == NULL)
+ {
+ DCMTRACT_ERROR("Measurement values for track #" << v << " are missing");
+ complete = OFFalse;
+ }
+ }
+ return complete;
+}
+
+
+// ------------------------Class TrcMeasurement::Values ----------------------
+
+
+OFCondition TrcMeasurement::Values::create(const Float32* dataValues,
+ const unsigned long numValues,
+ TrcMeasurement::Values*& values)
+{
+ values = new TrcMeasurement::Values();
+ if (!values)
+ return EC_MemoryExhausted;
+
+ if ( (numValues == 0) || !dataValues )
+ return EC_IllegalParameter;
+
+ OFCondition result = values->getData().putAndInsertFloat32Array(DCM_FloatingPointValues, dataValues, numValues);
+ if (result.bad())
+ {
+ delete values;
+ values = NULL;
+ }
+ return result;
+}
+
+
+OFCondition TrcMeasurement::Values::createWithIndices(const Float32* dataValues,
+ const unsigned long numValues,
+ const Uint32* trackPointIndices,
+ TrcMeasurement::Values*& values)
+{
+ values = new TrcMeasurement::Values();
+ if (!values)
+ return EC_MemoryExhausted;
+
+ if ( (numValues == 0) || !dataValues || !trackPointIndices)
+ return EC_IllegalParameter;
+
+ OFCondition result = values->getData().putAndInsertFloat32Array(DCM_FloatingPointValues, dataValues, numValues);
+ if (result.good())
+ {
+ result = values->getData().putAndInsertUint32Array(DCM_TrackPointIndexList, trackPointIndices, numValues);
+ }
+
+ if (result.bad())
+ {
+ delete values;
+ values = NULL;
+ }
+ return result;
+}
+
+
+OFCondition TrcMeasurement::Values::get(const Float32*& dataValues,
+ unsigned long& numValues,
+ const Uint32*& trackPointIndices)
+{
+ OFCondition result = m_Item->findAndGetFloat32Array(DCM_FloatingPointValues, dataValues, &numValues);
+ unsigned long numIndices = numValues;
+ if (result.good())
+ {
+ result = m_Item->findAndGetUint32Array(DCM_TrackPointIndexList, trackPointIndices, &numIndices);
+ if (result.bad())
+ {
+ trackPointIndices = NULL;
+ result = EC_Normal; // no track point indices mean that measurements cover all points
+ }
+ }
+ // The number of point indices must be equal to the number of measurement
+ // values. If not, print warning and use the smaller number.
+ if ( numIndices != numValues)
+ {
+ char buf[200];
+ sprintf(buf, "Number of measurement values for track (%lu) differs from number of track data indices (%lu), using smaller value", numValues, numIndices);
+ DCMTRACT_WARN(buf);
+ if (numValues > numIndices)
+ numValues = numIndices;
+ }
+ return result;
+}
+
+
+OFString TrcMeasurement::Values::getName() const
+{
+ return "MeasurementValuesSequenceItem";
+}
+
+
+TrcMeasurement::Values::Values()
+: IODComponent()
+{
+ resetRules();
+}
+
+
+void TrcMeasurement::Values::resetRules()
+{
+ // Both bulk data attribute are VM 1 by DICOM definition
+ getRules()->addRule(new IODRule(DCM_FloatingPointValues, "1","1", getName(), DcmIODTypes::IE_INSTANCE), OFTrue);
+ getRules()->addRule(new IODRule(DCM_TrackPointIndexList, "1","1C", getName(), DcmIODTypes::IE_INSTANCE), OFTrue);
+}
+
+
+TrcMeasurement::Values::~Values()
+{
+ // nothing to do yet
+}
+
+
+
+
+
diff --git a/dcmtract/libsrc/trcmodtractresults.cc b/dcmtract/libsrc/trcmodtractresults.cc
new file mode 100644
index 0000000..a4dbd9e
--- /dev/null
+++ b/dcmtract/libsrc/trcmodtractresults.cc
@@ -0,0 +1,294 @@
+/*
+ *
+ * Copyright (C) 2016, Open Connections GmbH
+ * All rights reserved. See COPYRIGHT file for details.
+ *
+ * This software and supporting documentation are maintained by
+ *
+ * OFFIS e.V.
+ * R&D Division Health
+ * Escherweg 2
+ * D-26121 Oldenburg, Germany
+ *
+ *
+ * Module: dcmtract
+ *
+ * Author: Michael Onken
+ *
+ * Purpose: Class representing the Tractography Results Module
+ *
+ */
+
+#include "dcmtk/config/osconfig.h" /* make sure OS specific configuration is included first */
+#include "dcmtk/dcmiod/iodutil.h"
+#include "dcmtk/dcmtract/trcmodtractresults.h"
+#include "dcmtk/dcmtract/trctrack.h"
+
+const OFString TrcTractographyResultsModule::m_ModuleName = "TractographyResultsModule";
+
+TrcTractographyResultsModule::TrcTractographyResultsModule(
+ OFshared_ptr<DcmItem> item,
+ OFshared_ptr<IODRules> rules)
+: IODModule(item, rules),
+ m_ContentIdentification(),
+ m_TrackSets(),
+ m_ReferencedInstances()
+{
+ // reset element rules
+ resetRules();
+}
+
+
+TrcTractographyResultsModule::TrcTractographyResultsModule()
+: IODModule()
+{
+ resetRules();
+}
+
+
+TrcTractographyResultsModule::~TrcTractographyResultsModule()
+{
+ DcmIODUtil::freeContainer(m_TrackSets);
+}
+
+
+OFCondition TrcTractographyResultsModule::read(DcmItem& source,
+ const OFBool clearOldData)
+{
+ if (clearOldData)
+ clearData();
+
+ IODModule::read(source, OFFalse /* data already cleared above */);
+ DcmIODUtil::readSubSequence(source, DCM_TrackSetSequence, m_TrackSets, m_Rules->getByTag(DCM_TrackSetSequence));
+ DCMTRACT_DEBUG("Found " << m_TrackSets.size() << " Track Sets");
+ m_ContentIdentification.read(source, clearOldData);
+ m_ReferencedInstances.readTractographyReferencedInstanceSequence(source);
+ DCMTRACT_DEBUG("Found " << m_ReferencedInstances.size() << " references to other DICOM objects");
+ checkColoring();
+ return EC_Normal;
+}
+
+
+OFCondition TrcTractographyResultsModule::write(DcmItem& destination)
+{
+ OFCondition result = EC_Normal;
+
+ // Re-create dimension organization data
+ DcmIODUtil::writeSubSequence(result, DCM_TrackSetSequence, m_TrackSets, *m_Item, m_Rules->getByTag(DCM_TrackSetSequence));
+ if (result.good())
+ {
+ result = m_ReferencedInstances.writeTractographyReferencedInstanceSequence(getData());
+ }
+ if (result.good())
+ {
+ result = m_ContentIdentification.write(destination);
+ }
+ if (result.good())
+ {
+ result = IODComponent::write(destination);
+ }
+ return result;
+}
+
+
+void TrcTractographyResultsModule::clearData()
+{
+ DcmIODUtil::freeContainer(m_TrackSets);
+ m_ContentIdentification.clearData();
+ IODModule::clearData();
+}
+
+
+void TrcTractographyResultsModule::resetRules()
+{
+ // parameters are tag, VM, type. Overwrite old rules if any.
+ m_Rules->addRule(new IODRule(DCM_ContentTime, "1", "1", getName(), DcmIODTypes::IE_INSTANCE), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_ContentDate, "1", "1", getName(), DcmIODTypes::IE_INSTANCE), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_TrackSetSequence, "1-n", "1", getName(), DcmIODTypes::IE_INSTANCE), OFTrue);
+ m_Rules->addRule(new IODRule(DCM_ReferencedInstanceSequence, "1-n", "1", getName(), DcmIODTypes::IE_INSTANCE), OFTrue);
+}
+
+
+OFString TrcTractographyResultsModule::getName() const
+{
+ return "TractographyResultsModule";
+}
+
+
+OFCondition TrcTractographyResultsModule::getContentDate(OFString &value,
+ const signed long pos)
+{
+ return DcmIODUtil::getStringValueFromItem(DCM_ContentDate, *m_Item, value, pos);
+}
+
+
+OFCondition TrcTractographyResultsModule::getContentTime(OFString &value,
+ const signed long pos)
+{
+ return DcmIODUtil::getStringValueFromItem(DCM_ContentTime, *m_Item, value, pos);
+}
+
+
+ContentIdentificationMacro& TrcTractographyResultsModule::getContentIdentification()
+{
+ return m_ContentIdentification;
+}
+
+
+IODReferences& TrcTractographyResultsModule::getReferencedInstances()
+{
+ return m_ReferencedInstances;
+}
+
+
+OFVector< TrcTrackSet* >& TrcTractographyResultsModule::getTrackSets()
+{
+ return m_TrackSets;
+}
+
+
+OFCondition TrcTractographyResultsModule::setContentDate(const OFString &value,
+ const OFBool checkValue)
+{
+ OFCondition result = (checkValue) ? DcmDate::checkStringValue(value, "1") : EC_Normal;
+ if (result.good())
+ result = m_Item->putAndInsertOFStringArray(DCM_ContentDate, value);
+ return result;
+}
+
+
+OFCondition TrcTractographyResultsModule::setContentTime(const OFString &value,
+ const OFBool checkValue)
+{
+ OFCondition result = (checkValue) ? DcmTime::checkStringValue(value, "1") : EC_Normal;
+ if (result.good())
+ result = m_Item->putAndInsertOFStringArray(DCM_ContentTime, value);
+ return result;
+}
+
+
+OFCondition TrcTractographyResultsModule::addImageReference(const IODReference& imageRef)
+{
+ OFCondition result = imageRef.check();
+ if (result.good())
+ {
+ IODReference *copy = imageRef.clone();
+ if (copy)
+ {
+ m_ReferencedInstances.add(copy);
+ }
+ else
+ {
+ result = EC_MemoryExhausted;
+ }
+ }
+ return result;
+}
+
+
+OFCondition TrcTractographyResultsModule::check(const OFBool quiet)
+{
+ if (m_ContentIdentification.check().good())
+ {
+ if (m_TrackSets.size() > 0)
+ {
+ OFVector<TrcTrackSet*>::iterator it = m_TrackSets.begin();
+ while (it != m_TrackSets.end())
+ {
+ if ( (*it)->getNumberOfTracks() == 0)
+ {
+ DCMTRACT_ERROR("Track Set does not contain any tracks");
+ return TRC_EC_NoSuchTrack;
+ }
+ else
+ {
+ OFVector<TrcTrack*> tracks = (*it)->getTracks();
+ OFVector<TrcTrack*>::iterator t = tracks.begin();
+ while (t != tracks.end())
+ {
+ if ( (*t)->check(quiet).bad() )
+ return TRC_EC_InvalidTrackData;
+ t++;
+ }
+ }
+ it++;
+ }
+ }
+ else
+ {
+ return TRC_EC_NoSuchTrack;
+ }
+ }
+ return checkColoring();
+}
+
+
+OFCondition TrcTractographyResultsModule::checkColoring()
+{
+ size_t tsCount = 1;
+ OFVector<TrcTrackSet*>::iterator ts = m_TrackSets.begin();
+ while (ts != m_TrackSets.end())
+ {
+ // Collect statistics how much are colored
+ OFVector<TrcTrack*>::const_iterator track = (*ts)->getTracks().begin();
+ OFVector<TrcTrack*>::const_iterator last = (*ts)->getTracks().end();
+ size_t numPerTrack = 0;
+ size_t numPerPoint = 0;
+ size_t trackCount = 1;
+ while ( track != last)
+ {
+ TrcTypes::E_TrackColorMode cmode = (*track)->getRecommendedDisplayCIELabMode();
+ switch (cmode)
+ {
+ case TrcTypes::CM_ERROR:
+ DCMTRACT_ERROR("Color definition error in Track Set #" << tsCount << "/" << m_TrackSets.size() << " Track #" << trackCount << "/" << (*ts)->getNumberOfTracks());
+ return TRC_EC_InvalidColorInformation;
+ case TrcTypes::CM_POINTS:
+ numPerPoint++;
+ break;
+ case TrcTypes::CM_TRACK:
+ numPerTrack++;
+ break;
+ case TrcTypes::CM_TRACKSET:
+ // the rest that is not per point or per track
+ break;
+ default:
+ DCMTRACT_ERROR("Internal color definition checking problem in Track Set #" << tsCount << "/" << m_TrackSets.size() << " Track #" << trackCount << "/" << (*ts)->getNumberOfTracks());
+ return EC_Normal;
+ }
+ track++;
+ trackCount++;
+ }
+
+ // Do we have tracks at all? Otherwise report error
+ size_t numTracks = (*ts)->getNumberOfTracks();
+ if (numTracks == 0)
+ {
+ DCMTRACT_ERROR("No tracks in Track Set");
+ return TRC_EC_NoSuchTrack;
+ }
+
+ // Check if we have Track Set coloring
+ if ((numPerPoint == 0) && (numPerTrack == 0))
+ {
+ Uint16 L,a,b;
+ L=a=b=0;
+ // Check whether we have Track Set Coloring
+ OFCondition result = (*ts)->getRecommendedDisplayCIELabValue(L,a,b);
+ if (result.bad())
+ {
+ DCMTRACT_ERROR("Neither Tracks nor Track Set has color information in Track Set #" << tsCount << "/" << m_TrackSets.size());
+ return TRC_EC_InvalidColorInformation;
+ }
+ }
+ // No Track Set coloring, check whether all Tracks have Track or point coloring
+ else if (numTracks != (numPerPoint + numPerTrack))
+ {
+ DCMTRACT_ERROR("Some but not all tracks provide color information in Track Set #" << tsCount << "/" << m_TrackSets.size());
+ return TRC_EC_InvalidColorInformation;
+ }
+ ts++;
+ tsCount++;
+ }
+ return EC_Normal;
+}
diff --git a/dcmtract/libsrc/trcstatistic.cc b/dcmtract/libsrc/trcstatistic.cc
new file mode 100755
index 0000000..2ac4f79
--- /dev/null
+++ b/dcmtract/libsrc/trcstatistic.cc
@@ -0,0 +1,349 @@
+/*
+ *
+ * Copyright (C) 2016, Open Connections GmbH
+ * All rights reserved. See COPYRIGHT file for details.
+ *
+ * This software and supporting documentation are maintained by
+ *
+ * OFFIS e.V.
+ * R&D Division Health
+ * Escherweg 2
+ * D-26121 Oldenburg, Germany
+ *
+ *
+ * Module: dcmtract
+ *
+ * Author: Michael Onken
+ *
+ * Purpose: Statistics from a Tractography Results IOD
+ *
+ */
+#include "dcmtk/config/osconfig.h"
+#include "dcmtk/dcmdata/dcuid.h"
+#include "dcmtk/dcmiod/iodutil.h"
+#include "dcmtk/dcmtract/trcstatistic.h"
+
+
+// ------------------------------ class TrcTStatistic --------------------------
+
+// default constructor (protected, instance creation via create() function)
+TrcStatistic::TrcStatistic()
+: IODComponent(),
+ m_Type(),
+ m_TypeModifier(),
+ m_Units()
+{
+ // This is an abstract class so it is enough to call resetRules() is called
+ // from derived classes
+}
+
+
+void TrcStatistic::resetRules()
+{
+ // Set rules for the attributes within this component
+ getRules()->addRule(new IODRule(DCM_ConceptNameCodeSequence, "1","1",getName(), DcmIODTypes::IE_INSTANCE), OFTrue);
+ getRules()->addRule(new IODRule(DCM_ModifierCodeSequence, "1","1", getName(), DcmIODTypes::IE_INSTANCE), OFTrue);
+ getRules()->addRule(new IODRule(DCM_MeasurementUnitsCodeSequence, "1","1", getName(), DcmIODTypes::IE_INSTANCE), OFTrue);
+}
+
+
+OFCondition TrcStatistic::read(DcmItem& source,
+ const OFBool clearOldData)
+{
+ if (clearOldData)
+ this->clearData();
+ // Read as much as possible. In order to return success at minimum the tracks
+ // must be readable.
+ IODComponent::read(source, OFFalse /* we cleared data before */);
+ DcmIODUtil::readSingleItem(source, DCM_ConceptNameCodeSequence, m_Type, getRules()->getByTag(DCM_ConceptNameCodeSequence));
+ DcmIODUtil::readSingleItem(source, DCM_MeasurementUnitsCodeSequence, m_Units, getRules()->getByTag(DCM_MeasurementUnitsCodeSequence));
+ DcmIODUtil::readSingleItem(source, DCM_ModifierCodeSequence, m_TypeModifier, getRules()->getByTag(DCM_ModifierCodeSequence));
+ return EC_Normal;
+}
+
+
+OFCondition TrcStatistic::write(DcmItem& destination)
+{
+ OFCondition result;
+ DcmIODUtil::writeSingleItem(result, DCM_ConceptNameCodeSequence, m_Type, getData(), getRules()->getByTag(DCM_ConceptNameCodeSequence));
+ DcmIODUtil::writeSingleItem(result, DCM_MeasurementUnitsCodeSequence, m_Units, getData(), getRules()->getByTag(DCM_MeasurementUnitsCodeSequence));
+ DcmIODUtil::writeSingleItem(result, DCM_ModifierCodeSequence, m_TypeModifier, getData(), getRules()->getByTag(DCM_ModifierCodeSequence));
+ if (result.good()) result = IODComponent::write(destination);
+ return result;
+}
+
+
+void TrcStatistic::clearData()
+{
+ m_Type.clearData();
+ m_Units.clearData();
+ m_TypeModifier.clearData();
+ IODComponent::clearData();
+}
+
+OFCondition TrcStatistic::get(CodeSequenceMacro& typeCode,
+ CodeSequenceMacro& typeModifierCode,
+ CodeSequenceMacro& unitsCode)
+{
+ typeCode = m_Type;
+ typeModifierCode = m_TypeModifier;
+ unitsCode = m_Units;
+ return EC_Normal;
+}
+
+
+OFCondition TrcStatistic::set(const CodeSequenceMacro& typeCode,
+ const CodeSequenceMacro& typeModifierCode,
+ const CodeSequenceMacro& unitsCode)
+{
+ OFCondition result;
+ result = OFconst_cast(CodeSequenceMacro*, &typeCode)->check(OFTrue /* quiet */);
+ if (result.good())
+ {
+ m_Type = typeCode;
+ }
+ if (result.good())
+ {
+ result = OFconst_cast(CodeSequenceMacro*, &typeModifierCode)->check(OFTrue /* quiet */);
+ if (result.good())
+ {
+ m_TypeModifier = typeModifierCode;
+ }
+ }
+ if (result.good())
+ {
+ result = OFconst_cast(CodeSequenceMacro*, &unitsCode)->check(OFTrue /* quiet */);
+ if (result.good())
+ {
+ m_Units = unitsCode;
+ }
+ }
+ return result;
+}
+
+
+TrcStatistic::~TrcStatistic()
+{
+ // nothing to do
+}
+
+
+
+// ----------------------------- class TrcTrackStatistic -----------------------
+
+TrcTracksStatistic::TrcTracksStatistic()
+: TrcStatistic()
+{
+ resetRules();
+}
+
+
+TrcTracksStatistic::~TrcTracksStatistic()
+{
+// nothing to do
+}
+
+OFCondition TrcTracksStatistic::create(const CodeSequenceMacro& typeCode,
+ const CodeSequenceMacro& typeModifierCode,
+ const CodeSequenceMacro& unitsCode,
+ const Float32* statisticValues,
+ const size_t numValues,
+ TrcTracksStatistic*& statistic)
+{
+ statistic = new TrcTracksStatistic();
+ if (!statistic)
+ return EC_MemoryExhausted;
+
+ //OFCondition result = OFstatic_cast(TrcStatistic*,statistic)->set(typeCode, typeModifierCode, unitsCode);
+ OFCondition result = statistic->TrcStatistic::set(typeCode, typeModifierCode, unitsCode);
+ if (result.good())
+ {
+ result = statistic->getData().putAndInsertFloat32Array(DCM_FloatingPointValues, statisticValues, numValues);
+ if (result.bad())
+ {
+ result = TRC_EC_InvalidStatisticData;
+ }
+ }
+ if (result.bad())
+ {
+ delete statistic;
+ statistic = NULL;
+ }
+ return result;
+}
+
+
+OFCondition TrcTracksStatistic::read(DcmItem& source,
+ const OFBool clearOldData)
+{
+ return TrcStatistic::read(source, clearOldData);
+}
+
+
+OFCondition TrcTracksStatistic::write(DcmItem& destination)
+{
+ OFCondition result;
+ result = TrcStatistic::write(destination);
+ if (result.good())
+ {
+ result = IODComponent::write(destination);
+ }
+ return result;
+}
+
+
+OFCondition TrcTracksStatistic::get(CodeSequenceMacro& typeCode,
+ CodeSequenceMacro& typeModifierCode,
+ CodeSequenceMacro& unitsCode,
+ const Float32*& statisticValues,
+ unsigned long& numValues)
+{
+ OFCondition result = TrcStatistic::get(typeCode, typeModifierCode, unitsCode);
+
+ if (result.good())
+ {
+ result = m_Item->findAndGetFloat32Array(DCM_FloatingPointValues, statisticValues, &numValues);
+ }
+ return result;
+}
+
+
+OFString TrcTracksStatistic::getName() const
+{
+ return "TrackStatisticsSequenceItem";
+}
+
+
+void TrcTracksStatistic::resetRules()
+{
+ TrcStatistic::resetRules();
+ m_Rules->addRule(new IODRule(DCM_FloatingPointValues, "1","1", getName(), DcmIODTypes::IE_INSTANCE), OFTrue);
+}
+
+
+OFCondition TrcTracksStatistic::set(const CodeSequenceMacro& typeCode,
+ const CodeSequenceMacro& typeModifierCode,
+ const CodeSequenceMacro& unitsCode,
+ const Float32* statisticValues,
+ const size_t numValues)
+{
+ if ( !statisticValues || (numValues == 0))
+ {
+ return TRC_EC_InvalidStatisticData;
+ }
+ OFCondition result = TrcStatistic::set(typeCode, typeModifierCode, unitsCode);
+ if (result.good())
+ {
+ result = m_Item->putAndInsertFloat32Array(DCM_FloatingPointValues, statisticValues, numValues);
+ }
+ return result;
+}
+
+
+// --------------------------- class TrcTrackSetStatistic ----------------------
+
+TrcTrackSetStatistic::TrcTrackSetStatistic()
+: TrcStatistic()
+{
+ resetRules();
+}
+
+
+TrcTrackSetStatistic::~TrcTrackSetStatistic()
+{
+ // nothing to do
+}
+
+
+OFCondition TrcTrackSetStatistic::create(const CodeSequenceMacro& typeCode,
+ const CodeSequenceMacro& typeModifierCode,
+ const CodeSequenceMacro& unitsCode,
+ const Float64 statisticValue,
+ TrcTrackSetStatistic *&statistic)
+{
+ statistic = new TrcTrackSetStatistic();
+ if (!statistic)
+ return EC_MemoryExhausted;
+
+ OFCondition result = statistic->set(typeCode, typeModifierCode, unitsCode, statisticValue);
+ if (result.bad())
+ {
+ delete statistic;
+ statistic = NULL;
+ }
+ return result;
+}
+
+
+OFCondition TrcTrackSetStatistic::read(DcmItem& source,
+ const OFBool clearOldData)
+{
+ OFCondition result = IODComponent::read(source, clearOldData);
+ if (result.good())
+ {
+ TrcStatistic::read(source, clearOldData);
+ }
+ return result;
+}
+
+
+OFCondition TrcTrackSetStatistic::write(DcmItem& destination)
+{
+ OFCondition result;
+ result = TrcStatistic::write(destination);
+ if (result.good())
+ {
+ result = IODComponent::write(destination);
+ }
+ return result;
+}
+
+
+
+OFCondition TrcTrackSetStatistic::get(CodeSequenceMacro& typeCode,
+ CodeSequenceMacro& typeModifierCode,
+ CodeSequenceMacro& unitsCode,
+ Float64& statisticValue)
+{
+ OFCondition result = TrcStatistic::get(typeCode, typeModifierCode, unitsCode);
+ if (result.good())
+ {
+ result = m_Item->findAndGetFloat64(DCM_FloatingPointValue, statisticValue, 0);
+ if (result.bad())
+ {
+ result = TRC_EC_InvalidStatisticData;
+ }
+ }
+ return result;
+}
+
+
+OFString TrcTrackSetStatistic::getName() const
+{
+ return "TrackSetStatisticsSequenceItem";
+}
+
+
+void TrcTrackSetStatistic::resetRules()
+{
+ TrcStatistic::resetRules();
+ m_Rules->addRule(new IODRule(DCM_FloatingPointValue, "1","1", getName(), DcmIODTypes::IE_INSTANCE), OFTrue);
+}
+
+
+OFCondition TrcTrackSetStatistic::set(const CodeSequenceMacro& typeCode,
+ const CodeSequenceMacro& typeModifierCode,
+ const CodeSequenceMacro& unitsCode,
+ const Float64 statisticValue)
+{
+ OFCondition result = TrcStatistic::set(typeCode, typeModifierCode, unitsCode);
+ if (result.good())
+ {
+ result = m_Item->putAndInsertFloat64(DCM_FloatingPointValue, statisticValue, 0);
+ if (result.bad())
+ {
+ result = TRC_EC_InvalidStatisticData;
+ }
+ }
+ return result;
+}
diff --git a/dcmtract/libsrc/trctrack.cc b/dcmtract/libsrc/trctrack.cc
new file mode 100644
index 0000000..c4abfd3
--- /dev/null
+++ b/dcmtract/libsrc/trctrack.cc
@@ -0,0 +1,326 @@
+/*
+ *
+ * Copyright (C) 2016, Open Connections GmbH
+ * All rights reserved. See COPYRIGHT file for details.
+ *
+ * This software and supporting documentation are maintained by
+ *
+ * OFFIS e.V.
+ * R&D Division Health
+ * Escherweg 2
+ * D-26121 Oldenburg, Germany
+ *
+ *
+ * Module: dcmtract
+ *
+ * Author: Michael Onken
+ *
+ * Purpose: Class representing a Track from a Tractography Results IOD
+ *
+ */
+#include "dcmtk/config/osconfig.h"
+#include "dcmtk/dcmdata/dcuid.h"
+#include "dcmtk/dcmiod/iodutil.h"
+#include "dcmtk/dcmtract/trctrack.h"
+#include "dcmtk/dcmtract/trctypes.h"
+
+// default constructor (protected, instance creation via create() function)
+TrcTrack::TrcTrack()
+: IODComponent()
+{
+ TrcTrack::resetRules();
+}
+
+
+OFString TrcTrack::getName() const
+{
+ return "TrackSequenceItem";
+}
+
+
+OFCondition TrcTrack::create(const Float32* trackDataPoints,
+ const size_t numPoints,
+ const Uint16* colors,
+ const size_t numColors,
+ TrcTrack*& track /* result */)
+{
+ track = new TrcTrack();
+ if (!track)
+ return EC_MemoryExhausted;
+
+ OFCondition result = track->setTrackData(trackDataPoints, numPoints);
+ if (result.good())
+ {
+ result = track->setRecommendedDisplayCIELabValues(colors, numColors);
+ }
+ if (result.bad())
+ {
+ delete track;
+ track = NULL;
+ }
+ return result;
+}
+
+
+void TrcTrack::resetRules()
+{
+ // Set rules for the attributes within this component
+ getRules()->addRule(new IODRule(DCM_PointCoordinatesData, "1","1", getName(), DcmIODTypes::IE_INSTANCE), OFTrue);
+ getRules()->addRule(new IODRule(DCM_RecommendedDisplayCIELabValueList, "1","1C", getName(), DcmIODTypes::IE_INSTANCE), OFTrue);
+ getRules()->addRule(new IODRule(DCM_RecommendedDisplayCIELabValue, "3","1C", getName(), DcmIODTypes::IE_INSTANCE), OFTrue);
+}
+
+
+OFCondition TrcTrack::check(const OFBool quiet)
+{
+ // Report errors but ignore them
+ IODComponent::check(quiet);
+ const Float32* data = NULL;
+ unsigned long count = 0;
+ // If the actual data is missing, return an error, ignore other errors
+ if (m_Item->findAndGetFloat32Array(DCM_PointCoordinatesData, data, &count).good())
+ {
+ if (count != 0)
+ {
+ if (count % 3 == 0)
+ {
+ return EC_Normal;
+ }
+ else
+ {
+ DCMTRACT_ERROR("Point Coordinates Data must have x,y,z coordinates for every point but has length: " << count);
+ return IOD_EC_InvalidElementValue;
+ }
+ }
+ else
+ {
+ DCMTRACT_ERROR("Point Coordinates Data empty");
+ return IOD_EC_InvalidElementValue;
+ }
+ }
+ else
+ {
+ DCMTRACT_ERROR("Point Coordinates Data element missing");
+ return IOD_EC_MissingAttribute;
+ }
+ // should never get here
+ return EC_Normal;
+}
+
+
+OFCondition TrcTrack::read(DcmItem& source,
+ OFBool clearOldData)
+{
+ OFCondition result = IODComponent::read(source, clearOldData);
+ if (result.good())
+ {
+ // fix number of values in point coordinates data if wrong
+ if (!fixPointCoordinatesDataVM())
+ {
+ return TRC_EC_InvalidPointCoordinatesData;
+ }
+ }
+ return result;
+}
+
+
+OFCondition TrcTrack::write(DcmItem& destination)
+{
+ return IODComponent::write(destination);
+}
+
+
+void TrcTrack::clearData()
+{
+ IODComponent::clearData();
+}
+
+
+TrcTrack::~TrcTrack()
+{
+ clearData();
+}
+
+
+size_t TrcTrack::getTrackData(const Float32*& data) const
+{
+ data = NULL;
+ unsigned long count;
+ if (m_Item->findAndGetFloat32Array(DCM_PointCoordinatesData, data, &count).good())
+ {
+ return count / 3;
+ }
+ return 0;
+}
+
+
+size_t TrcTrack::getNumDataPoints()
+{
+ DcmElement *elem = NULL;
+ if (m_Item->findAndGetElement(DCM_PointCoordinatesData, elem).good())
+ {
+ Uint32 numBytes = elem->getLengthField();
+ if (numBytes % 2 == 1)
+ {
+ DCMTRACT_WARN("Length of Point Coordinates data is odd (" << numBytes << "), assuming " << numBytes - 1);
+ numBytes = numBytes -1;
+ }
+ // single point coordinate has 4 bytes (Float32), and point consists of 3 coordinates
+ return numBytes / sizeof(Float32) / 3;
+ }
+ return 0;
+}
+
+
+OFBool TrcTrack::getRecommendedDisplayCIELabValue(Uint16& L,
+ Uint16& a,
+ Uint16& b)
+{
+ const Uint16* colors = NULL;
+ unsigned long count = 0;
+ if (m_Item->findAndGetUint16Array(DCM_RecommendedDisplayCIELabValue, colors, &count).good())
+ {
+ if (count < 3)
+ {
+ L = a = b = 0;
+ return OFFalse;
+ }
+ else
+ {
+ L = colors[0];
+ a = colors[1];
+ b = colors[2];
+ return OFTrue;
+ }
+ }
+ else
+ {
+ return OFFalse;
+ }
+}
+
+
+size_t TrcTrack::getRecommendedDisplayCIELabValueList(const Uint16*& colors)
+{
+ unsigned long count = 0;
+ if (m_Item->findAndGetUint16Array(DCM_RecommendedDisplayCIELabValueList, colors, &count).good())
+ {
+ return count / 3;
+ }
+ return 0;
+}
+
+
+TrcTypes::E_TrackColorMode TrcTrack::getRecommendedDisplayCIELabMode()
+{
+ DcmElement *elem = NULL;
+ if (m_Item->findAndGetElement(DCM_RecommendedDisplayCIELabValue, elem).good())
+ {
+ if (elem->getVM() == 3)
+ {
+ if (m_Item->findAndGetElement(DCM_RecommendedDisplayCIELabValueList, elem).good())
+ {
+ DCMTRACT_DEBUG("Recommended Display CIE Lab Value List as well as Recommended Display CIE Lab Value are set, will try per track coloring");
+ }
+ return TrcTypes::CM_TRACK;
+ }
+ else
+ {
+ DCMTRACT_ERROR("Recommended Display CIE Lab Value is set but has more or less than 3 values");
+ return TrcTypes::CM_ERROR;
+ }
+ }
+ // RecommendedDisplayCIELabValue is not set or not set correctly,
+ // try RecommendedDisplayCIELabValueList instead
+ elem = NULL;
+ if (m_Item->findAndGetElement(DCM_RecommendedDisplayCIELabValueList, elem).good())
+ {
+ size_t numBytes = elem->getLength();
+ if (numBytes % 2 == 1)
+ {
+ DCMTRACT_WARN("Recommended Display CIE Lab Value List has odd length " << numBytes << ", assuming " << numBytes -1);
+ numBytes = numBytes - 1;
+ }
+ if (numBytes > 0)
+ {
+ // divide by 2 to get number of 16 bit entries and divide by 3 since
+ // every color has 3 components
+ if (getNumDataPoints() == (numBytes / 2 / 3))
+ {
+ return TrcTypes::CM_POINTS;
+ }
+ else
+ {
+ DCMTRACT_ERROR("Number of colors in Recommended Display CIE Lab Value List does not match number of points in Point Coordinates Data");
+ return TrcTypes::CM_ERROR;
+ }
+ }
+ else
+ {
+ DCMTRACT_ERROR("Recommended Display CIE Lab Value List is empty and can not be used");
+ return TrcTypes::CM_ERROR;
+ }
+ }
+
+ return TrcTypes::CM_TRACKSET;
+}
+
+
+
+OFCondition TrcTrack::setTrackData(const Float32* trackDataPoints,
+ const size_t numPoints)
+{
+ return m_Item->putAndInsertFloat32Array(DCM_PointCoordinatesData, trackDataPoints, numPoints*3);
+}
+
+
+
+OFCondition TrcTrack::setRecommendedDisplayCIELabValues(const Uint16* colors,
+ const size_t numColors)
+{
+ if ( (numColors == 0) && (colors == NULL))
+ {
+ m_Item->findAndDeleteElement(DCM_RecommendedDisplayCIELabValue);
+ m_Item->findAndDeleteElement(DCM_RecommendedDisplayCIELabValueList);
+ return EC_Normal;
+ }
+ else if (colors == NULL)
+ {
+ return TRC_EC_InvalidColorInformation;
+ }
+ if (numColors == 1)
+ {
+ return m_Item->putAndInsertUint16Array(DCM_RecommendedDisplayCIELabValue, colors, numColors * 3);
+ }
+ else
+ {
+ return m_Item->putAndInsertUint16Array(DCM_RecommendedDisplayCIELabValueList, colors, numColors * 3);
+ }
+ // should never get here
+ return TRC_EC_InvalidColorInformation;
+}
+
+
+
+OFBool TrcTrack::fixPointCoordinatesDataVM()
+{
+ DcmElement *elem = NULL;
+ const Float32* values = NULL;
+ unsigned long numValues = 0;
+ if (m_Item->findAndGetFloat32Array(DCM_PointCoordinatesData, values, &numValues).good())
+ {
+ if (numValues % 3 == 0)
+ {
+ return OFTrue;
+ }
+ else
+ {
+ if (elem->putFloat32Array(values, numValues - (numValues % 3)).good())
+ {
+ DCMTRACT_WARN("Wrong number of values in track (" << numValues << "), cutting " << numValues % 3 << " coordinates off at the end");
+ return OFTrue;
+ }
+ }
+ } // else error
+ return OFFalse;
+}
diff --git a/dcmtract/libsrc/trctrackset.cc b/dcmtract/libsrc/trctrackset.cc
new file mode 100644
index 0000000..d6988ba
--- /dev/null
+++ b/dcmtract/libsrc/trctrackset.cc
@@ -0,0 +1,676 @@
+/*
+ *
+ * Copyright (C) 2016, Open Connections GmbH
+ * All rights reserved. See COPYRIGHT file for details.
+ *
+ * This software and supporting documentation are maintained by
+ *
+ * OFFIS e.V.
+ * R&D Division Health
+ * Escherweg 2
+ * D-26121 Oldenburg, Germany
+ *
+ *
+ * Module: dcmtract
+ *
+ * Author: Michael Onken
+ *
+ * Purpose: Class representing a Track Set from a Tractography Results IOD
+ *
+ */
+#include "dcmtk/config/osconfig.h"
+#include "dcmtk/ofstd/ofutil.h"
+#include "dcmtk/dcmdata/dcuid.h"
+#include "dcmtk/dcmiod/iodutil.h"
+#include "dcmtk/dcmtract/trctrackset.h"
+#include "dcmtk/dcmtract/trctrack.h"
+#include "dcmtk/dcmtract/trcmeasurement.h"
+#include "dcmtk/dcmtract/trcstatistic.h"
+#include "dcmtk/dcmtract/trctypes.h"
+
+// default constructor (protected, instance creation via create() function)
+TrcTrackSet::TrcTrackSet()
+: IODComponent(),
+ m_Tracks(),
+ m_Anatomy("3", "1"),
+ m_Measurements(),
+ m_TrackStatistics(),
+ m_TrackSetStatistics(),
+ m_DiffusionAcquisitionCode(),
+ m_DiffusionModelCode(),
+ m_TrackingAlgorithmIdentification()
+{
+ TrcTrackSet::resetRules();
+}
+
+
+void TrcTrackSet::resetRules()
+{
+
+ // Set rules for the attributes within this component
+ getRules()->addRule(new IODRule(DCM_TrackSetNumber, "1","1", getName(), DcmIODTypes::IE_INSTANCE), OFTrue);
+ getRules()->addRule(new IODRule(DCM_TrackSetLabel, "1","1", getName(), DcmIODTypes::IE_INSTANCE), OFTrue);
+ getRules()->addRule(new IODRule(DCM_TrackSetDescription, "1","3", getName(), DcmIODTypes::IE_INSTANCE), OFTrue);
+ getRules()->addRule(new IODRule(DCM_TrackSetAnatomicalTypeCodeSequence, "1","1", getName(), DcmIODTypes::IE_INSTANCE), OFTrue);
+ getRules()->addRule(new IODRule(DCM_TrackSequence, "1-n","1", getName(), DcmIODTypes::IE_INSTANCE), OFTrue);
+ getRules()->addRule(new IODRule(DCM_RecommendedDisplayCIELabValue, "3","1C", getName(), DcmIODTypes::IE_INSTANCE), OFTrue);
+ getRules()->addRule(new IODRule(DCM_RecommendedLineThickness, "1","3", getName(), DcmIODTypes::IE_INSTANCE), OFTrue);
+ getRules()->addRule(new IODRule(DCM_MeasurementsSequence, "1-n","3", getName(), DcmIODTypes::IE_INSTANCE), OFTrue);
+ getRules()->addRule(new IODRule(DCM_TrackStatisticsSequence, "1-n","3", getName(), DcmIODTypes::IE_INSTANCE), OFTrue);
+ getRules()->addRule(new IODRule(DCM_TrackSetStatisticsSequence, "1-n","3", getName(), DcmIODTypes::IE_INSTANCE), OFTrue);
+ getRules()->addRule(new IODRule(DCM_DiffusionAcquisitionCodeSequence, "1","3", getName(), DcmIODTypes::IE_INSTANCE), OFTrue);
+ getRules()->addRule(new IODRule(DCM_DiffusionModelCodeSequence, "1","1", getName(), DcmIODTypes::IE_INSTANCE), OFTrue);
+ getRules()->addRule(new IODRule(DCM_TrackingAlgorithmIdentificationSequence, "1-n","1", getName(), DcmIODTypes::IE_INSTANCE), OFTrue);
+}
+
+
+OFCondition TrcTrackSet::create(const OFString& trackSetLabel,
+ const OFString& trackSetDescription,
+ const CodeWithModifiers& trackSetAnatomy,
+ const CodeSequenceMacro& trackSetDiffusionModelCode,
+ const CodeSequenceMacro& trackSetAlgorithmIdentification,
+ TrcTrackSet*& trackSet)
+{
+ // Track Set Number is set within TrcTractographyResults::addTrackSet()
+ trackSet = new TrcTrackSet();
+ if (!trackSet)
+ return EC_MemoryExhausted;
+
+ OFCondition result = trackSet->setTrackSetLabel(trackSetLabel);
+ if (result.good()) result = trackSet->setTrackSetDescription(trackSetDescription);
+
+ if (result.good())
+ {
+ result = OFconst_cast(CodeWithModifiers*, &trackSetAnatomy)->check();
+ if (result.good())
+ {
+ trackSet->m_Anatomy = trackSetAnatomy;
+ }
+ }
+
+ if (result.good())
+ {
+ result = OFconst_cast(CodeSequenceMacro*, &trackSetDiffusionModelCode)->check();
+ if (result.good())
+ {
+ trackSet->m_DiffusionModelCode = trackSetDiffusionModelCode;
+ }
+ }
+
+ if (result.good())
+ {
+ result = OFconst_cast(CodeSequenceMacro*, &trackSetAlgorithmIdentification)->check();
+ if (result.good())
+ {
+ // add deep copy (via IODComponent) of input param
+ trackSet->m_TrackingAlgorithmIdentification.push_back(new CodeSequenceMacro(trackSetAlgorithmIdentification));
+ }
+ }
+
+ return result;
+}
+
+
+OFCondition TrcTrackSet::read(DcmItem& source,
+ const OFBool clearOldData)
+{
+ if (clearOldData)
+ this->clearData();
+ // Read as much as possible. In order to return success at minimum the tracks
+ // must be readable.
+ IODComponent::read(source, OFFalse /* we cleared data before */);
+ DcmIODUtil::readSingleItem(source, DCM_TrackSetAnatomicalTypeCodeSequence, m_Anatomy, getRules()->getByTag(DCM_TrackSetAnatomicalTypeCodeSequence));
+ DcmIODUtil::readSingleItem(source, DCM_DiffusionAcquisitionCodeSequence, m_DiffusionAcquisitionCode, getRules()->getByTag(DCM_DiffusionAcquisitionCodeSequence));
+ DcmIODUtil::readSingleItem(source, DCM_DiffusionModelCodeSequence, m_DiffusionModelCode, getRules()->getByTag(DCM_DiffusionModelCodeSequence));
+ DcmIODUtil::readSubSequence(source, DCM_TrackingAlgorithmIdentificationSequence, m_TrackingAlgorithmIdentification, getRules()->getByTag(DCM_TrackingAlgorithmIdentificationSequence));
+ readTrackStatistics(source);
+ readTrackSetStatistics(source);
+ OFCondition result = readTracks(source);
+ DCMTRACT_DEBUG("Found " << m_Tracks.size() << " Tracks in Track Set");
+ if (result.good())
+ {
+ readMeasurements(source);
+ }
+ else
+ {
+ DCMTRACT_ERROR("Could not read tracks from Track Set");
+ }
+ return result;
+}
+
+
+OFCondition TrcTrackSet::write(DcmItem& destination)
+{
+ OFCondition result;
+ DcmIODUtil::writeSingleItem(result, DCM_TrackSetAnatomicalTypeCodeSequence, m_Anatomy, getData(), getRules()->getByTag(DCM_TrackSetAnatomicalTypeCodeSequence));
+ DcmIODUtil::writeSingleItem(result, DCM_DiffusionAcquisitionCodeSequence, m_DiffusionAcquisitionCode, getData(), getRules()->getByTag(DCM_DiffusionAcquisitionCodeSequence));
+ DcmIODUtil::writeSingleItem(result, DCM_DiffusionModelCodeSequence, m_DiffusionModelCode, getData(), getRules()->getByTag(DCM_DiffusionModelCodeSequence));
+ DcmIODUtil::writeSubSequence(result, DCM_TrackingAlgorithmIdentificationSequence, m_TrackingAlgorithmIdentification, getData(), getRules()->getByTag(DCM_TrackingAlgorithmIdentificationSequence));
+ writeTrackStatistics(result, getData());
+ writeTrackSetStatistics(result, getData());
+ writeMeasurements(result, getData());
+ writeTracks(result, getData());
+ if (result.good()) result = IODComponent::write(destination);
+ return result;
+}
+
+
+const OFVector<TrcTrack *>& TrcTrackSet::getTracks()
+{
+ return m_Tracks;
+}
+
+
+void TrcTrackSet::clearData()
+{
+ m_Anatomy.clearData();
+ DcmIODUtil::freeContainer(m_Tracks);
+ DcmIODUtil::freeContainer(m_Measurements);
+ DcmIODUtil::freeContainer(m_TrackStatistics);
+ DcmIODUtil::freeContainer(m_TrackSetStatistics);
+ DcmIODUtil::freeContainer(m_TrackingAlgorithmIdentification);
+ m_DiffusionAcquisitionCode.clearData();
+ m_DiffusionModelCode.clearData();
+ IODComponent::clearData();
+}
+
+
+TrcTrackSet::~TrcTrackSet()
+{
+ clearData();
+}
+
+
+OFString TrcTrackSet::getName() const
+{
+ return "TrackSetSequenceItem";
+}
+
+
+void TrcTrackSet::inventMissing()
+{
+ IODComponent::inventMissing();
+ // Note: We could also add code to automatic default coloring
+}
+
+
+OFCondition TrcTrackSet::getTrackSetNumber(Uint16& value,
+ const unsigned long pos) const
+{
+ return m_Item->findAndGetUint16(DCM_TrackSetNumber, value, pos);
+}
+
+
+OFCondition TrcTrackSet::getTrackSetLabel(OFString& value,
+ const long signed int pos) const
+{
+ return DcmIODUtil::getStringValueFromItem(DCM_TrackSetLabel, *m_Item, value, pos);
+}
+
+
+OFCondition TrcTrackSet::getTrackSetDescription(OFString& value,
+ const long signed int pos) const
+{
+ return DcmIODUtil::getStringValueFromItem(DCM_TrackSetDescription, *m_Item, value, pos);
+}
+
+
+OFCondition TrcTrackSet::getRecommendedDisplayCIELabValue(Uint16& L,
+ Uint16& a,
+ Uint16& b)
+{
+ Uint16 myL, mya, myb;
+ myL = mya = myb = 0;
+ DcmElement *elem = NULL;
+ if (m_Item->findAndGetElement(DCM_RecommendedDisplayCIELabValue, elem).good() )
+ {
+ if (elem->getUint16(myL, 0).good())
+ {
+ L = myL;
+ if (elem->getUint16(mya, 1).good())
+ {
+ a = mya;
+ if (elem->getUint16(myb, 2).good())
+ {
+ b = myb;
+ return EC_Normal;
+ }
+ }
+ }
+ }
+ return IOD_EC_InvalidElementValue;
+}
+
+
+OFCondition TrcTrackSet::getRecommendedLineThickness(Float32& value,
+ const long unsigned int pos)
+{
+ return m_Item->findAndGetFloat32(DCM_RecommendedLineThickness, value, pos);
+}
+
+
+OFCondition TrcTrackSet::getLaterality(TrcTypes::E_TrackSetLaterality& laterality)
+{
+ OFCondition result;
+ OFString value, designator;
+ CodeSequenceMacro* mod = m_Anatomy.getModifier(0);
+ if (mod)
+ {
+ mod->getCodingSchemeDesignator(designator);
+ mod->getCodingSchemeDesignator(value);
+
+ if (value.empty() && designator.empty())
+ {
+ laterality = TrcTypes::LAT_UNKNOWN;
+ }
+ else if (designator == "SRT") // all laterality codes are from SNOMED
+ {
+ if (value == "G-A100")
+ {
+ laterality = TrcTypes::LAT_RIGHT;
+ }
+ else if (value == "G-A101")
+ {
+ laterality = TrcTypes::LAT_LEFT;
+ }
+ else if (value == "G-A102")
+ {
+ laterality = TrcTypes::LAT_RIGHT_AND_LEFT;
+ }
+ else if (value == "G-A103")
+ {
+ laterality = TrcTypes::LAT_UNILATERAL;
+ }
+ else
+ {
+ laterality = TrcTypes::LAT_ERROR;
+ result = IOD_EC_InvalidLaterality;
+ }
+ }
+ else
+ {
+ laterality = TrcTypes::LAT_ERROR;
+ result = IOD_EC_InvalidLaterality;
+ }
+ }
+ else
+ {
+ laterality = TrcTypes::LAT_UNKNOWN;
+ }
+ return result;
+}
+
+
+CodeSequenceMacro& TrcTrackSet::getDiffusionAcquisitionCode()
+{
+ return m_DiffusionAcquisitionCode;
+}
+
+
+CodeSequenceMacro& TrcTrackSet::getDiffusionModelCode()
+{
+ return m_DiffusionModelCode;
+}
+
+
+OFVector<CodeSequenceMacro*>& TrcTrackSet::getTrackingAlgorithmIdentification()
+{
+ return m_TrackingAlgorithmIdentification;
+}
+
+
+CodeWithModifiers& TrcTrackSet::getTrackSetAnatomy()
+{
+ return m_Anatomy;
+}
+
+
+const OFVector< TrcTrackSetStatistic* >& TrcTrackSet::getTrackSetStatistics()
+{
+ return m_TrackSetStatistics;
+}
+
+
+const OFVector< TrcTracksStatistic* >& TrcTrackSet::getTrackStatistics()
+{
+ return m_TrackStatistics;
+}
+
+
+size_t TrcTrackSet::getNumberOfTracks()
+{
+ return m_Tracks.size();
+}
+
+
+size_t TrcTrackSet::getNumberOfTrackSetStatistics()
+{
+ return m_TrackSetStatistics.size();
+}
+
+
+size_t TrcTrackSet::getNumberOfTrackStatistics()
+{
+ return m_TrackStatistics.size();
+}
+
+
+size_t TrcTrackSet::getNumberOfMeasurements()
+{
+ return m_Measurements.size();
+}
+
+
+OFCondition TrcTrackSet::findMeasurementsByType(const CodeSequenceMacro& type,
+ OFVector< size_t >& measurementNumbers)
+{
+ OFVector<TrcMeasurement*>::const_iterator it = m_Measurements.begin();
+ for (size_t m = 0; it != m_Measurements.end(); m++)
+ {
+ if ( (*it)->getType().compare(type) == 0 )
+ {
+ measurementNumbers.push_back(m);
+ }
+ it++;
+ }
+ return EC_Normal;
+}
+
+
+OFCondition TrcTrackSet::getMeasurement(const size_t measurementIndex,
+ const TrcMeasurement*& measurement)
+{
+ if (measurementIndex > m_Measurements.size() - 1)
+ {
+ return TRC_EC_NoSuchMeasurement;
+ }
+
+ measurement = m_Measurements[measurementIndex];
+
+ return EC_Normal;
+}
+
+
+
+void TrcTrackSet::getMeasurementInfos(OFVector< OFPair< CodeSequenceMacro, CodeSequenceMacro > >& typesAndUnits)
+{
+ OFVector<TrcMeasurement*>::const_iterator it = m_Measurements.begin();
+ while (it != m_Measurements.end())
+ {
+ typesAndUnits.push_back( OFMake_pair( (*it)->getType(), (*it)->getUnits() ) );
+ it++;
+ }
+}
+
+
+
+OFCondition TrcTrackSet::addTrack(const Float32* pointData,
+ const size_t numPoints,
+ const Uint16* recommendedCIELabColors,
+ const size_t numColors,
+ TrcTrack*& result)
+{
+ OFCondition cond = TrcTrack::create(pointData, numPoints, recommendedCIELabColors, numColors, result);
+ if (cond.good())
+ {
+ m_Tracks.push_back(result);
+ }
+ return cond;
+}
+
+
+OFCondition TrcTrackSet::addMeasurement(const CodeSequenceMacro& measurementCode,
+ const CodeSequenceMacro& measurementUnitCodes,
+ TrcMeasurement*& measurement)
+{
+ OFCondition result = TrcMeasurement::create(measurementCode, measurementUnitCodes, measurement);
+ if (result.good())
+ {
+ m_Measurements.push_back(measurement);
+ }
+ return result;
+}
+
+
+OFCondition TrcTrackSet::addTrackStatistics(const CodeSequenceMacro& typeCode,
+ const CodeSequenceMacro& typeModifierCode,
+ const CodeSequenceMacro& unitsCode,
+ const Float32* values,
+ const size_t numValues,
+ TrcTracksStatistic*& statistic)
+{
+ statistic = new TrcTracksStatistic();
+ if (!statistic)
+ return EC_MemoryExhausted;
+
+ if (numValues != m_Tracks.size())
+ {
+ DCMTRACT_ERROR("There must be as many track statistic values as number of tracks (" << m_Tracks.size() << ")");
+ return TRC_EC_InvalidStatisticData;
+ }
+ OFCondition result = statistic->set(typeCode, typeModifierCode, unitsCode, values, numValues);
+ if (result.good())
+ {
+ m_TrackStatistics.push_back(statistic);
+ }
+ else
+ {
+ delete statistic;
+ statistic = NULL;
+ }
+ return result;
+}
+
+
+OFCondition TrcTrackSet::addTrackSetStatistic(const CodeSequenceMacro& typeCode,
+ const CodeSequenceMacro& typeModifierCode,
+ const CodeSequenceMacro& unitsCode,
+ const Float64 value,
+ TrcTrackSetStatistic*& statistic)
+{
+ statistic = new TrcTrackSetStatistic();
+ if (!statistic)
+ return EC_MemoryExhausted;
+
+ OFCondition result = statistic->set(typeCode, typeModifierCode, unitsCode, value);
+ if (result.good())
+ {
+ m_TrackSetStatistics.push_back(statistic);
+ }
+ else
+ {
+ delete statistic;
+ statistic = NULL;
+ }
+ return result;
+}
+
+
+
+OFCondition TrcTrackSet::setTrackSetLabel(const OFString& value,
+ const OFBool checkValue)
+{
+ OFCondition result = (checkValue) ? DcmLongString::checkStringValue(value, "1") : EC_Normal;
+ if (result.good())
+ result = m_Item->putAndInsertOFStringArray(DCM_TrackSetLabel, value);
+ return result;
+}
+
+
+OFCondition TrcTrackSet::setTrackSetDescription(const OFString& value,
+ const OFBool checkValue)
+{
+ OFCondition result = (checkValue) ? DcmUnlimitedText::checkStringValue(value, "1") : EC_Normal;
+ if (result.good())
+ result = m_Item->putAndInsertOFStringArray(DCM_TrackSetDescription, value);
+ return result;
+}
+
+
+OFCondition TrcTrackSet::setRecommendedDisplayCIELabValue(const Uint16 L,
+ const Uint16 a,
+ const Uint16 b)
+{
+ DcmElement* elem = newDicomElement(DCM_RecommendedDisplayCIELabValue);
+ if (elem)
+ {
+ if (elem->putUint16(L, 0).good())
+ {
+ if (elem->putUint16(a, 1).good())
+ {
+ if (elem->putUint16(b, 2).good())
+ {
+ if (m_Item->insert(elem, OFTrue /* replace old */).good())
+ {
+ return EC_Normal;
+ }
+ }
+ }
+ }
+ }
+ else
+ {
+ return EC_MemoryExhausted;
+ }
+ return EC_InternalError;
+}
+
+
+OFCondition TrcTrackSet::setRecommendedLineThickness(const Float32& value,
+ const OFBool checkValue)
+{
+ (void)checkValue;
+ return m_Item->putAndInsertFloat32(DCM_RecommendedLineThickness, value, 0);
+}
+
+
+OFCondition TrcTrackSet::readTracks(DcmItem& source)
+{
+ return DcmIODUtil::readSubSequence(source, DCM_TrackSequence, m_Tracks, getRules()->getByTag(DCM_TrackSequence));
+}
+
+
+OFCondition TrcTrackSet::readMeasurements(DcmItem& source)
+{
+ DcmIODUtil::readSubSequence(source, DCM_MeasurementsSequence, m_Measurements, getRules()->getByTag(DCM_MeasurementsSequence));
+ if (checkMeasurements().bad())
+ {
+ DCMTRACT_WARN("Ignoring missing or superfluous Measurements");
+ }
+ return EC_Normal;
+}
+
+
+OFCondition TrcTrackSet::setLaterality(const TrcTypes::E_TrackSetLaterality value,
+ const OFBool checkValue)
+{
+ (void)checkValue;
+ CodeSequenceMacro anatomy;
+ switch(value)
+ {
+ case TrcTypes::LAT_RIGHT: anatomy.set("G-A100", "SRT", "Right"); break;
+ case TrcTypes::LAT_LEFT: anatomy.set("G-A101", "SRT", "Left"); break;
+ case TrcTypes::LAT_RIGHT_AND_LEFT: anatomy.set("G-A102", "SRT", "Right and left"); break;
+ case TrcTypes::LAT_UNILATERAL: anatomy.set("G-A103", "SRT", "Unilateral"); break;
+ default: return IOD_EC_InvalidLaterality;
+ }
+
+ CodeSequenceMacro* mod = m_Anatomy.getModifier(0);
+ if (!mod)
+ {
+ mod = new CodeSequenceMacro();
+ if (!mod)
+ {
+ return EC_MemoryExhausted;
+ }
+ *mod = anatomy;
+ m_Anatomy.addModifier(*mod);
+ }
+ else
+ {
+ *mod = anatomy;
+ }
+
+ return EC_Normal;;
+}
+
+
+OFCondition TrcTrackSet::checkMeasurements()
+{
+ size_t numTracks = m_Tracks.size();
+ for (size_t i = 0; i < m_Measurements.size(); i++)
+ {
+ TrcMeasurement *m = m_Measurements[i];
+ size_t numEntries = m->getValues().size();
+ if (numEntries < numTracks)
+ {
+ DCMTRACT_WARN("Measurement #" << i << " misses data for " << numTracks - numEntries << " tracks");
+ return TRC_EC_MeasurementDataMissing;
+ }
+ else if (numEntries > numTracks)
+ {
+ DCMTRACT_WARN("Measurement #" << i << " has data for " << numEntries - numTracks << " too many tracks");
+ return TRC_EC_MeasurementDataMissing;
+ }
+ }
+ return EC_Normal;
+}
+
+
+OFCondition TrcTrackSet::readTrackSetStatistics(DcmItem& source)
+{
+ (void)source;
+ DcmIODUtil::readSubSequence(source, DCM_TrackSetStatisticsSequence, m_TrackSetStatistics, m_Rules->getByTag(DCM_TrackSetStatisticsSequence));
+ return EC_Normal;
+}
+
+
+OFCondition TrcTrackSet::readTrackStatistics(DcmItem& source)
+{
+ (void)source;
+ DcmIODUtil::readSubSequence(source, DCM_TrackStatisticsSequence, m_TrackStatistics, m_Rules->getByTag(DCM_TrackStatisticsSequence));
+ return EC_Normal;
+}
+
+
+OFCondition TrcTrackSet::writeTracks(OFCondition& result,
+ DcmItem& destination)
+{
+ if (result.good())
+ {
+ DcmIODUtil::writeSubSequence(result, DCM_TrackSequence, m_Tracks, destination, getRules()->getByTag(DCM_TrackSequence));
+ }
+ return result;
+}
+
+
+OFCondition TrcTrackSet::writeMeasurements(OFCondition& result,
+ DcmItem& destination)
+{
+ if (result.good())
+ {
+ result = checkMeasurements();
+ if (result.bad())
+ {
+ DCMTRACT_ERROR("Measurements have too much or to less data");
+ return result;
+ }
+ DcmIODUtil::writeSubSequence(result, DCM_MeasurementsSequence, m_Measurements, destination, getRules()->getByTag(DCM_MeasurementsSequence));
+ }
+ return result;
+}
+
+
+void TrcTrackSet::writeTrackSetStatistics(OFCondition& result,
+ DcmItem& destination)
+{
+ DcmIODUtil::writeSubSequence(result, DCM_TrackSetStatisticsSequence, m_TrackSetStatistics, destination, m_Rules->getByTag(DCM_TrackSetStatisticsSequence));
+}
+
+
+void TrcTrackSet::writeTrackStatistics(OFCondition& result,
+ DcmItem& destination)
+{
+ DcmIODUtil::writeSubSequence(result, DCM_TrackStatisticsSequence, m_TrackStatistics, destination, m_Rules->getByTag(DCM_TrackStatisticsSequence));
+}
+
diff --git a/dcmtract/libsrc/trctractographyresults.cc b/dcmtract/libsrc/trctractographyresults.cc
new file mode 100644
index 0000000..a64cd11
--- /dev/null
+++ b/dcmtract/libsrc/trctractographyresults.cc
@@ -0,0 +1,367 @@
+ /*
+ *
+ * Copyright (C) 2016, Open Connections GmbH
+ * All rights reserved. See COPYRIGHT file for details.
+ *
+ * This software and supporting documentation are maintained by
+ *
+ * OFFIS e.V.
+ * R&D Division Health
+ * Escherweg 2
+ * D-26121 Oldenburg, Germany
+ *
+ *
+ * Module: dcmtract
+ *
+ * Author: Michael Onken
+ *
+ * Purpose: Class representing a Segmentation object
+ *
+ */
+#include "dcmtk/config/osconfig.h"
+#include "dcmtk/dcmdata/dcuid.h"
+#include "dcmtk/dcmiod/iodutil.h"
+#include "dcmtk/dcmiod/modcommoninstanceref.h"
+#include "dcmtk/dcmtract/trctractographyresults.h"
+
+// default constructor (protected, instance creation via create() function)
+TrcTractographyResults::TrcTractographyResults()
+: DcmIODCommon(),
+ m_EnhancedGeneralEquipmentModule(DcmIODCommon::getData(), DcmIODCommon::getRules()),
+ m_TractographyResultsModule(DcmIODCommon::getData(), DcmIODCommon::getRules())
+{
+ TrcTractographyResults::initIODRules();
+}
+
+
+void TrcTractographyResults::initIODRules()
+{
+ // We do not explicitly implement Tractography Results Module but just change
+ // existing rules from the General Series Module
+ getRules()->addRule(new IODRule(DCM_ReferencedPerformedProcedureStepSequence, "1","1C", "TractographyResultsSeries", DcmIODTypes::IE_SERIES), OFTrue);
+ getRules()->addRule(new IODRule(DCM_SeriesNumber, "1","1", "TractographyResultsSeries", DcmIODTypes::IE_SERIES), OFTrue);
+}
+
+
+TrcTractographyResults::~TrcTractographyResults()
+{
+ // nothing to do
+}
+
+
+// static method for loading tractography results objects
+OFCondition TrcTractographyResults::loadFile(
+ const OFString& filename,
+ TrcTractographyResults*& trc)
+{
+ DcmFileFormat dcmff;
+ DcmDataset *dataset = NULL;
+ OFCondition result = loadFile(dcmff, filename, dataset);
+ if (result.bad())
+ return result;
+
+ return loadDataset(*dataset, trc);
+}
+
+
+// static method for loading tractography results objects
+OFCondition TrcTractographyResults::loadDataset(
+ DcmDataset& dataset,
+ TrcTractographyResults*& tract)
+{
+ DcmXfer xfer = dataset.getOriginalXfer();
+ // If the original transfer is encapsulated and we do not already have an uncompressed version, decompress or reject the file
+ if (xfer.isEncapsulated())
+ {
+ DCMTRACT_ERROR("Cannot load dataset since it is compressed, transfer syntax: " << xfer.getXferName());
+ return IOD_EC_CannotDecompress;
+ }
+
+ tract = new TrcTractographyResults();
+ if (tract == NULL)
+ {
+ return EC_MemoryExhausted;
+ }
+
+ return tract->read(dataset);
+}
+
+
+OFCondition TrcTractographyResults::create(const ContentIdentificationMacro& contentIdentification,
+ const OFString& contentDate,
+ const OFString& contentTime,
+ const IODEnhGeneralEquipmentModule::EquipmentInfo& equipment,
+ const IODReferences& imageReferences,
+ TrcTractographyResults*& result)
+{
+ result = new TrcTractographyResults();
+ if (!result)
+ return EC_MemoryExhausted;
+
+ OFCondition cond;
+ result->m_TractographyResultsModule.getContentIdentification() = contentIdentification;
+ cond = result->m_TractographyResultsModule.getContentIdentification().check();
+ if (cond.bad())
+ {
+ return cond;
+ }
+
+ OFVector<IODReference*>::const_iterator it = imageReferences.get().begin();
+ while ( cond.good() && (it != imageReferences.get().end()) )
+ {
+ cond = result->m_TractographyResultsModule.addImageReference(**it);
+ it++;
+ }
+ if (cond.good())
+ {
+ if (result->getCommonInstanceReference().addReferences(imageReferences, "") != imageReferences.size())
+ {
+ cond = IOD_EC_InvalidReference;
+ }
+ }
+ if (cond.good())
+ result->m_References = imageReferences;
+ if (cond.good()) cond = result->m_TractographyResultsModule.setContentDate(contentDate);
+ if (cond.good()) cond = result->m_TractographyResultsModule.setContentTime(contentTime);
+ if (cond.good()) cond = result->m_EnhancedGeneralEquipmentModule.set(equipment);
+
+ if (cond.bad())
+ {
+ delete result;
+ result = NULL;
+ }
+ return cond;
+}
+
+
+OFCondition TrcTractographyResults::addTrackSet(const OFString& trackSetLabel,
+ const OFString& trackSetDescription,
+ const CodeWithModifiers& anatomyCode,
+ const CodeSequenceMacro& diffusionModelCode,
+ const CodeSequenceMacro& algoIdentCode,
+ TrcTrackSet*& trackSet)
+{
+ OFCondition result = TrcTrackSet::create(trackSetLabel, trackSetDescription, anatomyCode, diffusionModelCode, algoIdentCode, trackSet);
+ if (result.good())
+ {
+ result = trackSet->getData().putAndInsertUint32(DCM_TrackSetNumber, m_TractographyResultsModule.getTrackSets().size() + 1);
+ if (result.good())
+ {
+ m_TractographyResultsModule.getTrackSets().push_back(trackSet);
+ }
+ else
+ {
+ delete trackSet;
+ trackSet = NULL;
+ }
+ }
+ return result;
+}
+
+
+OFCondition TrcTractographyResults::read(DcmItem &dataset)
+{
+
+ OFString sopClass;
+ if (DcmIODUtil::checkSOPClass(&dataset, UID_TractographyResultsStorage, sopClass).bad())
+ {
+ DCMTRACT_ERROR("Given file does not seem to be a tractography results storage object since SOP class is: " << sopClass);
+ return IOD_EC_WrongSOPClass;
+ }
+
+ // Read attributes in base classes
+ DcmIODCommon::read(dataset);
+
+ // Read modules supported by this class
+ m_EnhancedGeneralEquipmentModule.read(dataset);
+ return m_TractographyResultsModule.read(dataset);
+}
+
+
+OFCondition TrcTractographyResults::write(DcmItem &dataset)
+{
+ if (!check())
+ {
+ return IOD_EC_InvalidObject;
+ }
+
+ OFCondition result;
+
+ // -- Set constant default values written by external modules --
+ getSOPCommon().setSOPClassUID(UID_TractographyResultsStorage);
+
+ // -- Extra Series level data --
+
+ // Tractography results always set Modality to "MR"
+ if (result.good()) result = getSeries().setModality("MR");
+
+ if (result.good()) result = m_EnhancedGeneralEquipmentModule.write(dataset);
+
+ // -- Extra Instance level data --
+ if (result.good()) result = m_TractographyResultsModule.write(dataset);
+
+ // -- Write common multi frame image IOD attributes --
+
+ // Patient Module
+ // General Study Module
+ // General Series Module
+ // Frame of Reference Module
+ // General Equipment Module
+ // SOP Common Module
+ // Common Instance Reference Module
+ if (result.good()) result = DcmIODCommon::write(dataset);
+
+ return result;
+}
+
+
+OFCondition TrcTractographyResults::importPatientStudyFoR(
+ const OFString& filename,
+ const OFBool usePatient,
+ const OFBool useStudy,
+ const OFBool useSeries,
+ const OFBool useFoR,
+ const OFBool updateCommonInstanceReferences)
+{
+ DcmFileFormat dcmff;
+ OFCondition result = dcmff.loadFile(filename.c_str());
+ if ( result.good() )
+ {
+ DcmDataset *dset = dcmff.getDataset();
+ if (dset != NULL)
+ {
+ result = import(*dset, usePatient, useStudy, useSeries, useFoR);
+ if (result.good() && updateCommonInstanceReferences)
+ {
+ getCommonInstanceReference().clearData();
+ getCommonInstanceReference().addReferences(m_References, "");
+ }
+ }
+ else
+ {
+ DCMTRACT_ERROR("Unable to get dataset from file for copying patient, study, series and/or frame of reference information");
+ result = EC_IllegalCall;
+ }
+ }
+ return result;
+}
+
+
+ContentIdentificationMacro& TrcTractographyResults::getContentIdentification()
+{
+ return m_TractographyResultsModule.getContentIdentification();
+}
+
+
+OFCondition TrcTractographyResults::saveFile(
+ const OFString& filename,
+ const E_TransferSyntax writeXfer)
+{
+ if ( (writeXfer != EXS_LittleEndianExplicit) &&
+ (writeXfer != EXS_BigEndianExplicit) &&
+ (writeXfer != EXS_LittleEndianImplicit))
+ {
+ DcmXfer ts(writeXfer);
+ DCMTRACT_ERROR("Cannot write transfer syntax: " << ts.getXferName() << " (can only write uncompressed)");
+ return EC_CannotChangeRepresentation;
+ }
+ DcmFileFormat dcmff;
+ OFCondition result = write( *(dcmff.getDataset()) );
+ if (result.good())
+ {
+ result = dcmff.saveFile(filename.c_str(), writeXfer);
+ }
+ if (result.bad())
+ {
+ DCMTRACT_ERROR("Cannot save tractography results object to file " << filename << ": " << result.text());
+ }
+
+ return result;
+}
+
+
+OFVector< TrcTrackSet* >& TrcTractographyResults::getTrackSets()
+{
+ return m_TractographyResultsModule.getTrackSets();
+}
+
+
+size_t TrcTractographyResults::getNumberOfTrackSets()
+{
+ return m_TractographyResultsModule.getTrackSets().size();
+}
+
+
+OFCondition TrcTractographyResults::writeDataset(DcmItem& dataset)
+{
+ return write(dataset);
+}
+
+
+OFCondition TrcTractographyResults::getContentDate(OFString& value,
+ const long pos)
+{
+ return m_TractographyResultsModule.getContentDate(value, pos);
+}
+
+
+OFCondition TrcTractographyResults::getContentTime(OFString& value,
+ const long pos)
+{
+ return m_TractographyResultsModule.getContentTime(value, pos);
+}
+
+
+IODEnhGeneralEquipmentModule& TrcTractographyResults::getEquipment()
+{
+ return m_EnhancedGeneralEquipmentModule;
+}
+
+
+IODReferences& TrcTractographyResults::getReferencedInstances()
+{
+ return m_TractographyResultsModule.getReferencedInstances();
+}
+
+
+// -- private helpers --
+
+void TrcTractographyResults::clearData()
+{
+ DcmIODCommon::clearData();
+ m_EnhancedGeneralEquipmentModule.clearData();
+ m_TractographyResultsModule.clearData();
+ m_References.clearData();
+}
+
+
+OFCondition TrcTractographyResults::loadFile(
+ DcmFileFormat& dcmff,
+ const OFString& filename,
+ DcmDataset*& dset)
+{
+ dset = NULL;
+ OFCondition result = dcmff.loadFile(filename.c_str());
+ if (result.bad())
+ {
+ DCMTRACT_ERROR("Could not load file " << filename << ": " << result.text());
+ return result;
+ }
+ dset = dcmff.getDataset();
+ if (dset == NULL)
+ {
+ DCMTRACT_ERROR("Could not load file " << filename << ": No dataset");
+ return IOD_EC_InvalidObject;
+ }
+ return result;
+}
+
+
+OFBool TrcTractographyResults::check()
+{
+ if (m_TractographyResultsModule.check().good())
+ {
+ return OFTrue;
+ }
+ return OFFalse;
+}
diff --git a/dcmtract/libsrc/trctypes.cc b/dcmtract/libsrc/trctypes.cc
new file mode 100644
index 0000000..d2fbe94
--- /dev/null
+++ b/dcmtract/libsrc/trctypes.cc
@@ -0,0 +1,34 @@
+/*
+ *
+ * Copyright (C) 2016, Open Connections GmbH
+ * All rights reserved. See COPYRIGHT file for details.
+ *
+ * This software and supporting documentation are maintained by
+ *
+ * OFFIS e.V.
+ * R&D Division Health
+ * Escherweg 2
+ * D-26121 Oldenburg, Germany
+ *
+ *
+ * Module: dcmdata
+ *
+ * Author: Michael Onken
+ *
+ * Purpose: Class and definitions managing various tractography-typical types
+ *
+ */
+
+#include "dcmtk/config/osconfig.h"
+#include "dcmtk/dcmdata/dcerror.h"
+#include "dcmtk/dcmtract/trctypes.h"
+
+OFLogger DCM_dcmtractLogger = OFLog::getLogger("dcmtk.dcmtract");
+
+makeOFConditionConst(TRC_EC_InvalidPointCoordinatesData, OFM_dcmtract, 1, OF_error, "Invalid data in Track's Point Coordinates Data element");
+makeOFConditionConst(TRC_EC_InvalidColorInformation, OFM_dcmtract, 2, OF_error, "Invalid color information for Track or Track Set");
+makeOFConditionConst(TRC_EC_NoSuchTrack, OFM_dcmtract, 3, OF_error, "No such Track in Track Set");
+makeOFConditionConst(TRC_EC_NoSuchMeasurement, OFM_dcmtract, 4, OF_error, "No such Measurement in Track Set");
+makeOFConditionConst(TRC_EC_MeasurementDataMissing, OFM_dcmtract, 5, OF_error, "Measurement misses data for one or more tracks");
+makeOFConditionConst(TRC_EC_InvalidStatisticData, OFM_dcmtract, 6, OF_error, "Statistic data is invalid");
+makeOFConditionConst(TRC_EC_InvalidTrackData, OFM_dcmtract, 7, OF_error, "Track data is invalid");
diff --git a/dcmtract/tests/Makefile.dep b/dcmtract/tests/Makefile.dep
new file mode 100644
index 0000000..e69de29
diff --git a/dcmtract/tests/Makefile.in b/dcmtract/tests/Makefile.in
new file mode 100644
index 0000000..644480a
--- /dev/null
+++ b/dcmtract/tests/Makefile.in
@@ -0,0 +1,29 @@
+#
+# Makefile for dcmtract/tests
+#
+
+ at SET_MAKE@
+
+SHELL = /bin/sh
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+configdir = @top_srcdir@/@configdir@
+
+include $(configdir)/@common_makefile@
+
+
+all:
+
+check:
+
+check-exhaustive:
+
+install:
+
+clean:
+ rm -f $(TRASH)
+
+distclean:
+ rm -f $(DISTTRASH)
+
+dependencies:
diff --git a/docs/CHANGES.361 b/docs/CHANGES.361
index 3655c12..2d05cde 100644
--- a/docs/CHANGES.361
+++ b/docs/CHANGES.361
@@ -1,6 +1,1214 @@
Changes between releases are documented here.
+**** Changes from 2016.06.30 (schlamelcher)
+
+- Updated CHANGES.361 for new development snapshot.
+ Affects: docs/CHANGES.361
+
+- DCMTK_ABI_VERSION for new development snapshot.
+ Affects: CMake/dcmtkPrepare.cmake
+
+- Updated man pages for new development snapshot.
+ Affects: doxygen/manpages/man1/dcm2pdf.1
+ doxygen/manpages/man1/dcm2pnm.1
+ doxygen/manpages/man1/dcm2xml.1
+ doxygen/manpages/man1/dcmcjpeg.1
+ doxygen/manpages/man1/dcmcjpls.1
+ doxygen/manpages/man1/dcmconv.1
+ doxygen/manpages/man1/dcmcrle.1
+ doxygen/manpages/man1/dcmdjpeg.1
+ doxygen/manpages/man1/dcmdjpls.1
+ doxygen/manpages/man1/dcmdrle.1
+ doxygen/manpages/man1/dcmdspfn.1
+ doxygen/manpages/man1/dcmdump.1
+ doxygen/manpages/man1/dcmftest.1
+ doxygen/manpages/man1/dcmgpdir.1
+ doxygen/manpages/man1/dcmj2pnm.1
+ doxygen/manpages/man1/dcml2pnm.1
+ doxygen/manpages/man1/dcmmkcrv.1
+ doxygen/manpages/man1/dcmmkdir.1
+ doxygen/manpages/man1/dcmmklut.1
+ doxygen/manpages/man1/dcmodify.1
+ doxygen/manpages/man1/dcmp2pgm.1
+ doxygen/manpages/man1/dcmprscp.1
+ doxygen/manpages/man1/dcmprscu.1
+ doxygen/manpages/man1/dcmpschk.1
+ doxygen/manpages/man1/dcmpsmk.1
+ doxygen/manpages/man1/dcmpsprt.1
+ doxygen/manpages/man1/dcmpsrcv.1
+ doxygen/manpages/man1/dcmpssnd.1
+ doxygen/manpages/man1/dcmqridx.1
+ doxygen/manpages/man1/dcmqrscp.1
+ doxygen/manpages/man1/dcmqrti.1
+ doxygen/manpages/man1/dcmquant.1
+ doxygen/manpages/man1/dcmrecv.1
+ doxygen/manpages/man1/dcmscale.1
+ doxygen/manpages/man1/dcmsend.1
+ doxygen/manpages/man1/dcmsign.1
+ doxygen/manpages/man1/dcod2lum.1
+ doxygen/manpages/man1/dconvlum.1
+ doxygen/manpages/man1/drtdump.1
+ doxygen/manpages/man1/dsr2html.1
+ doxygen/manpages/man1/dsr2xml.1
+ doxygen/manpages/man1/dsrdump.1
+ doxygen/manpages/man1/dump2dcm.1
+ doxygen/manpages/man1/echoscu.1
+ doxygen/manpages/man1/findscu.1
+ doxygen/manpages/man1/getscu.1
+ doxygen/manpages/man1/img2dcm.1
+ doxygen/manpages/man1/movescu.1
+ doxygen/manpages/man1/pdf2dcm.1
+ doxygen/manpages/man1/storescp.1
+ doxygen/manpages/man1/storescu.1
+ doxygen/manpages/man1/termscu.1
+ doxygen/manpages/man1/wlmscpfs.1
+ doxygen/manpages/man1/xml2dcm.1
+ doxygen/manpages/man1/xml2dsr.1
+
+**** Changes from 2016.06.29 (schlamelcher)
+
+- Updated Makefile dependencies.
+ Affects: ofstd/libsrc/Makefile.dep
+
+**** Changes from 2016.06.28 (onken)
+
+- Add get() for Segmentation Series Module:
+ Thanks to Christian Herz <cherz at bwh.harvard.edu>for the hint and suggested
+ patch.
+ Affects: dcmseg/include/dcmtk/dcmseg/segdoc.h
+ dcmseg/libsrc/segdoc.cc
+
+**** Changes from 2016.06.21 (hasenpusch)
+
+- Removed unnecessary buffer size divisibility check:
+ This fixes DCMTK bug #667.
+ Affects: dcmjpeg/libsrc/djcodece.cc
+
+**** Changes from 2016.06.14 (onken)
+
+- Fixed 32 bit long int warning:
+ Fixed warning in integer to string conversion originating from different
+ size of type Uint32 on 32 and 64 bit systems.
+ Affects: dcmiod/libsrc/iodreferences.cc
+
+**** Changes from 2016.06.13 (riesmeier)
+
+- Updated code definitions for DICOM 2016c:
+ Updated automatically generated code definitions of "DCM" coding scheme for
+ the latest release of the DICOM standard, i.e. DICOM 2016c. All other coding
+ schemes are not updated since there were no changes or the header files are
+ not (yet) generated automatically.
+ Affects: dcmsr/include/dcmtk/dcmsr/codes/dcm.h
+
+- Updated data dictionary for DICOM 2016c edition:
+ Updated data dictionary for the latest edition of the DICOM standard, which
+ has been released on 2016-06-10. Since DCMTK's data dictionary was already
+ up-to-date regarding the recently approved Supplements and CPs, there are no
+ changes apart from the "Version" column.
+ Affects: dcmdata/data/dicom.dic
+ dcmdata/include/dcmtk/dcmdata/dcdeftag.h
+ dcmdata/libsrc/dcdictbi.cc
+
+**** Changes from 2016.06.10 (onken)
+
+- Added another comment.
+ Affects: dcmtract/include/dcmtk/dcmtract/trcmeasurement.h
+
+**** Changes from 2016.06.10 (hasenpusch)
+
+- Modified OFVector's re-allocation strategy:
+ Upon insert() into a vector whose resulting size is greater than its capacity,
+ the vector's allocated space will now be doubled, like with most STL implemen-
+ tations.
+ Affects: ofstd/include/dcmtk/ofstd/ofvector.h
+
+**** Changes from 2016.06.10 (onken)
+
+- Fixed doubled class name in function definition:
+ Fixed double class name that breaks Visual Studio (and does not make much sense
+ at all).
+ Affects: dcmtract/libsrc/trctractographyresults.cc
+
+- Fix friend declaration to work in Visual Studio.
+ Affects: dcmtract/include/dcmtk/dcmtract/trcmeasurement.h
+ dcmtract/include/dcmtk/dcmtract/trcstatistic.h
+ dcmtract/include/dcmtk/dcmtract/trctrack.h
+ dcmtract/include/dcmtk/dcmtract/trctrackset.h
+
+**** Changes from 2016.06.09 (onken)
+
+- Corrected error from merging in tractography code.
+ Affects: dcmiod/libsrc/iodtypes.cc
+
+- Modifier Code Sequence exchangable:
+ Very often in DICOM as combination of a code with modifiers is used. The
+ modifiers are often stored in the Modifier Code Sequence. However, sometimes
+ another sequence is used for the same purpose. For those cases the sequence
+ being used in the CodeWithModifiers class has been made configurable.
+ Affects: dcmiod/include/dcmtk/dcmiod/iodmacro.h
+ dcmiod/libsrc/iodmacro.cc
+
+**** Changes from 2016.06.08 (onken)
+
+- New module dcmtract for Tractography Results:
+ Added new module dcmtract that offers a dedicated API to create and read DICOM
+ Tractography Results objects as introduced in DICOM Supplement 181. The commit
+ also includes enhancements and minor fixes for the dcmiod and dcmfg modules.
+ Acknowledgement: This work has been supported by the "SlicerDMRI" project.
+ SlicerDMRI is in part supported by funding from the National Institutes of
+ Health National Institute of Biomedical Imaging and Bioengineering (NIBIB), to
+ project Neuroimage Analysis Center, award P41 EB015902; and the National
+ Institutes of Health National Cancer Institute (NCI) Informatics Technology for
+ Cancer Research (ITCR) initiative, to project Open Source Diffusion MRI
+ Technology For Brain Cancer Research, award U01 CA199459.
+ Added: dcmiod/include/dcmtk/dcmiod/iodreferences.h
+ dcmiod/libsrc/iodreferences.cc
+ dcmtract/CMakeLists.txt
+ dcmtract/Makefile.in
+ dcmtract/configure
+ dcmtract/data/Makefile.in
+ dcmtract/docs/Makefile.in
+ dcmtract/docs/dcmtract.dox
+ dcmtract/etc/Makefile.in
+ dcmtract/include/CMakeLists.txt
+ dcmtract/include/Makefile.in
+ dcmtract/include/dcmtk/dcmtract/trcdef.h
+ dcmtract/include/dcmtk/dcmtract/trcmeasurement.h
+ dcmtract/include/dcmtk/dcmtract/trcmodtractresults.h
+ dcmtract/include/dcmtk/dcmtract/trcstatistic.h
+ dcmtract/include/dcmtk/dcmtract/trctrack.h
+ dcmtract/include/dcmtk/dcmtract/trctrackset.h
+ dcmtract/include/dcmtk/dcmtract/trctractographyresults.h
+ dcmtract/include/dcmtk/dcmtract/trctypes.h
+ dcmtract/libsrc/CMakeLists.txt
+ dcmtract/libsrc/Makefile.dep
+ dcmtract/libsrc/Makefile.in
+ dcmtract/libsrc/trcmeasurement.cc
+ dcmtract/libsrc/trcmodtractresults.cc
+ dcmtract/libsrc/trcstatistic.cc
+ dcmtract/libsrc/trctrack.cc
+ dcmtract/libsrc/trctrackset.cc
+ dcmtract/libsrc/trctractographyresults.cc
+ dcmtract/libsrc/trctypes.cc
+ dcmtract/tests/Makefile.dep
+ dcmtract/tests/Makefile.in
+ Affects: CMakeLists.txt
+ CREDITS
+ Makefile
+ config/modules
+ dcmdata/include/dcmtk/dcmdata/dcerror.h
+ dcmfg/libsrc/Makefile.dep
+ dcmfg/libsrc/fgrealworldvaluemapping.cc
+ dcmiod/include/dcmtk/dcmiod/iodmacro.h
+ dcmiod/include/dcmtk/dcmiod/iodrules.h
+ dcmiod/include/dcmtk/dcmiod/iodtypes.h
+ dcmiod/include/dcmtk/dcmiod/iodutil.h
+ dcmiod/include/dcmtk/dcmiod/modbase.h
+ dcmiod/include/dcmtk/dcmiod/modcommoninstanceref.h
+ dcmiod/include/dcmtk/dcmiod/modenhequipment.h
+ dcmiod/include/dcmtk/dcmiod/modenhusimage.h
+ dcmiod/include/dcmtk/dcmiod/modgeneralimage.h
+ dcmiod/libsrc/CMakeLists.txt
+ dcmiod/libsrc/Makefile.dep
+ dcmiod/libsrc/iodmacro.cc
+ dcmiod/libsrc/iodrules.cc
+ dcmiod/libsrc/iodtypes.cc
+ dcmiod/libsrc/iodutil.cc
+ dcmiod/libsrc/modacquisitioncontext.cc
+ dcmiod/libsrc/modbase.cc
+ dcmiod/libsrc/modcommoninstanceref.cc
+ dcmiod/libsrc/modenhequipment.cc
+ dcmiod/libsrc/modenhusimage.cc
+ dcmiod/libsrc/modenhusseries.cc
+ dcmiod/libsrc/modequipment.cc
+ dcmiod/libsrc/modfor.cc
+ dcmiod/libsrc/modgeneralimage.cc
+ dcmiod/libsrc/modgeneralseries.cc
+ dcmiod/libsrc/modgeneralstudy.cc
+ dcmiod/libsrc/modimagepixel.cc
+ dcmiod/libsrc/modmultiframedimension.cc
+ dcmiod/libsrc/modmultiframefg.cc
+ dcmiod/libsrc/modpatient.cc
+ dcmiod/libsrc/modpatientstudy.cc
+ dcmiod/libsrc/modsegmentationseries.cc
+ dcmiod/libsrc/modsopcommon.cc
+ dcmiod/libsrc/modsynchronization.cc
+ dcmiod/libsrc/modusfor.cc
+ dcmseg/include/dcmtk/dcmseg/segdoc.h
+ dcmseg/libsrc/Makefile.dep
+ dcmseg/tests/Makefile.dep
+ doxygen/htmldocs.dox
+
+- Added missing access to Segment Algorithm Name:
+ Thanks to Christian Herz for the report and patch.
+ Affects: dcmseg/include/dcmtk/dcmseg/segment.h
+ dcmseg/libsrc/segment.cc
+
+**** Changes from 2016.06.03 (eichelberg)
+
+- Fixed overflow issue in JPEG-LS encoder:
+ Fixed overflow issue in JPEG-LS encoder by porting the corrected
+ implementation of EncoderStrategy::AppendToBitStream() from CharLS 1.1.0.
+ This closes DCMTK Bug #687.
+ Thanks to Mathieu Malaterre <mathieu.malaterre at gmail.com> for the report.
+ Affects: dcmjpls/libcharls/encodstr.h
+
+**** Changes from 2016.06.02 (riesmeier)
+
+- Changed name of recently added "DCM" codes:
+ Removed additional "_" characters from new DCM code constant.
+ Affects: dcmsr/include/dcmtk/dcmsr/codes/dcm.h
+
+**** Changes from 2016.06.01 (riesmeier)
+
+- Removed unused "dcmnet" function and definitions:
+ Removed unused function DUL_DefaultServiceParameters() and unused macros
+ DICOM_NET_IMPLEMENTATIONCLASSUID and DICOM_NET_IMPLEMENTATIONVERSIONNAME,
+ which were probably used in the past in the ancient network implementation.
+ Affects: dcmnet/include/dcmtk/dcmnet/dicom.h
+ dcmnet/include/dcmtk/dcmnet/dul.h
+ dcmnet/libsrc/dul.cc
+
+**** Changes from 2016.06.01 (onken)
+
+- Adapted copyright date and fixed formatting:
+ Adapted copyright date and fixed formatting errors caused by last commit
+ removing the "register" keyword.
+ Affects: dcmdata/libi2d/i2djpgs.cc
+ dcmdata/libsrc/dcdict.cc
+ dcmdata/libsrc/dcrleccd.cc
+ dcmdata/libsrc/dcrlecce.cc
+ dcmdata/libsrc/dcswap.cc
+ dcmimage/include/dcmtk/dcmimage/diargpxt.h
+ dcmimage/include/dcmtk/dcmimage/dicmypxt.h
+ dcmimage/include/dcmtk/dcmimage/dicomot.h
+ dcmimage/include/dcmtk/dcmimage/dicoopxt.h
+ dcmimage/include/dcmtk/dcmimage/dicopxt.h
+ dcmimage/include/dcmtk/dcmimage/dihsvpxt.h
+ dcmimage/include/dcmtk/dcmimage/dipalpxt.h
+ dcmimage/include/dcmtk/dcmimage/diqtcmap.h
+ dcmimage/include/dcmtk/dcmimage/diqtctab.h
+ dcmimage/include/dcmtk/dcmimage/diqtfs.h
+ dcmimage/include/dcmtk/dcmimage/dirgbpxt.h
+ dcmimage/include/dcmtk/dcmimage/diybrpxt.h
+ dcmimage/include/dcmtk/dcmimage/diyf2pxt.h
+ dcmimage/include/dcmtk/dcmimage/diyp2pxt.h
+ dcmimage/libsrc/diqtctab.cc
+ dcmimage/libsrc/diqthash.cc
+ dcmimage/libsrc/diquant.cc
+ dcmimgle/include/dcmtk/dcmimgle/dicrvfit.h
+ dcmimgle/include/dcmtk/dcmimgle/diflipt.h
+ dcmimgle/include/dcmtk/dcmimgle/diinpxt.h
+ dcmimgle/include/dcmtk/dcmimgle/dimoipxt.h
+ dcmimgle/include/dcmtk/dcmimgle/dimoopxt.h
+ dcmimgle/include/dcmtk/dcmimgle/dimopxt.h
+ dcmimgle/include/dcmtk/dcmimgle/dirotat.h
+ dcmimgle/include/dcmtk/dcmimgle/discalet.h
+ dcmimgle/include/dcmtk/dcmimgle/displint.h
+ dcmimgle/include/dcmtk/dcmimgle/diutils.h
+ dcmimgle/libsrc/dibaslut.cc
+ dcmimgle/libsrc/dicielut.cc
+ dcmimgle/libsrc/didispfn.cc
+ dcmimgle/libsrc/digsdfn.cc
+ dcmimgle/libsrc/digsdlut.cc
+ dcmimgle/libsrc/diluptab.cc
+ dcmimgle/libsrc/dimoimg.cc
+ dcmimgle/libsrc/diovdat.cc
+ dcmimgle/libsrc/diovlay.cc
+ dcmimgle/libsrc/diovlimg.cc
+ dcmimgle/libsrc/diovpln.cc
+ dcmjpeg/libsrc/djcodecd.cc
+ dcmjpls/libsrc/djcodecd.cc
+ dcmpstat/libsrc/dviface.cc
+ ofstd/include/dcmtk/ofstd/ofbmanip.h
+
+- Remove deprecated "register" keyword in C++ code:
+ See also http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2014/n4193.html#809
+ Thanks to Hans Johnson <hans-johnson at uiowa.edu> for the hint and suggested
+ patch.
+ Affects: dcmdata/libi2d/i2djpgs.cc
+ dcmdata/libsrc/dcdict.cc
+ dcmdata/libsrc/dcrleccd.cc
+ dcmdata/libsrc/dcrlecce.cc
+ dcmdata/libsrc/dcswap.cc
+ dcmdata/libsrc/dcvr.cc
+ dcmimage/include/dcmtk/dcmimage/diargpxt.h
+ dcmimage/include/dcmtk/dcmimage/dicmypxt.h
+ dcmimage/include/dcmtk/dcmimage/dicomot.h
+ dcmimage/include/dcmtk/dcmimage/dicoopxt.h
+ dcmimage/include/dcmtk/dcmimage/dicopxt.h
+ dcmimage/include/dcmtk/dcmimage/dihsvpxt.h
+ dcmimage/include/dcmtk/dcmimage/dipalpxt.h
+ dcmimage/include/dcmtk/dcmimage/diqtcmap.h
+ dcmimage/include/dcmtk/dcmimage/diqtctab.h
+ dcmimage/include/dcmtk/dcmimage/diqtfs.h
+ dcmimage/include/dcmtk/dcmimage/dirgbpxt.h
+ dcmimage/include/dcmtk/dcmimage/diybrpxt.h
+ dcmimage/include/dcmtk/dcmimage/diyf2pxt.h
+ dcmimage/include/dcmtk/dcmimage/diyp2pxt.h
+ dcmimage/libsrc/diqtctab.cc
+ dcmimage/libsrc/diqthash.cc
+ dcmimage/libsrc/diquant.cc
+ dcmimgle/include/dcmtk/dcmimgle/dicrvfit.h
+ dcmimgle/include/dcmtk/dcmimgle/diflipt.h
+ dcmimgle/include/dcmtk/dcmimgle/diinpxt.h
+ dcmimgle/include/dcmtk/dcmimgle/dimoipxt.h
+ dcmimgle/include/dcmtk/dcmimgle/dimoopxt.h
+ dcmimgle/include/dcmtk/dcmimgle/dimopxt.h
+ dcmimgle/include/dcmtk/dcmimgle/dirotat.h
+ dcmimgle/include/dcmtk/dcmimgle/discalet.h
+ dcmimgle/include/dcmtk/dcmimgle/displint.h
+ dcmimgle/include/dcmtk/dcmimgle/diutils.h
+ dcmimgle/libsrc/dibaslut.cc
+ dcmimgle/libsrc/dicielut.cc
+ dcmimgle/libsrc/didispfn.cc
+ dcmimgle/libsrc/digsdfn.cc
+ dcmimgle/libsrc/digsdlut.cc
+ dcmimgle/libsrc/diluptab.cc
+ dcmimgle/libsrc/dimoimg.cc
+ dcmimgle/libsrc/diovdat.cc
+ dcmimgle/libsrc/diovlay.cc
+ dcmimgle/libsrc/diovlimg.cc
+ dcmimgle/libsrc/diovpln.cc
+ dcmjpeg/libsrc/djcodecd.cc
+ dcmjpls/libsrc/djcodecd.cc
+ dcmpstat/libsrc/dviface.cc
+ ofstd/include/dcmtk/ofstd/ofbmanip.h
+ ofstd/libsrc/ofstd.cc
+
+**** Changes from 2016.05.31 (riesmeier)
+
+- Added codes introduced with recently approved CPs:
+ Added new "DCM" codes introduced with the recently approved CP-1543
+ (PET image library corrections).
+ Affects: dcmsr/include/dcmtk/dcmsr/codes/dcm.h
+
+- Made use of DateTime consistent in concept names:
+ Implemented changes introduced with CP-1545 (Make use of DateTime consistent
+ in concept names), which was approved as Final Text only recently.
+ Affects: dcmsr/include/dcmtk/dcmsr/codes/dcm.h
+ dcmsr/libcmr/tid1600.cc
+
+- Added support for recently approved CPs:
+ Added support for CP-1031 and CP-1539 to the data dictionary.
+ These CPs were approved during this weeks WG-06 meeting.
+ Affects: dcmdata/data/dicom.dic
+ dcmdata/include/dcmtk/dcmdata/dcdeftag.h
+ dcmdata/libsrc/dcdictbi.cc
+
+**** Changes from 2016.05.24 (riesmeier)
+
+- Added size of DICOM dataset to transfer entry:
+ Added information on the size of the dataset (in bytes) to the transfer entry,
+ i.e. to the list of SOP instances to be transferred. Also added a new notifier
+ method that is called _before_ a SOP instance is transferred. This allows for
+ implementing a more accurate progress bar in a derived class.
+ Affects: dcmnet/include/dcmtk/dcmnet/dstorscu.h
+ dcmnet/libsrc/dstorscu.cc
+
+**** Changes from 2016.05.13 (riesmeier)
+
+- Avoided recursion in DB_FreeUidList():
+ Replaced recursive call in DB_FreeUidList() by a while loop in order
+ to fix a possible issue (crash) when freeing a very long UID list.
+ Thanks to Stacy Loesch <Stacy.Loesch at varian.com> for the report.
+ Affects: dcmqrdb/libsrc/dcmqrdbi.cc
+
+**** Changes from 2016.05.03 (riesmeier)
+
+- Updated latest tested CMake version:
+ Updated information on latest CMake version that has been tested to "3.5.2".
+ Affects: CMake/dcmtkPrepare.cmake
+
+**** Changes from 2016.04.27 (riesmeier)
+
+- Enhanced return value of determineStartFragment():
+ Enhanced error conditions returned by DcmCodec::determineStartFragment().
+ This avoids getting a meaningless EC_IllegalCall when trying to access a
+ particular frame of a compressed and fragmented pixel data element, e.g.
+ if the basic offset table is empty. This is particularly reasonable since
+ the codec rountines are usually hidden to the user of the toolkit, e.g. by
+ the DicomImage class.
+ Affects: dcmdata/include/dcmtk/dcmdata/dcerror.h
+ dcmdata/libsrc/dccodec.cc
+ dcmdata/libsrc/dcerror.cc
+
+- Removed unused local function:
+ The (local) function dcmErrorConditionToString() is not used any longer,
+ so remove it from the source file.
+ Affects: dcmdata/libsrc/dcerror.cc
+
+**** Changes from 2016.04.25 (schlamelcher)
+
+- Removed definition of Visual Studio macro NOMINMAX:
+ A previous commit introduced the definition of NOMINMAX inside osconfig.h to
+ fix problems regarding the min()/max() functions declared as part of
+ OFnumeric_limits. However, this is problematic for users that declare
+ NOMINMAX themselves or don't want to declare NOMINMAX at all.
+ This commit removes the NOMINMAX definition from osconfig.h and modifies
+ OFnumeric_limits and related header files in a way that they may be included
+ without the need to declare NOMINMAX. The NOMINMAX macro is then only defined
+ when compiling the DCMTK itself, DCMTK users may or may not declare NOMINMAX
+ themselves as needed/appropriate.
+ Thanks to Peter Klotz <Peter.Klotz at ith-icoserve.com> for the report.
+ Affects: CMake/dcmtkPrepare.cmake
+ CMake/osconfig.h.in
+ ofstd/include/dcmtk/ofstd/oflimits.h
+ ofstd/include/dcmtk/ofstd/ofstd.h
+
+**** Changes from 2016.04.08 (schlamelcher)
+
+- Improved const handling of some DCMNET functions:
+ Added the const modifier to so DCMNET function arguments for ease of use.
+ Thanks to Peter Klotz <Peter.Klotz at ith-icoserve.com> for the suggested patch.
+ Affects: dcmnet/include/dcmtk/dcmnet/dimse.h
+ dcmnet/libsrc/dimecho.cc
+ dcmnet/libsrc/dimfind.cc
+ dcmnet/libsrc/dimget.cc
+ dcmnet/libsrc/dimmove.cc
+ dcmnet/libsrc/dimstore.cc
+
+**** Changes from 2016.04.08 (riesmeier)
+
+- Fixed typos in comments.
+ Affects: dcmdata/libsrc/dcitem.cc
+
+**** Changes from 2016.04.07 (riesmeier)
+
+- Fixed an incorrect warning for command sets:
+ Fixed an incorrect warning on invalid data elements in a command set
+ (i.e. group 0x0000) caused by a previous commit (4636d9c).
+ Thanks to Peter Klotz <Peter.Klotz at ith-icoserve.com> for the report.
+ Affects: dcmdata/libsrc/dcitem.cc
+
+**** Changes from 2016.04.06 (riesmeier)
+
+- Updated context group classes for DICOM 2016b:
+ Updated automatically generated context group classes from the DICOM Content
+ Mapping Resource (DCMR) based on PS 3.16 from DICOM 2016b standard.
+ Affects: dcmsr/include/dcmtk/dcmsr/cmr/cid100.h
+ dcmsr/include/dcmtk/dcmsr/cmr/cid10013.h
+ dcmsr/include/dcmtk/dcmsr/cmr/cid10033.h
+ dcmsr/include/dcmtk/dcmsr/cmr/cid11.h
+ dcmsr/include/dcmtk/dcmsr/cmr/cid244.h
+ dcmsr/include/dcmtk/dcmsr/cmr/cid29.h
+ dcmsr/include/dcmtk/dcmsr/cmr/cid4020.h
+ dcmsr/include/dcmtk/dcmsr/cmr/cid4021.h
+ dcmsr/include/dcmtk/dcmsr/cmr/cid4031.h
+ dcmsr/include/dcmtk/dcmsr/cmr/cid42.h
+ dcmsr/include/dcmtk/dcmsr/cmr/cid6147.h
+ dcmsr/include/dcmtk/dcmsr/cmr/cid7021.h
+ dcmsr/include/dcmtk/dcmsr/cmr/cid7181.h
+ dcmsr/include/dcmtk/dcmsr/cmr/cid7445.h
+ dcmsr/include/dcmtk/dcmsr/cmr/cid7452.h
+ dcmsr/include/dcmtk/dcmsr/cmr/cid7453.h
+ dcmsr/include/dcmtk/dcmsr/cmr/cid7464.h
+ dcmsr/include/dcmtk/dcmsr/cmr/cid7469.h
+ dcmsr/libcmr/cid100.cc
+ dcmsr/libcmr/cid10013.cc
+ dcmsr/libcmr/cid10033.cc
+ dcmsr/libcmr/cid11.cc
+ dcmsr/libcmr/cid244.cc
+ dcmsr/libcmr/cid29.cc
+ dcmsr/libcmr/cid4020.cc
+ dcmsr/libcmr/cid4021.cc
+ dcmsr/libcmr/cid4031.cc
+ dcmsr/libcmr/cid42.cc
+ dcmsr/libcmr/cid6147.cc
+ dcmsr/libcmr/cid7021.cc
+ dcmsr/libcmr/cid7181.cc
+ dcmsr/libcmr/cid7445.cc
+ dcmsr/libcmr/cid7452.cc
+ dcmsr/libcmr/cid7453.cc
+ dcmsr/libcmr/cid7464.cc
+ dcmsr/libcmr/cid7469.cc
+
+- Updated code definitions for DICOM 2016b:
+ Updated automatically generated code definitions of "DCM", "NCIt" and "UMLS"
+ coding scheme for the latest release of the DICOM standard, i.e. DICOM 2016b.
+ The other coding schemes like "SRT" or "UCUM" are not updated since their
+ header files are not (yet) generated automatically.
+ Affects: dcmsr/include/dcmtk/dcmsr/codes/dcm.h
+ dcmsr/include/dcmtk/dcmsr/codes/ncit.h
+ dcmsr/include/dcmtk/dcmsr/codes/umls.h
+
+- Updated data dictionary for DICOM 2016b edition:
+ Updated data dictionary for the latest edition of the DICOM standard, which
+ has been released on 2016-04-01. Since the data dictionary was already
+ up-to-date regarding the recently approved Supplements and CPs, there are no
+ changes apart from the "Version" column.
+ Affects: dcmdata/data/dicom.dic
+ dcmdata/include/dcmtk/dcmdata/dcdeftag.h
+ dcmdata/libsrc/dcdictbi.cc
+
+**** Changes from 2016.04.06 (schlamelcher)
+
+- Fixed some configuration tests for VS2015 and later:
+ Some changes in the runtime of Visual Studio 2015 and later lead to false
+ configuration test results regarding some secure printf functions
+ (e.g. vsprintf_s).
+ Thanks to DCMTK forum user Shaeto for providing related information and the
+ suggested patch.
+ Affects: CMake/GenerateDCMTKConfigure.cmake
+
+- Fixed a problem with yesterday's commit:
+ The previous commit regarding ofmath.cc resp. math.cc contained a copy and
+ paste error leading to problems under Windows.
+ Affects: config/math.cc
+
+**** Changes from 2016.04.05 (schlamelcher)
+
+- Fixed a warning and some whitespace errors:
+ Fixed a warning about an uninitialized variable and some whitespace errors in
+ oflog (timehelp.cc).
+ Affects: oflog/libsrc/timehelp.cc
+
+- Refactored OFMath/arith.cc dependencies:
+ Moved ofmath.cc to the config module (with slight modifications) so arith.cc
+ depending on it becomes less messy.
+ Added a new ofmath.cc for ofstd, adapting between both APIs (the low level
+ API used in config and the one provided by ofstd).
+ Modified arith.cc as necessary.
+ Added: config/math.cc
+ Affects: config/arith.cc
+ ofstd/libsrc/ofmath.cc
+
+**** Changes from 2016.03.31 (schlamelcher)
+
+- Fixed touching arith.h on every CMake cache rebuild:
+ Regarding the CMake setup, the file config/arith.h is now only generated once
+ during the initial cache setup, similar to the other configure tests only
+ being run once.
+ This may potentially miss changes induced by changed compiler flags, however,
+ this is of course also a problem regarding all the other configure test and
+ should be addressed some time in the future in general.
+ Affects: CMake/GenerateDCMTKConfigure.cmake
+
+**** Changes from 2016.03.21 (riesmeier)
+
+- Replaced EC_InvalidTag by EC_MissingAttribute:
+ Now using more appropriate status code EC_MissingAttribute instead of
+ EC_InvalidTag when checkExistsWithValue() fails for Type 1 attributes.
+ This change should have no effect to user code (internal use only).
+ Affects: dcmdata/libsrc/dcddirif.cc
+
+- Added support for Directory Record "ASSESSMENT":
+ Added support for new Directory Record Type "ASSESSMENT", which has been
+ introduced with Supplement 185 (Content Assessment Results IOD).
+ Affects: dcmdata/include/dcmtk/dcmdata/dcddirif.h
+ dcmdata/include/dcmtk/dcmdata/dcdirrec.h
+ dcmdata/libsrc/dcddirif.cc
+ dcmdata/libsrc/dcdirrec.cc
+
+- Added support for new UID from Supplement 185:
+ Added support for new Storage SOP Class UID from Supplement 185 (Content
+ Assessment Results IOD).
+ Affects: dcmdata/include/dcmtk/dcmdata/dcuid.h
+ dcmdata/libsrc/dcuid.cc
+ dcmnet/docs/movescu.man
+ dcmnet/docs/storescp.man
+ dcmnet/etc/storescp.cfg
+ dcmnet/etc/storescu.cfg
+ dcmqrdb/docs/dcmqrscp.man
+
+- Added support for Supplement 185 to dictionary:
+ Added support for the final text version "FT2" of Supplement 185 (Content
+ Assessment Results IOD) to the data dictionary.
+ Affects: dcmdata/data/dicom.dic
+ dcmdata/include/dcmtk/dcmdata/dcdeftag.h
+ dcmdata/libsrc/dcdictbi.cc
+
+- Added support for recently approved CPs:
+ Added support for CP-1492, CP-1525 and CP-1531 to the data dictionary.
+ These CPs were approved during last weeks WG-06 meeting.
+ Affects: dcmdata/data/dicom.dic
+ dcmdata/include/dcmtk/dcmdata/dcdeftag.h
+ dcmdata/libsrc/dcdictbi.cc
+
+- Fixed typos and other minor issues in comments.
+ Affects: dcmnet/include/dcmtk/dcmnet/assoc.h
+ dcmnet/include/dcmtk/dcmnet/dimse.h
+ dcmnet/libsrc/assoc.cc
+ dcmnet/libsrc/dimse.cc
+
+**** Changes from 2016.03.07 (riesmeier)
+
+- Cleaned up header inclusion in module "dcmsr":
+ Made sure that only "required" header files are actually included.
+ This should reduce the dependencies significantly.
+ Affects: dcmpstat/libsrc/Makefile.dep
+ dcmsr/apps/Makefile.dep
+ dcmsr/apps/dsr2html.cc
+ dcmsr/apps/dsr2xml.cc
+ dcmsr/apps/dsrdump.cc
+ dcmsr/apps/xml2dsr.cc
+ dcmsr/include/dcmtk/dcmsr/cmr/cid100.h
+ dcmsr/include/dcmtk/dcmsr/cmr/cid10013.h
+ dcmsr/include/dcmtk/dcmsr/cmr/cid10033.h
+ dcmsr/include/dcmtk/dcmsr/cmr/cid11.h
+ dcmsr/include/dcmtk/dcmsr/cmr/cid244.h
+ dcmsr/include/dcmtk/dcmsr/cmr/cid29.h
+ dcmsr/include/dcmtk/dcmsr/cmr/cid4020.h
+ dcmsr/include/dcmtk/dcmsr/cmr/cid4021.h
+ dcmsr/include/dcmtk/dcmsr/cmr/cid4031.h
+ dcmsr/include/dcmtk/dcmsr/cmr/cid42.h
+ dcmsr/include/dcmtk/dcmsr/cmr/cid5000.h
+ dcmsr/include/dcmtk/dcmsr/cmr/cid5001.h
+ dcmsr/include/dcmtk/dcmsr/cmr/cid6147.h
+ dcmsr/include/dcmtk/dcmsr/cmr/cid7021.h
+ dcmsr/include/dcmtk/dcmsr/cmr/cid7181.h
+ dcmsr/include/dcmtk/dcmsr/cmr/cid7445.h
+ dcmsr/include/dcmtk/dcmsr/cmr/cid7452.h
+ dcmsr/include/dcmtk/dcmsr/cmr/cid7453.h
+ dcmsr/include/dcmtk/dcmsr/cmr/cid7464.h
+ dcmsr/include/dcmtk/dcmsr/cmr/cid7469.h
+ dcmsr/include/dcmtk/dcmsr/dsrcitem.h
+ dcmsr/include/dcmtk/dcmsr/dsrcodvl.h
+ dcmsr/include/dcmtk/dcmsr/dsrcomvl.h
+ dcmsr/include/dcmtk/dcmsr/dsrdoc.h
+ dcmsr/include/dcmtk/dcmsr/dsrdocst.h
+ dcmsr/include/dcmtk/dcmsr/dsrdoctn.h
+ dcmsr/include/dcmtk/dcmsr/dsrdoctr.h
+ dcmsr/include/dcmtk/dcmsr/dsrnumvl.h
+ dcmsr/include/dcmtk/dcmsr/dsrposcn.h
+ dcmsr/include/dcmtk/dcmsr/dsrsoprf.h
+ dcmsr/include/dcmtk/dcmsr/dsrstrvl.h
+ dcmsr/include/dcmtk/dcmsr/dsrtcodt.h
+ dcmsr/include/dcmtk/dcmsr/dsrtlist.h
+ dcmsr/include/dcmtk/dcmsr/dsrtnant.h
+ dcmsr/include/dcmtk/dcmsr/dsrtncsr.h
+ dcmsr/include/dcmtk/dcmsr/dsrtree.h
+ dcmsr/include/dcmtk/dcmsr/dsrtypes.h
+ dcmsr/include/dcmtk/dcmsr/dsrxmlc.h
+ dcmsr/include/dcmtk/dcmsr/dsrxmld.h
+ dcmsr/libcmr/Makefile.dep
+ dcmsr/libcmr/tid1001.cc
+ dcmsr/libcmr/tid1204.cc
+ dcmsr/libcmr/tid1411.cc
+ dcmsr/libcmr/tid1500.cc
+ dcmsr/libcmr/tid1600.cc
+ dcmsr/libsrc/Makefile.dep
+ dcmsr/libsrc/dsrcodtn.cc
+ dcmsr/libsrc/dsrcodvl.cc
+ dcmsr/libsrc/dsrcomtn.cc
+ dcmsr/libsrc/dsrcomvl.cc
+ dcmsr/libsrc/dsrcontn.cc
+ dcmsr/libsrc/dsrcsidl.cc
+ dcmsr/libsrc/dsrctpl.cc
+ dcmsr/libsrc/dsrdattn.cc
+ dcmsr/libsrc/dsrdoc.cc
+ dcmsr/libsrc/dsrdoctn.cc
+ dcmsr/libsrc/dsrdoctr.cc
+ dcmsr/libsrc/dsrdtitn.cc
+ dcmsr/libsrc/dsrimgfr.cc
+ dcmsr/libsrc/dsrimgse.cc
+ dcmsr/libsrc/dsrimgtn.cc
+ dcmsr/libsrc/dsrimgvl.cc
+ dcmsr/libsrc/dsrnumvl.cc
+ dcmsr/libsrc/dsrpnmtn.cc
+ dcmsr/libsrc/dsrrefin.cc
+ dcmsr/libsrc/dsrreftn.cc
+ dcmsr/libsrc/dsrsc3gr.cc
+ dcmsr/libsrc/dsrsc3vl.cc
+ dcmsr/libsrc/dsrscogr.cc
+ dcmsr/libsrc/dsrscovl.cc
+ dcmsr/libsrc/dsrsoprf.cc
+ dcmsr/libsrc/dsrtcodt.cc
+ dcmsr/libsrc/dsrtcosp.cc
+ dcmsr/libsrc/dsrtcoto.cc
+ dcmsr/libsrc/dsrtcovl.cc
+ dcmsr/libsrc/dsrtextn.cc
+ dcmsr/libsrc/dsrtimtn.cc
+ dcmsr/libsrc/dsrtypes.cc
+ dcmsr/libsrc/dsruidtn.cc
+ dcmsr/libsrc/dsrwavch.cc
+ dcmsr/libsrc/dsrwavtn.cc
+ dcmsr/libsrc/dsrwavvl.cc
+ dcmsr/tests/Makefile.dep
+ dcmsr/tests/mkreport.cc
+ dcmsr/tests/tsrcmr.cc
+ dcmsr/tests/tsrcodvl.cc
+ dcmsr/tests/tsrdoc.cc
+ dcmsr/tests/tsrdoctr.cc
+ dcmsr/tests/tsrnumvl.cc
+ dcmsr/tests/tsrtpl.cc
+ dcmsr/tests/tsrtree.cc
+
+**** Changes from 2016.03.04 (riesmeier)
+
+- Check for PixelSpacing in SharedFunctionalGroups:
+ Also check for the Pixel Spacing (0028,0030) attribute in the Pixel Measures
+ Sequence (0028,9110) of the Shared Functional Groups Sequence (5200,9229).
+ By doing so, non-square pixels are supported for the family of Enhanced
+ Multiframe Image IODs, too.
+ Please note that support for Pixel Spacing within the Per-frame Functional
+ Groups Sequence (5200,9230) is still missing.
+ Affects: dcmimgle/include/dcmtk/dcmimgle/dcmimage.h
+ dcmimgle/libsrc/diimage.cc
+
+- Fixed typos in comments (API documentation).
+ Affects: dcmimage/include/dcmtk/dcmimage/dicoimg.h
+ dcmimage/include/dcmtk/dcmimage/dicopx.h
+ dcmimgle/include/dcmtk/dcmimgle/dimoimg.h
+
+- Fixed shifting negative value: undefined behavior:
+ Fixed shifting a negative value (-1) since this is undefined behavior
+ according to the C standard. See comment in the source code for details.
+ This memory leak has been detected by "cppcheck" (version 1.72).
+ Thanks to Andrei Terechko <andrei at vectorfabrics.com> for the report
+ Affects: dcmjpeg/libijg12/jdlhuff.c
+ dcmjpeg/libijg12/jdphuff.c
+ dcmjpeg/libijg12/jdshuff.c
+ dcmjpeg/libijg16/jdlhuff.c
+ dcmjpeg/libijg16/jdphuff.c
+ dcmjpeg/libijg16/jdshuff.c
+ dcmjpeg/libijg8/jdlhuff.c
+ dcmjpeg/libijg8/jdphuff.c
+ dcmjpeg/libijg8/jdshuff.c
+
+- Fixed typos in comments.
+ Affects: ofstd/tests/tofstd.cc
+
+**** Changes from 2016.03.03 (riesmeier)
+
+- Fixed warnings reported by gcc with -Wshadow:
+ Fixed warning messages on declaration of a local variable that shadows a
+ previous declaration. This issue was reported by gcc with option -Wshadow.
+ Affects: dcmdata/libsrc/dcbytstr.cc
+ dcmdata/libsrc/dcsequen.cc
+
+**** Changes from 2016.03.03 (onken)
+
+- Removed test duplicate:
+ Removed test that was present as a separate file (but not used) in favor
+ of the same test being part of tofstd.cc which has already been in use.
+ Removed: ofstd/tests/taddsub.cc
+ Affects: ofstd/tests/Makefile.dep
+
+**** Changes from 2016.03.03 (riesmeier)
+
+- Fixed wrong module name in comment header.
+ Affects: dcmrt/tests/tests.cc
+
+- Fixed typos in man pages.
+ Affects: dcmdata/docs/dcmgpdir.man
+ dcmdata/docs/img2dcm.man
+ dcmjpeg/docs/dcmcjpeg.man
+ dcmjpls/docs/dcmcjpls.man
+ dcmnet/docs/movescu.man
+
+**** Changes from 2016.03.02 (onken)
+
+- Better warnings when reading segmentation objects:
+ Enhanced warnings when reading segmentation objects if pixel data-related
+ attributes have invalid values.
+ Affects: dcmseg/include/dcmtk/dcmseg/segtypes.h
+ dcmseg/libsrc/segdoc.cc
+ dcmseg/libsrc/segtypes.cc
+
+- Fixed warning message:
+ Fixed warning printed if the High Bit attribute does not have a valid value.
+ Affects: dcmseg/libsrc/segdoc.cc
+
+**** Changes from 2016.02.26 (riesmeier)
+
+- Fixed typos etc. in module "dcmseg":
+ Fixed typos and other minor issues in comments and log output.
+ Affects: dcmseg/include/dcmtk/dcmseg/segdoc.h
+ dcmseg/include/dcmtk/dcmseg/segment.h
+ dcmseg/include/dcmtk/dcmseg/segtypes.h
+ dcmseg/include/dcmtk/dcmseg/segutils.h
+ dcmseg/libsrc/segdoc.cc
+ dcmseg/libsrc/segment.cc
+ dcmseg/libsrc/segtypes.cc
+ dcmseg/libsrc/segutils.cc
+
+- Fixed typos etc. in module "dcmiod":
+ Fixed typos and other minor issues in comments, log output and return values.
+ Affects: dcmiod/include/dcmtk/dcmiod/cielabutil.h
+ dcmiod/include/dcmtk/dcmiod/iodmacro.h
+ dcmiod/include/dcmtk/dcmiod/iodrules.h
+ dcmiod/include/dcmtk/dcmiod/iodutil.h
+ dcmiod/include/dcmtk/dcmiod/modcommoninstanceref.h
+ dcmiod/include/dcmtk/dcmiod/modenhusimage.h
+ dcmiod/include/dcmtk/dcmiod/modenhusseries.h
+ dcmiod/include/dcmtk/dcmiod/modequipment.h
+ dcmiod/include/dcmtk/dcmiod/modmultiframedimension.h
+ dcmiod/include/dcmtk/dcmiod/modmultiframefg.h
+ dcmiod/include/dcmtk/dcmiod/modpatientstudy.h
+ dcmiod/include/dcmtk/dcmiod/modsopcommon.h
+ dcmiod/include/dcmtk/dcmiod/modsynchronisation.h
+ dcmiod/libsrc/iodmacro.cc
+ dcmiod/libsrc/iodutil.cc
+ dcmiod/libsrc/modbase.cc
+ dcmiod/libsrc/modequipment.cc
+ dcmiod/libsrc/modsynchronization.cc
+ dcmiod/tests/tcielabutil.cc
+
+**** Changes from 2016.02.25 (riesmeier)
+
+- Fixed numerous typos etc. in module "dcmfg":
+ Fixed numerous typos and other minor issues like e.g. double semicolons,
+ missing or extra space characters. This affects both comments and strings
+ that are output to the logger. Of course, the latter are more important.
+ Affects: dcmfg/include/dcmtk/dcmfg/fg.h
+ dcmfg/include/dcmtk/dcmfg/fgbase.h
+ dcmfg/include/dcmtk/dcmfg/fgderimg.h
+ dcmfg/include/dcmtk/dcmfg/fgfracon.h
+ dcmfg/include/dcmtk/dcmfg/fgframevoilut.h
+ dcmfg/include/dcmtk/dcmfg/fgimagedatatype.h
+ dcmfg/include/dcmtk/dcmfg/fginterface.h
+ dcmfg/include/dcmtk/dcmfg/fgpixmsr.h
+ dcmfg/include/dcmtk/dcmfg/fgplanor.h
+ dcmfg/include/dcmtk/dcmfg/fgplanorvol.h
+ dcmfg/include/dcmtk/dcmfg/fgplanpo.h
+ dcmfg/include/dcmtk/dcmfg/fgplanposvol.h
+ dcmfg/include/dcmtk/dcmfg/fgrealworldvaluemapping.h
+ dcmfg/include/dcmtk/dcmfg/fgseg.h
+ dcmfg/include/dcmtk/dcmfg/fgtypes.h
+ dcmfg/include/dcmtk/dcmfg/fgusimagedescription.h
+ dcmfg/include/dcmtk/dcmfg/stack.h
+ dcmfg/libsrc/fg.cc
+ dcmfg/libsrc/fgbase.cc
+ dcmfg/libsrc/fgfact.cc
+ dcmfg/libsrc/fgfracon.cc
+ dcmfg/libsrc/fginterface.cc
+ dcmfg/libsrc/fgplanpo.cc
+ dcmfg/libsrc/fgtypes.cc
+ dcmfg/libsrc/fgusimagedescription.cc
+ dcmfg/libsrc/stackinterface.cc
+
+**** Changes from 2016.02.25 (onken)
+
+- Fixed NULL pointer dereference:
+ This memory leak has been detected by "cppcheck".
+ Thanks to Andrei Terechko <andrei at vectorfabrics.com> for the report.
+ Affects: dcmfg/libsrc/fgimagedatatype.cc
+
+**** Changes from 2016.02.24 (riesmeier)
+
+- Fixed possible issue in OFStandard helper function:
+ Fixed possible issue in OFStandard::removeRootDirFromPathname() that could
+ occur when passing a NULL pointer as the "rootDir" parameter, and thus
+ calling strncmp() or wcsncmp() with an invalid value. This is mainly a
+ theoretical scenario, since most implementations of these standard string
+ functions will not crash when a 0 length value is passed at the same time
+ (see test case "ofstd_OFStandard_removeRootDirFromPathname").
+ This possible issue has been found with Pareon Verify.
+ Thanks to Andrei Terechko <andrei at vectorfabrics.com> for the report.
+ Affects: ofstd/libsrc/ofstd.cc
+
+- Fixed memory leak in ASC_addPresentationContext():
+ Memory of presentation context data structure was not freed when empty
+ transfer syntax list was passed to ASC_addPresentationContext(). Also
+ removed an unused local variable and fixed various typos in comments.
+ This memory leak has been detected by "cppcheck".
+ Thanks to Andrei Terechko <andrei at vectorfabrics.com> for the report.
+ Affects: dcmnet/libsrc/assoc.cc
+
+**** Changes from 2016.02.22 (riesmeier)
+
+- Made use of definitions from "dcmsr/codes/ucum.h":
+ Made use of code and coding scheme definitions from the header file
+ "dcmsr/codes/ucum.h". Also removed coding scheme version ("1.4") since
+ it is not used any longer by DICOM PS 3.16 for UCUM codes.
+ Affects: dcmsr/include/dcmtk/dcmsr/codes/ucum.h
+ dcmsr/tests/Makefile.dep
+ dcmsr/tests/mkreport.cc
+
+- Added comment on mapping of code meanings:
+ Added comment on the mapping of code meanings to a compiler-friendly
+ representention, which is the reason why the SRT and UCUM coding schemes
+ are not yet complete (with regard to the definitions in DICOM PS 3.16).
+ Please note that the commit message for the previous commit (168662c)
+ was incorrect: not the UCUM but the UMLS codes definitions were updated.
+ Acknowledgement: This work has been supported in part by the "QIICR" project.
+ Affects: dcmsr/include/dcmtk/dcmsr/codes/srt.h
+ dcmsr/include/dcmtk/dcmsr/codes/ucum.h
+
+- Updated "UCUM" codes for DICOM 2016a edition:
+ Updated Unified Code for Units of Measure (Coding Scheme "UCUM") code
+ definitions for the official 2016a edition of the DICOM standard. The
+ header file has been generated automatically from a machine-readable
+ version of DICOM PS 3.16.
+ There is now a total of 38 codes defined for this coding scheme.
+ Acknowledgement: This work has been supported in part by the "QIICR" project.
+ Affects: dcmsr/include/dcmtk/dcmsr/codes/umls.h
+
+- Updated "NCIt" codes for DICOM 2016a edition:
+ Updated NCI Thesaurus (Coding Scheme "NCIt") for the official 2016a edition
+ of the DICOM standard. The header file has been generated automatically from
+ a machine-readable version of DICOM PS 3.16.
+ There is now a total of 12 codes defined for this coding scheme.
+ Acknowledgement: This work has been supported in part by the "QIICR" project.
+ Affects: dcmsr/include/dcmtk/dcmsr/codes/ncit.h
+
+- Fixed source code formatting.
+ Affects: dcmsr/libsrc/dsrimgse.cc
+
+- Updated copyright header.
+ Affects: dcmsr/include/dcmtk/dcmsr/codes/srt.h
+ dcmsr/include/dcmtk/dcmsr/codes/ucum.h
+ dcmsr/include/dcmtk/dcmsr/dsrdncsr.h
+
+**** Changes from 2016.02.20 (riesmeier)
+
+- Updated "DCM" codes for DICOM 2016a edition:
+ Updated DICOM Controlled Terminology Definitions (Coding Scheme "DCM") for
+ the official 2016a edition of the DICOM standard. The header file has been
+ generated automatically from a machine-readable version of DICOM PS 3.16.
+ There is now a total of 3358 codes for this coding scheme (i.e. DICOM codes).
+ Acknowledgement: This work has been supported in part by the "QIICR" project.
+ Affects: dcmsr/include/dcmtk/dcmsr/codes/dcm.h
+
+- Updated context group classes for DICOM 2016a:
+ Updated automatically generated context group classes from the DICOM Content
+ Mapping Resource (DCMR) based on PS 3.16 from DICOM 2016a standard.
+ Acknowledgement: This work has been supported in part by the "QIICR" project.
+ Affects: dcmsr/include/dcmtk/dcmsr/cmr/cid100.h
+ dcmsr/include/dcmtk/dcmsr/cmr/cid10013.h
+ dcmsr/include/dcmtk/dcmsr/cmr/cid10033.h
+ dcmsr/include/dcmtk/dcmsr/cmr/cid11.h
+ dcmsr/include/dcmtk/dcmsr/cmr/cid244.h
+ dcmsr/include/dcmtk/dcmsr/cmr/cid29.h
+ dcmsr/include/dcmtk/dcmsr/cmr/cid4020.h
+ dcmsr/include/dcmtk/dcmsr/cmr/cid4021.h
+ dcmsr/include/dcmtk/dcmsr/cmr/cid4031.h
+ dcmsr/include/dcmtk/dcmsr/cmr/cid42.h
+ dcmsr/include/dcmtk/dcmsr/cmr/cid6147.h
+ dcmsr/include/dcmtk/dcmsr/cmr/cid7021.h
+ dcmsr/include/dcmtk/dcmsr/cmr/cid7181.h
+ dcmsr/include/dcmtk/dcmsr/cmr/cid7445.h
+ dcmsr/include/dcmtk/dcmsr/cmr/cid7452.h
+ dcmsr/include/dcmtk/dcmsr/cmr/cid7453.h
+ dcmsr/include/dcmtk/dcmsr/cmr/cid7464.h
+ dcmsr/include/dcmtk/dcmsr/cmr/cid7469.h
+ dcmsr/libcmr/cid100.cc
+ dcmsr/libcmr/cid10013.cc
+ dcmsr/libcmr/cid10033.cc
+ dcmsr/libcmr/cid11.cc
+ dcmsr/libcmr/cid244.cc
+ dcmsr/libcmr/cid29.cc
+ dcmsr/libcmr/cid4020.cc
+ dcmsr/libcmr/cid4021.cc
+ dcmsr/libcmr/cid4031.cc
+ dcmsr/libcmr/cid42.cc
+ dcmsr/libcmr/cid6147.cc
+ dcmsr/libcmr/cid7021.cc
+ dcmsr/libcmr/cid7181.cc
+ dcmsr/libcmr/cid7445.cc
+ dcmsr/libcmr/cid7452.cc
+ dcmsr/libcmr/cid7453.cc
+ dcmsr/libcmr/cid7464.cc
+ dcmsr/libcmr/cid7469.cc
+
+- Updated data dictionary for DICOM 2016a edition:
+ Updated data dictionary for the latest edition of the DICOM standard, which
+ has been released on 2016-02-19. This includes the new tags from Supplement
+ 156, 181 and 184 as well as those from CP 1364, 1431, 1432, 1441, 1454,
+ 1457, 1458, 1460, 1461, 1478 (WC), 1487, 1496, 1499, 1504 and 1516. Please
+ note that some attributes changed their names and/or value multiplicity.
+ In addition, new and modified tags from ASTM's DICONDE (Digital Imaging and
+ Communication in Nondestructive Evaluation) standard have been incorporated.
+ The total number of entries in the DICOM data dictionary is now 4032.
+ Affects: dcmdata/data/dicom.dic
+ dcmdata/include/dcmtk/dcmdata/dcdeftag.h
+ dcmdata/libsrc/dcdictbi.cc
+ dcmrt/libsrc/drtbvcps.cc
+
+**** Changes from 2016.02.18 (riesmeier)
+
+- Added three new Storage SOP Classes from DICOS:
+ Added three new Storage SOP Classes from DICOS (Digital Imaging and
+ Communications in Security) standard: 2D AIT, 3D AIT and Quadrupole
+ Resonance (QR). Actually, these SOP Classes were already introduced
+ to the DICOM standard back in 2013 but have been added to the DCMTK
+ just now. Further details on the underlying IODs are not known.
+ Affects: dcmdata/include/dcmtk/dcmdata/dcuid.h
+ dcmdata/libsrc/dcuid.cc
+ dcmnet/docs/movescu.man
+ dcmnet/docs/storescp.man
+ dcmnet/etc/storescp.cfg
+ dcmnet/etc/storescu.cfg
+ dcmqrdb/docs/dcmqrscp.man
+
+- Added missing Storage SOP Classes to manpage:
+ Added missing Storage SOP Classes that are actually supported by the SCP
+ (within the "movescu" tool). These SOP Classes were added during the
+ previous months to the global list stored in "dcmAllStorageSOPClassUIDs".
+ Affects: dcmnet/docs/movescu.man
+
+- Changed type of parameter to avoid warnings:
+ Changed type of parameter/variable from Uint32 to size_t in order to avoid
+ warnings reported by MSVC++ on Windows 64-bit systems.
+ Affects: dcmdata/include/dcmtk/dcmdata/dcbytstr.h
+ dcmdata/libsrc/dcbytstr.cc
+
+**** Changes from 2016.02.17 (riesmeier)
+
+- Updated Makefile dependencies for module "dcmsr".
+ Affects: dcmsr/apps/Makefile.dep
+ dcmsr/libcmr/Makefile.dep
+ dcmsr/libsrc/Makefile.dep
+ dcmsr/tests/Makefile.dep
+
+- Fixed issue with shared library build (MSVC++):
+ Fixed issue with shared library build on Windows with Microsoft Visual C++.
+ Now, the CMake option BUILD_SHARED_LIBS works again on both Linux with gcc
+ and Windows with Visual C++, i.e. for ".so" and ".dll" files.
+ C++ templates with explicit specialization and shared library support are
+ really a nightmare, especially when the implementation of the C++ template
+ class is not completely contained in a header file.
+ Affects: dcmsr/include/dcmtk/dcmsr/dsrdncsr.h
+ dcmsr/include/dcmtk/dcmsr/dsrtncsr.h
+
+- Enhanced support for by-reference relationships:
+ Further enhanced support for by-reference relationships: Now, the position
+ string that is used to reference the target content item is also generated
+ correctly when the document tree contains included (i.e. non-expanded)
+ sub-templates. Also enhanced the existing test cases in order to check that
+ it really works.
+ Please pay attention to the new comment on updateByReferenceRelationships()
+ and to the optional parameter that allows for updating subtrees managed by
+ "included template" tree nodes.
+ Acknowledgement: This work has been supported in part by the "QIICR" project.
+ Affects: dcmsr/include/dcmtk/dcmsr/dsrdocst.h
+ dcmsr/include/dcmtk/dcmsr/dsrrtpl.h
+ dcmsr/include/dcmtk/dcmsr/dsrstpl.h
+ dcmsr/include/dcmtk/dcmsr/dsrtypes.h
+ dcmsr/libsrc/dsrdocst.cc
+ dcmsr/libsrc/dsrdoctr.cc
+ dcmsr/libsrc/dsrtypes.cc
+ dcmsr/tests/tsrtpl.cc
+
+- Further simplified DSRDocumentSubTree::print():
+ Further simplified implementation of DSRDocumentSubTree::print() by making
+ use of the new DSRIncludedTemplateNodeCursor class. Also added a new print
+ flag that disables the counting of "included template" nodes. This flag is
+ also passed to the tree node cursor class in order to correctly generate
+ the position string.
+ Acknowledgement: This work has been supported in part by the "QIICR" project.
+ Affects: dcmsr/include/dcmtk/dcmsr/dsrdocst.h
+ dcmsr/include/dcmtk/dcmsr/dsrtypes.h
+ dcmsr/libsrc/dsrdncsr.cc
+ dcmsr/libsrc/dsrdocst.cc
+ dcmsr/libsrc/dsrtypes.cc
+
+- Made more use of new "included template" cursor:
+ Made more use of the new DSRIncludedTemplateNodeCursor class (where
+ appropriate).
+ Affects: dcmsr/include/dcmtk/dcmsr/dsrdocst.h
+ dcmsr/libsrc/dsrdocst.cc
+ dcmsr/libsrc/dsrdoctr.cc
+
+- Added methods to get external cursor to root node:
+ Added two methods that allow for getting an (external) cursor to the root
+ node of the document tree, either an instance of DSRDocumentTreeNodeCursor
+ or an instance of the recently introduced DSRIncludedTemplateNodeCursor.
+ These cursors can be used to iterate over the nodes of the document tree
+ without changing the internal cursor.
+ Acknowledgement: This work has been supported in part by the "QIICR" project.
+ Affects: dcmsr/include/dcmtk/dcmsr/dsrdocst.h
+ dcmsr/libsrc/dsrdocst.cc
+
+- Introduced new document tree node cursor:
+ Introduced new DSRIncludedTemplateNodeCursor class, which allows for
+ iterating "included template" tree nodes as if the subtree managed by
+ them was already expanded. This will make iteration over such document
+ trees much easier (but the implementation looks a bit more complex).
+ This new class is just a specialization of the existing, but now also
+ extended, C++ template class DSRTreeNodeCursor, which has received a
+ second template parameter for this purpose.
+ Acknowledgement: This work has been supported in part by the "QIICR" project.
+ Added: dcmsr/include/dcmtk/dcmsr/dsrdncsr.h
+ dcmsr/libsrc/dsrdncsr.cc
+ Affects: dcmsr/include/dcmtk/dcmsr/dsrctpl.h
+ dcmsr/include/dcmtk/dcmsr/dsrdocst.h
+ dcmsr/include/dcmtk/dcmsr/dsrdoctn.h
+ dcmsr/include/dcmtk/dcmsr/dsrstpl.h
+ dcmsr/include/dcmtk/dcmsr/dsrtncsr.h
+ dcmsr/libsrc/CMakeLists.txt
+ dcmsr/libsrc/Makefile.in
+ dcmsr/libsrc/dsrdoctn.cc
+
+- Enhanced output of print() for invalid references:
+ Enhanced output of DSRByReferenceTreeNode::print() for unknown/invalid
+ references. Now, a question mark "?" is printed if the position string
+ of the referenced content item is empty.
+ Affects: dcmsr/include/dcmtk/dcmsr/dsrreftn.h
+ dcmsr/libsrc/dsrreftn.cc
+
+- Added optional flags to position counter:
+ Added support for optional flags parameter to class DSRPositionCounter.
+ This parameter can be used to customize the processing of the counter.
+ Acknowledgement: This work has been supported in part by the "QIICR" project.
+ Affects: dcmsr/include/dcmtk/dcmsr/dsrposcn.h
+ dcmsr/libsrc/dsrposcn.cc
+
+- Added getCurrentNode() method to tree class:
+ Added getCurrentNode() method to document (sub)tree class. This new method
+ allows for accessing the current tree node by means of a (constant) pointer,
+ i.e. read-only. Also added a new test case for this particular method.
+ Acknowledgement: This work has been supported in part by the "QIICR" project.
+ Affects: dcmsr/include/dcmtk/dcmsr/dsrdocst.h
+ dcmsr/libsrc/dsrdocst.cc
+ dcmsr/tests/tests.cc
+ dcmsr/tests/tsrdoctr.cc
+
+- Enhanced check for invalid characters:
+ Now, the static function checkStringValue() - and all methods that use it -
+ check for invalid characters in the given value. Currently, this only works
+ for ASCII strings (default character repertoire) that contain non-ASCII
+ characters, i.e. character codes > 127.
+ This change requires that the Specific Character Set value is passed to the
+ respective function/method since the default is ASCII (as it was before).
+ Affects: dcmdata/include/dcmtk/dcmdata/dcbytstr.h
+ dcmdata/include/dcmtk/dcmdata/dcerror.h
+ dcmdata/libsrc/dcbytstr.cc
+ dcmdata/libsrc/dcchrstr.cc
+ dcmdata/libsrc/dcerror.cc
+ dcmdata/libsrc/dcvrpn.cc
+ dcmdata/tests/tchval.cc
+ dcmiod/libsrc/iodrules.cc
+ dcmiod/libsrc/iodutil.cc
+ dcmrt/include/dcmtk/dcmrt/drttypes.h
+ dcmrt/libsrc/drttypes.cc
+ dcmsr/include/dcmtk/dcmsr/dsrcsidl.h
+ dcmsr/libsrc/dsrdoc.cc
+ dcmsr/libsrc/dsrtypes.cc
+ dcmsr/tests/tsrdoc.cc
+
+- Set ASCII as default Specific Character Set:
+ Now, the default value for the Specific Character Set is ASCII (empty
+ Defined Term) and not "invalid".
+ Affects: dcmsr/include/dcmtk/dcmsr/dsrtypes.h
+ dcmsr/libsrc/dsrdoc.cc
+ dcmsr/libsrc/dsrtypes.cc
+ dcmsr/tests/tsrdoc.cc
+
+- Passed character set value to checkStringValue():
+ Made sure that the current value of the Specific Character Set (0008,0005)
+ is passed to the calls of checkStringValue() where applicable. There are
+ still a few remaining calls where the placeholder "UNKNOWN" is used, which
+ disables the underlying VR checker.
+ Closes DCMTK Bug #565 (partially).
+ Affects: dcmsr/include/dcmtk/dcmsr/dsrcsidl.h
+ dcmsr/include/dcmtk/dcmsr/dsrdoc.h
+ dcmsr/include/dcmtk/dcmsr/dsrsoprf.h
+ dcmsr/libsrc/dsrcsidl.cc
+ dcmsr/libsrc/dsrdoc.cc
+ dcmsr/libsrc/dsrsoprf.cc
+ dcmsr/tests/tests.cc
+ dcmsr/tests/tsrdoc.cc
+
+- Fixed issue in one of the SR constraint checkers:
+ Fixed issue in class DSRRadiopharmaceuticalRadiationDoseConstraintChecker:
+ for Row 5 of the Table, the "targetValueType" was checked for "VT_PName"
+ instead of the "sourceValueType".
+ Thanks to forum user "Luuk" for the report and suggested fix.
+ Affects: dcmsr/libsrc/dsrrrdcc.cc
+
**** Changes from 2016.02.16 (schlamelcher)
- Updated CHANGES.361 for new development snapshot.
diff --git a/doxygen/htmldocs.cfg b/doxygen/htmldocs.cfg
index 7a25292..5e869a6 100644
--- a/doxygen/htmldocs.cfg
+++ b/doxygen/htmldocs.cfg
@@ -38,7 +38,7 @@ PROJECT_NAME = DCMTK
# could be handy for archiving the generated documentation or if some version
# control system is used.
-PROJECT_NUMBER = "Version @DCMTK_VERSION@ 20160216"
+PROJECT_NUMBER = "Version @DCMTK_VERSION@ 20160630"
# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a
diff --git a/doxygen/htmldocs.dox b/doxygen/htmldocs.dox
index bc0973d..770d447 100644
--- a/doxygen/htmldocs.dox
+++ b/doxygen/htmldocs.dox
@@ -24,6 +24,7 @@ DCMTK contains the following sub-packages, each in its own sub-directory:
\li \ref mod_dcmsign
\li \ref mod_dcmsr
\li \ref mod_dcmtls
+\li \ref mod_dcmtract
\li \ref mod_dcmwlm
\li \ref mod_oflog
\li \ref mod_ofstd
diff --git a/doxygen/manpages.cfg b/doxygen/manpages.cfg
index 5c27adf..668ff43 100644
--- a/doxygen/manpages.cfg
+++ b/doxygen/manpages.cfg
@@ -38,7 +38,7 @@ PROJECT_NAME = "OFFIS DCMTK"
# could be handy for archiving the generated documentation or if some version
# control system is used.
-PROJECT_NUMBER = "@DCMTK_VERSION@ 20160216"
+PROJECT_NUMBER = "@DCMTK_VERSION@ 20160630"
# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a
diff --git a/doxygen/manpages/man1/dcm2pdf.1 b/doxygen/manpages/man1/dcm2pdf.1
index d279fe5..d3c602c 100644
--- a/doxygen/manpages/man1/dcm2pdf.1
+++ b/doxygen/manpages/man1/dcm2pdf.1
@@ -1,4 +1,4 @@
-.TH "dcm2pdf" 1 "Tue Feb 16 2016" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
+.TH "dcm2pdf" 1 "Thu Jun 30 2016" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
.nh
.SH NAME
dcm2pdf \- Extract PDF file from DICOM encapsulated PDF
diff --git a/doxygen/manpages/man1/dcm2pnm.1 b/doxygen/manpages/man1/dcm2pnm.1
index 7487f8c..2616a6c 100644
--- a/doxygen/manpages/man1/dcm2pnm.1
+++ b/doxygen/manpages/man1/dcm2pnm.1
@@ -1,4 +1,4 @@
-.TH "dcm2pnm" 1 "Tue Feb 16 2016" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
+.TH "dcm2pnm" 1 "Thu Jun 30 2016" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
.nh
.SH NAME
dcm2pnm \- Convert DICOM images to PGM/PPM, PNG, TIFF or BMP
diff --git a/doxygen/manpages/man1/dcm2xml.1 b/doxygen/manpages/man1/dcm2xml.1
index e1e151e..67efbe6 100644
--- a/doxygen/manpages/man1/dcm2xml.1
+++ b/doxygen/manpages/man1/dcm2xml.1
@@ -1,4 +1,4 @@
-.TH "dcm2xml" 1 "Tue Feb 16 2016" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
+.TH "dcm2xml" 1 "Thu Jun 30 2016" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
.nh
.SH NAME
dcm2xml \- Convert DICOM file and data set to XML
diff --git a/doxygen/manpages/man1/dcmcjpeg.1 b/doxygen/manpages/man1/dcmcjpeg.1
index 809a163..58345cf 100644
--- a/doxygen/manpages/man1/dcmcjpeg.1
+++ b/doxygen/manpages/man1/dcmcjpeg.1
@@ -1,4 +1,4 @@
-.TH "dcmcjpeg" 1 "Tue Feb 16 2016" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
+.TH "dcmcjpeg" 1 "Thu Jun 30 2016" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
.nh
.SH NAME
dcmcjpeg \- Encode DICOM file to JPEG transfer syntax
@@ -376,14 +376,14 @@ VOI windowing for monochrome images (not with +tl):
compute VOI window using min-max algorithm
# Compute and apply a window center and width that covers the
- # range from the smallest to the largest occuring pixel value.
+ # range from the smallest to the largest occurring pixel value.
+Wn --min-max-window-n
compute VOI window using min-max algorithm,
ignoring extreme values
# Compute and apply a window center and width that covers the
- # range from the second smallest to the second largest occuring
+ # range from the second smallest to the second largest occurring
# pixel value. This is useful if the background is set to an
# artificial black (padding value) or if white overlays are burned
# into the image data which should not be considered for the window
@@ -417,7 +417,7 @@ pixel scaling for monochrome images (--no-windowing; ignored by +tl):
# Monochrome image pixel values are always scaled to make use of the
# pixel range available with the selected JPEG process as good as
# possible. This option selects a scaling based on the minimum and
- # maximum pixel value occuring in the image. This often leads to
+ # maximum pixel value occurring in the image. This often leads to
# significantly better image quality, but may cause different
# compressed images within one series to have different values for
# rescale slope and intercept, which is a problem if a presentation
@@ -543,7 +543,7 @@ Hardcopy Color images must have RGB color model which is a problem if lossy comp
.PP
The user is responsible for making sure that the compressed images he creates are compliant with the DICOM standard\&. If in question, the \fBdcmcjpeg\fP utility allows one to convert an image to secondary capture - this SOP class does not pose restrictions as the ones mentioned above\&.
.PP
-With version DCMTK 3\&.5\&.4 a new encoder for truely lossless JPEG compression was added (\fI--true-lossless\fP)\&. Compared to the old (\fI--pseudo-lossless\fP) encoder, that creates slightly lossy images caused from internal color space conversions, windowing etc\&., there are a some issues to consider:
+With version DCMTK 3\&.5\&.4 a new encoder for truly lossless JPEG compression was added (\fI--true-lossless\fP)\&. Compared to the old (\fI--pseudo-lossless\fP) encoder, that creates slightly lossy images caused from internal color space conversions, windowing etc\&., there are a some issues to consider:
.PP
.PD 0
.IP "\(bu" 2
@@ -615,4 +615,4 @@ The default behavior should be preferred and the \fIDCMDICTPATH\fP environment v
\fBdcmdjpeg\fP(1)
.SH "COPYRIGHT"
.PP
-Copyright (C) 2001-2014 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&.
+Copyright (C) 2001-2016 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&.
diff --git a/doxygen/manpages/man1/dcmcjpls.1 b/doxygen/manpages/man1/dcmcjpls.1
index 0b20102..ca50467 100644
--- a/doxygen/manpages/man1/dcmcjpls.1
+++ b/doxygen/manpages/man1/dcmcjpls.1
@@ -1,4 +1,4 @@
-.TH "dcmcjpls" 1 "Tue Feb 16 2016" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
+.TH "dcmcjpls" 1 "Thu Jun 30 2016" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
.nh
.SH NAME
dcmcjpls \- Encode DICOM file to JPEG-LS transfer syntax
@@ -158,7 +158,7 @@ JPEG-LS interleave:
# This flag forces sample-interleaved mode for the resulting image.
# In sample-interleave mode each pixel's components are encoded before
- # the next pixe is encoded.
+ # the next pixel is encoded.
+in --interleave-none
force uninterleaved JPEG-LS images
@@ -330,4 +330,4 @@ The default behavior should be preferred and the \fIDCMDICTPATH\fP environment v
\fBdcmdjpls\fP(1)
.SH "COPYRIGHT"
.PP
-Copyright (C) 2009-2014 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&.
+Copyright (C) 2009-2016 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&.
diff --git a/doxygen/manpages/man1/dcmconv.1 b/doxygen/manpages/man1/dcmconv.1
index 040fb5e..5f9fa60 100644
--- a/doxygen/manpages/man1/dcmconv.1
+++ b/doxygen/manpages/man1/dcmconv.1
@@ -1,4 +1,4 @@
-.TH "dcmconv" 1 "Tue Feb 16 2016" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
+.TH "dcmconv" 1 "Thu Jun 30 2016" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
.nh
.SH NAME
dcmconv \- Convert DICOM file encoding
diff --git a/doxygen/manpages/man1/dcmcrle.1 b/doxygen/manpages/man1/dcmcrle.1
index 0ee0273..3cf798e 100644
--- a/doxygen/manpages/man1/dcmcrle.1
+++ b/doxygen/manpages/man1/dcmcrle.1
@@ -1,4 +1,4 @@
-.TH "dcmcrle" 1 "Tue Feb 16 2016" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
+.TH "dcmcrle" 1 "Thu Jun 30 2016" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
.nh
.SH NAME
dcmcrle \- Encode DICOM file to RLE transfer syntax
diff --git a/doxygen/manpages/man1/dcmdjpeg.1 b/doxygen/manpages/man1/dcmdjpeg.1
index efa5999..38264e8 100644
--- a/doxygen/manpages/man1/dcmdjpeg.1
+++ b/doxygen/manpages/man1/dcmdjpeg.1
@@ -1,4 +1,4 @@
-.TH "dcmdjpeg" 1 "Tue Feb 16 2016" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
+.TH "dcmdjpeg" 1 "Thu Jun 30 2016" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
.nh
.SH NAME
dcmdjpeg \- Decode JPEG-compressed DICOM file
diff --git a/doxygen/manpages/man1/dcmdjpls.1 b/doxygen/manpages/man1/dcmdjpls.1
index 15e302c..4e61ba5 100644
--- a/doxygen/manpages/man1/dcmdjpls.1
+++ b/doxygen/manpages/man1/dcmdjpls.1
@@ -1,4 +1,4 @@
-.TH "dcmdjpls" 1 "Tue Feb 16 2016" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
+.TH "dcmdjpls" 1 "Thu Jun 30 2016" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
.nh
.SH NAME
dcmdjpls \- Decode JPEG-LS compressed DICOM file
diff --git a/doxygen/manpages/man1/dcmdrle.1 b/doxygen/manpages/man1/dcmdrle.1
index 8961cd8..8af08b0 100644
--- a/doxygen/manpages/man1/dcmdrle.1
+++ b/doxygen/manpages/man1/dcmdrle.1
@@ -1,4 +1,4 @@
-.TH "dcmdrle" 1 "Tue Feb 16 2016" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
+.TH "dcmdrle" 1 "Thu Jun 30 2016" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
.nh
.SH NAME
dcmdrle \- Decode RLE-compressed DICOM file
diff --git a/doxygen/manpages/man1/dcmdspfn.1 b/doxygen/manpages/man1/dcmdspfn.1
index 089e862..ba9a84d 100644
--- a/doxygen/manpages/man1/dcmdspfn.1
+++ b/doxygen/manpages/man1/dcmdspfn.1
@@ -1,4 +1,4 @@
-.TH "dcmdspfn" 1 "Tue Feb 16 2016" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
+.TH "dcmdspfn" 1 "Thu Jun 30 2016" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
.nh
.SH NAME
dcmdspfn \- Export standard display curves to a text file
diff --git a/doxygen/manpages/man1/dcmdump.1 b/doxygen/manpages/man1/dcmdump.1
index 993d9b0..fe755b2 100644
--- a/doxygen/manpages/man1/dcmdump.1
+++ b/doxygen/manpages/man1/dcmdump.1
@@ -1,4 +1,4 @@
-.TH "dcmdump" 1 "Tue Feb 16 2016" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
+.TH "dcmdump" 1 "Thu Jun 30 2016" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
.nh
.SH NAME
dcmdump \- Dump DICOM file and data set
diff --git a/doxygen/manpages/man1/dcmftest.1 b/doxygen/manpages/man1/dcmftest.1
index 80fcf98..a0b2280 100644
--- a/doxygen/manpages/man1/dcmftest.1
+++ b/doxygen/manpages/man1/dcmftest.1
@@ -1,4 +1,4 @@
-.TH "dcmftest" 1 "Tue Feb 16 2016" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
+.TH "dcmftest" 1 "Thu Jun 30 2016" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
.nh
.SH NAME
dcmftest \- Test if file uses DICOM part 10 format
diff --git a/doxygen/manpages/man1/dcmgpdir.1 b/doxygen/manpages/man1/dcmgpdir.1
index 99af680..27b8897 100644
--- a/doxygen/manpages/man1/dcmgpdir.1
+++ b/doxygen/manpages/man1/dcmgpdir.1
@@ -1,4 +1,4 @@
-.TH "dcmgpdir" 1 "Tue Feb 16 2016" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
+.TH "dcmgpdir" 1 "Thu Jun 30 2016" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
.nh
.SH NAME
dcmgpdir \- Create a general purpose DICOMDIR
@@ -22,7 +22,7 @@ General Purpose CD-R Interchange (STD-GEN-CD)
.IP "\(bu" 2
General Purpose Interchange on DVD-RAM Media (STD-GEN-DVD-RAM)
.PP
-\fBdcmmkdir\fP is an extended version of this tool which also supports other Media Storage Application Profiles than the general purpose one (e\&.g\&. both cardio profiles requiring the use of icon images)\&.
+\fBdcmmkdir\fP is an extended version of this tool which also supports other Media Storage Application Profiles than the general purpose one (e\&.g\&. the cardio profiles require the use of icon images)\&.
.SH "PARAMETERS"
.PP
.PP
@@ -228,4 +228,4 @@ The default behavior should be preferred and the \fIDCMDICTPATH\fP environment v
\fBdcmmkdir\fP(1)
.SH "COPYRIGHT"
.PP
-Copyright (C) 1996-2014 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&.
+Copyright (C) 1996-2016 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&.
diff --git a/doxygen/manpages/man1/dcmj2pnm.1 b/doxygen/manpages/man1/dcmj2pnm.1
index 0e7d63d..7d628f7 100644
--- a/doxygen/manpages/man1/dcmj2pnm.1
+++ b/doxygen/manpages/man1/dcmj2pnm.1
@@ -1,4 +1,4 @@
-.TH "dcmj2pnm" 1 "Tue Feb 16 2016" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
+.TH "dcmj2pnm" 1 "Thu Jun 30 2016" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
.nh
.SH NAME
dcmj2pnm \- Convert DICOM images to PGM/PPM, PNG, TIFF, JPEG or BMP
diff --git a/doxygen/manpages/man1/dcml2pnm.1 b/doxygen/manpages/man1/dcml2pnm.1
index 5d4b858..45e8eac 100644
--- a/doxygen/manpages/man1/dcml2pnm.1
+++ b/doxygen/manpages/man1/dcml2pnm.1
@@ -1,4 +1,4 @@
-.TH "dcml2pnm" 1 "Tue Feb 16 2016" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
+.TH "dcml2pnm" 1 "Thu Jun 30 2016" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
.nh
.SH NAME
dcml2pnm \- Convert DICOM images to PGM/PPM, PNG, TIFF or BMP
diff --git a/doxygen/manpages/man1/dcmmkcrv.1 b/doxygen/manpages/man1/dcmmkcrv.1
index ea31cd5..2ff7a1d 100644
--- a/doxygen/manpages/man1/dcmmkcrv.1
+++ b/doxygen/manpages/man1/dcmmkcrv.1
@@ -1,4 +1,4 @@
-.TH "dcmmkcrv" 1 "Tue Feb 16 2016" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
+.TH "dcmmkcrv" 1 "Thu Jun 30 2016" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
.nh
.SH NAME
dcmmkcrv \- Add 2D curve data to image
diff --git a/doxygen/manpages/man1/dcmmkdir.1 b/doxygen/manpages/man1/dcmmkdir.1
index 48ce603..2d152a6 100644
--- a/doxygen/manpages/man1/dcmmkdir.1
+++ b/doxygen/manpages/man1/dcmmkdir.1
@@ -1,4 +1,4 @@
-.TH "dcmmkdir" 1 "Tue Feb 16 2016" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
+.TH "dcmmkdir" 1 "Thu Jun 30 2016" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
.nh
.SH NAME
dcmmkdir \- Create a DICOMDIR file
diff --git a/doxygen/manpages/man1/dcmmklut.1 b/doxygen/manpages/man1/dcmmklut.1
index 6c924c9..5b53dab 100644
--- a/doxygen/manpages/man1/dcmmklut.1
+++ b/doxygen/manpages/man1/dcmmklut.1
@@ -1,4 +1,4 @@
-.TH "dcmmklut" 1 "Tue Feb 16 2016" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
+.TH "dcmmklut" 1 "Thu Jun 30 2016" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
.nh
.SH NAME
dcmmklut \- Create DICOM look-up tables
diff --git a/doxygen/manpages/man1/dcmodify.1 b/doxygen/manpages/man1/dcmodify.1
index 83ddb87..414f5fe 100644
--- a/doxygen/manpages/man1/dcmodify.1
+++ b/doxygen/manpages/man1/dcmodify.1
@@ -1,4 +1,4 @@
-.TH "dcmodify" 1 "Tue Feb 16 2016" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
+.TH "dcmodify" 1 "Thu Jun 30 2016" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
.nh
.SH NAME
dcmodify \- Modify DICOM files
diff --git a/doxygen/manpages/man1/dcmp2pgm.1 b/doxygen/manpages/man1/dcmp2pgm.1
index 9bb105b..da0e53b 100644
--- a/doxygen/manpages/man1/dcmp2pgm.1
+++ b/doxygen/manpages/man1/dcmp2pgm.1
@@ -1,4 +1,4 @@
-.TH "dcmp2pgm" 1 "Tue Feb 16 2016" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
+.TH "dcmp2pgm" 1 "Thu Jun 30 2016" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
.nh
.SH NAME
dcmp2pgm \- Read DICOM image and presentation state and render bitmap
diff --git a/doxygen/manpages/man1/dcmprscp.1 b/doxygen/manpages/man1/dcmprscp.1
index 0fa6433..cff018b 100644
--- a/doxygen/manpages/man1/dcmprscp.1
+++ b/doxygen/manpages/man1/dcmprscp.1
@@ -1,4 +1,4 @@
-.TH "dcmprscp" 1 "Tue Feb 16 2016" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
+.TH "dcmprscp" 1 "Thu Jun 30 2016" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
.nh
.SH NAME
dcmprscp \- DICOM basic grayscale print management SCP
diff --git a/doxygen/manpages/man1/dcmprscu.1 b/doxygen/manpages/man1/dcmprscu.1
index 2606621..298279e 100644
--- a/doxygen/manpages/man1/dcmprscu.1
+++ b/doxygen/manpages/man1/dcmprscu.1
@@ -1,4 +1,4 @@
-.TH "dcmprscu" 1 "Tue Feb 16 2016" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
+.TH "dcmprscu" 1 "Thu Jun 30 2016" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
.nh
.SH NAME
dcmprscu \- Print spooler for presentation state viewer
diff --git a/doxygen/manpages/man1/dcmpschk.1 b/doxygen/manpages/man1/dcmpschk.1
index 0c4ac68..dd3102f 100644
--- a/doxygen/manpages/man1/dcmpschk.1
+++ b/doxygen/manpages/man1/dcmpschk.1
@@ -1,4 +1,4 @@
-.TH "dcmpschk" 1 "Tue Feb 16 2016" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
+.TH "dcmpschk" 1 "Thu Jun 30 2016" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
.nh
.SH NAME
dcmpschk \- Checking tool for presentation states
diff --git a/doxygen/manpages/man1/dcmpsmk.1 b/doxygen/manpages/man1/dcmpsmk.1
index 09a9e95..c738149 100644
--- a/doxygen/manpages/man1/dcmpsmk.1
+++ b/doxygen/manpages/man1/dcmpsmk.1
@@ -1,4 +1,4 @@
-.TH "dcmpsmk" 1 "Tue Feb 16 2016" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
+.TH "dcmpsmk" 1 "Thu Jun 30 2016" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
.nh
.SH NAME
dcmpsmk \- Create DICOM grayscale softcopy presentation state
diff --git a/doxygen/manpages/man1/dcmpsprt.1 b/doxygen/manpages/man1/dcmpsprt.1
index 58e896a..cecf66c 100644
--- a/doxygen/manpages/man1/dcmpsprt.1
+++ b/doxygen/manpages/man1/dcmpsprt.1
@@ -1,4 +1,4 @@
-.TH "dcmpsprt" 1 "Tue Feb 16 2016" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
+.TH "dcmpsprt" 1 "Thu Jun 30 2016" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
.nh
.SH NAME
dcmpsprt \- Read DICOM images and presentation states and render print job
diff --git a/doxygen/manpages/man1/dcmpsrcv.1 b/doxygen/manpages/man1/dcmpsrcv.1
index 91bf59a..fc329a4 100644
--- a/doxygen/manpages/man1/dcmpsrcv.1
+++ b/doxygen/manpages/man1/dcmpsrcv.1
@@ -1,4 +1,4 @@
-.TH "dcmpsrcv" 1 "Tue Feb 16 2016" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
+.TH "dcmpsrcv" 1 "Thu Jun 30 2016" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
.nh
.SH NAME
dcmpsrcv \- Network receive for presentation state viewer
diff --git a/doxygen/manpages/man1/dcmpssnd.1 b/doxygen/manpages/man1/dcmpssnd.1
index 4fed6c0..cfd970b 100644
--- a/doxygen/manpages/man1/dcmpssnd.1
+++ b/doxygen/manpages/man1/dcmpssnd.1
@@ -1,4 +1,4 @@
-.TH "dcmpssnd" 1 "Tue Feb 16 2016" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
+.TH "dcmpssnd" 1 "Thu Jun 30 2016" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
.nh
.SH NAME
dcmpssnd \- Network send for presentation state viewer
diff --git a/doxygen/manpages/man1/dcmqridx.1 b/doxygen/manpages/man1/dcmqridx.1
index d12d087..e02f750 100644
--- a/doxygen/manpages/man1/dcmqridx.1
+++ b/doxygen/manpages/man1/dcmqridx.1
@@ -1,4 +1,4 @@
-.TH "dcmqridx" 1 "Tue Feb 16 2016" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
+.TH "dcmqridx" 1 "Thu Jun 30 2016" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
.nh
.SH NAME
dcmqridx \- Register a DICOM image file in an image database index file
diff --git a/doxygen/manpages/man1/dcmqrscp.1 b/doxygen/manpages/man1/dcmqrscp.1
index 4f5e82c..be00041 100644
--- a/doxygen/manpages/man1/dcmqrscp.1
+++ b/doxygen/manpages/man1/dcmqrscp.1
@@ -1,4 +1,4 @@
-.TH "dcmqrscp" 1 "Tue Feb 16 2016" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
+.TH "dcmqrscp" 1 "Thu Jun 30 2016" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
.nh
.SH NAME
dcmqrscp \- DICOM image archive (central test node)
@@ -732,6 +732,7 @@ RadiopharmaceuticalRadiationDoseSRStorage 1.2.840.10008.5.1.4.1.1.88.
ColonCADSRStorage 1.2.840.10008.5.1.4.1.1.88.69
ImplantationPlanSRDocumentStorage 1.2.840.10008.5.1.4.1.1.88.70
AcquisitionContextSRStorage 1.2.840.10008.5.1.4.1.1.88.71
+ContentAssessmentResultsStorage 1.2.840.10008.5.1.4.1.1.90.1
EncapsulatedPDFStorage 1.2.840.10008.5.1.4.1.1.104.1
EncapsulatedCDAStorage 1.2.840.10008.5.1.4.1.1.104.2
PositronEmissionTomographyImageStorage 1.2.840.10008.5.1.4.1.1.128
@@ -752,6 +753,9 @@ DICOS_CTImageStorage 1.2.840.10008.5.1.4.1.1.501
DICOS_DigitalXRayImageStorageForPresentation 1.2.840.10008.5.1.4.1.1.501.2.1
DICOS_DigitalXRayImageStorageForProcessing 1.2.840.10008.5.1.4.1.1.501.2.2
DICOS_ThreatDetectionReportStorage 1.2.840.10008.5.1.4.1.1.501.3
+DICOS_2DAITStorage 1.2.840.10008.5.1.4.1.1.501.4
+DICOS_3DAITStorage 1.2.840.10008.5.1.4.1.1.501.5
+DICOS_QuadrupoleResonanceStorage 1.2.840.10008.5.1.4.1.1.501.6
DICONDE_EddyCurrentImageStorage 1.2.840.10008.5.1.4.1.1.601.1
DICONDE_EddyCurrentMultiframeImageStorage 1.2.840.10008.5.1.4.1.1.601.2
DRAFT_RTBeamsDeliveryInstructionStorage 1.2.840.10008.5.1.4.34.1
diff --git a/doxygen/manpages/man1/dcmqrti.1 b/doxygen/manpages/man1/dcmqrti.1
index 4bd72db..0b48e69 100644
--- a/doxygen/manpages/man1/dcmqrti.1
+++ b/doxygen/manpages/man1/dcmqrti.1
@@ -1,4 +1,4 @@
-.TH "dcmqrti" 1 "Tue Feb 16 2016" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
+.TH "dcmqrti" 1 "Thu Jun 30 2016" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
.nh
.SH NAME
dcmqrti \- The Terminal Initiator Telnet Client Program
diff --git a/doxygen/manpages/man1/dcmquant.1 b/doxygen/manpages/man1/dcmquant.1
index 6d51f32..4dcfd99 100644
--- a/doxygen/manpages/man1/dcmquant.1
+++ b/doxygen/manpages/man1/dcmquant.1
@@ -1,4 +1,4 @@
-.TH "dcmquant" 1 "Tue Feb 16 2016" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
+.TH "dcmquant" 1 "Thu Jun 30 2016" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
.nh
.SH NAME
dcmquant \- Convert DICOM color images to palette color
diff --git a/doxygen/manpages/man1/dcmrecv.1 b/doxygen/manpages/man1/dcmrecv.1
index 988cd3d..bc2d224 100644
--- a/doxygen/manpages/man1/dcmrecv.1
+++ b/doxygen/manpages/man1/dcmrecv.1
@@ -1,4 +1,4 @@
-.TH "dcmrecv" 1 "Tue Feb 16 2016" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
+.TH "dcmrecv" 1 "Thu Jun 30 2016" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
.nh
.SH NAME
dcmrecv \- Simple DICOM storage SCP (receiver)
diff --git a/doxygen/manpages/man1/dcmscale.1 b/doxygen/manpages/man1/dcmscale.1
index f98bf47..77b73e1 100644
--- a/doxygen/manpages/man1/dcmscale.1
+++ b/doxygen/manpages/man1/dcmscale.1
@@ -1,4 +1,4 @@
-.TH "dcmscale" 1 "Tue Feb 16 2016" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
+.TH "dcmscale" 1 "Thu Jun 30 2016" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
.nh
.SH NAME
dcmscale \- Scale DICOM images
diff --git a/doxygen/manpages/man1/dcmsend.1 b/doxygen/manpages/man1/dcmsend.1
index ddedf38..2d04ec1 100644
--- a/doxygen/manpages/man1/dcmsend.1
+++ b/doxygen/manpages/man1/dcmsend.1
@@ -1,4 +1,4 @@
-.TH "dcmsend" 1 "Tue Feb 16 2016" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
+.TH "dcmsend" 1 "Thu Jun 30 2016" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
.nh
.SH NAME
dcmsend \- Simple DICOM storage SCU (sender)
diff --git a/doxygen/manpages/man1/dcmsign.1 b/doxygen/manpages/man1/dcmsign.1
index d69b5da..53e718b 100644
--- a/doxygen/manpages/man1/dcmsign.1
+++ b/doxygen/manpages/man1/dcmsign.1
@@ -1,4 +1,4 @@
-.TH "dcmsign" 1 "Tue Feb 16 2016" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
+.TH "dcmsign" 1 "Thu Jun 30 2016" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
.nh
.SH NAME
dcmsign \- Sign and Verify DICOM Files
diff --git a/doxygen/manpages/man1/dcod2lum.1 b/doxygen/manpages/man1/dcod2lum.1
index 0deba9a..aec7f54 100644
--- a/doxygen/manpages/man1/dcod2lum.1
+++ b/doxygen/manpages/man1/dcod2lum.1
@@ -1,4 +1,4 @@
-.TH "dcod2lum" 1 "Tue Feb 16 2016" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
+.TH "dcod2lum" 1 "Thu Jun 30 2016" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
.nh
.SH NAME
dcod2lum \- Convert hardcopy characteristic curve file to softcopy format
diff --git a/doxygen/manpages/man1/dconvlum.1 b/doxygen/manpages/man1/dconvlum.1
index 14c2bb9..93d71b8 100644
--- a/doxygen/manpages/man1/dconvlum.1
+++ b/doxygen/manpages/man1/dconvlum.1
@@ -1,4 +1,4 @@
-.TH "dconvlum" 1 "Tue Feb 16 2016" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
+.TH "dconvlum" 1 "Thu Jun 30 2016" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
.nh
.SH NAME
dconvlum \- Convert VeriLUM files to DCMTK display files
diff --git a/doxygen/manpages/man1/drtdump.1 b/doxygen/manpages/man1/drtdump.1
index 651fec4..69bc3bd 100644
--- a/doxygen/manpages/man1/drtdump.1
+++ b/doxygen/manpages/man1/drtdump.1
@@ -1,4 +1,4 @@
-.TH "drtdump" 1 "Tue Feb 16 2016" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
+.TH "drtdump" 1 "Thu Jun 30 2016" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
.nh
.SH NAME
drtdump \- Dump DICOM RT file and data set
diff --git a/doxygen/manpages/man1/dsr2html.1 b/doxygen/manpages/man1/dsr2html.1
index 983d00b..6471461 100644
--- a/doxygen/manpages/man1/dsr2html.1
+++ b/doxygen/manpages/man1/dsr2html.1
@@ -1,4 +1,4 @@
-.TH "dsr2html" 1 "Tue Feb 16 2016" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
+.TH "dsr2html" 1 "Thu Jun 30 2016" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
.nh
.SH NAME
dsr2html \- Render DICOM SR file and data set to HTML/XHTML
diff --git a/doxygen/manpages/man1/dsr2xml.1 b/doxygen/manpages/man1/dsr2xml.1
index 33f52d3..49b116c 100644
--- a/doxygen/manpages/man1/dsr2xml.1
+++ b/doxygen/manpages/man1/dsr2xml.1
@@ -1,4 +1,4 @@
-.TH "dsr2xml" 1 "Tue Feb 16 2016" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
+.TH "dsr2xml" 1 "Thu Jun 30 2016" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
.nh
.SH NAME
dsr2xml \- Convert DICOM SR file and data set to XML
diff --git a/doxygen/manpages/man1/dsrdump.1 b/doxygen/manpages/man1/dsrdump.1
index 93cae05..7227495 100644
--- a/doxygen/manpages/man1/dsrdump.1
+++ b/doxygen/manpages/man1/dsrdump.1
@@ -1,4 +1,4 @@
-.TH "dsrdump" 1 "Tue Feb 16 2016" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
+.TH "dsrdump" 1 "Thu Jun 30 2016" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
.nh
.SH NAME
dsrdump \- Dump DICOM SR file and data set
diff --git a/doxygen/manpages/man1/dump2dcm.1 b/doxygen/manpages/man1/dump2dcm.1
index 0e5ad42..8ef03f6 100644
--- a/doxygen/manpages/man1/dump2dcm.1
+++ b/doxygen/manpages/man1/dump2dcm.1
@@ -1,4 +1,4 @@
-.TH "dump2dcm" 1 "Tue Feb 16 2016" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
+.TH "dump2dcm" 1 "Thu Jun 30 2016" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
.nh
.SH NAME
dump2dcm \- Convert ASCII dump to DICOM file
diff --git a/doxygen/manpages/man1/echoscu.1 b/doxygen/manpages/man1/echoscu.1
index a9e22ae..a3c9fa9 100644
--- a/doxygen/manpages/man1/echoscu.1
+++ b/doxygen/manpages/man1/echoscu.1
@@ -1,4 +1,4 @@
-.TH "echoscu" 1 "Tue Feb 16 2016" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
+.TH "echoscu" 1 "Thu Jun 30 2016" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
.nh
.SH NAME
echoscu \- DICOM verification (C-ECHO) SCU
diff --git a/doxygen/manpages/man1/findscu.1 b/doxygen/manpages/man1/findscu.1
index de9366e..caf1e42 100644
--- a/doxygen/manpages/man1/findscu.1
+++ b/doxygen/manpages/man1/findscu.1
@@ -1,4 +1,4 @@
-.TH "findscu" 1 "Tue Feb 16 2016" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
+.TH "findscu" 1 "Thu Jun 30 2016" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
.nh
.SH NAME
findscu \- DICOM query (C-FIND) SCU
diff --git a/doxygen/manpages/man1/getscu.1 b/doxygen/manpages/man1/getscu.1
index 5fe58e4..d78c93c 100644
--- a/doxygen/manpages/man1/getscu.1
+++ b/doxygen/manpages/man1/getscu.1
@@ -1,4 +1,4 @@
-.TH "getscu" 1 "Tue Feb 16 2016" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
+.TH "getscu" 1 "Thu Jun 30 2016" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
.nh
.SH NAME
getscu \- DICOM retrieve (C-GET) SCU
diff --git a/doxygen/manpages/man1/img2dcm.1 b/doxygen/manpages/man1/img2dcm.1
index 3381c25..a95358c 100644
--- a/doxygen/manpages/man1/img2dcm.1
+++ b/doxygen/manpages/man1/img2dcm.1
@@ -1,4 +1,4 @@
-.TH "img2dcm" 1 "Tue Feb 16 2016" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
+.TH "img2dcm" 1 "Thu Jun 30 2016" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
.nh
.SH NAME
img2dcm \- Convert standard image formats into DICOM format
@@ -264,7 +264,7 @@ JFIF (JPEG File Interchange Format) information facilitates optional APPn marker
.PP
For DICOM it is kind of a 'gray zone', whether the integration of JFIF (or any other APPn) data into the DICOM object's internal JPEG stream is allowed or not\&. However, the most reliable approach is to cut those markers and their information off the JPEG stream\&. This approach is also taken by the \fBimg2dcm\fP application\&. By default, all APPn markers are cut off from the original JPEG stream\&. However, if you want to keep other APPn markers than JFIF (e\&. g\&. EXIF information) [...]
.SS "BMP Input Plugin"
-\fBimg2dcm\fP supports BMP as input format\&. However, so far only the most commmon BMP images are supported\&. In particular, BMP images which use bitfields or run length encoding will be rejected\&. Such images are uncommon\&. All input images will be converted into a DICOM image with RGB color model and a bit depth of 24\&. There are no specific options for fine-tuning BMP format conversion\&.
+\fBimg2dcm\fP supports BMP as input format\&. However, so far only the most common BMP images are supported\&. In particular, BMP images which use bit fields or run length encoding will be rejected\&. Such images are uncommon\&. All input images will be converted into a DICOM image with RGB color model and a bit depth of 24\&. There are no specific options for fine-tuning BMP format conversion\&.
.SS "Output Plugins"
The desired output SOP Class can be selected on the command line\&. Currently, an export plugin for the Secondary Capture Image SOP class (default, option \fI-sc\fP), the new Secondary Capture Image SOP classes (option \fI-nsc\fP) and Visible Light Photographic Image SOP class (option \fI-vl\fP) are available\&. Please note that the first one is deprecated according to the DICOM standard but is selected as a default because it is widely supported\&. Future versions of \fBimg2dcm\fP might [...]
.PP
@@ -295,7 +295,7 @@ Same as first example, but writes Visible Light Photographic Image object to 'ou
.IP "4." 4
img2dcm image\&.jpg out\&.dcm --series-from template\&.dcm -k 'PatientName=Bond^James'
.br
-Same as 1), but imports patient/study/series infomation from DICOM file 'template\&.dcm'\&. Please note that attribute PatientName will contain 'Bond^James' at the end, any value from 'template\&.dcm' will be overwritten\&. That is, because the -k option is applied at the very end of the conversion pipeline (see above)\&.
+Same as 1), but imports patient/study/series information from DICOM file 'template\&.dcm'\&. Please note that attribute PatientName will contain 'Bond^James' at the end, any value from 'template\&.dcm' will be overwritten\&. That is, because the -k option is applied at the very end of the conversion pipeline (see above)\&.
.PP
.IP "5." 4
@@ -344,4 +344,4 @@ The default behavior should be preferred and the \fIDCMDICTPATH\fP environment v
\fBdcm2pnm\fP(1), \fBdcmj2pnm\fP(1), \fBdump2dcm\fP(1), \fBdcmconv\fP(1), \fBdcmodify\fP(1)
.SH "COPYRIGHT"
.PP
-Copyright (C) 2007-2014 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&.
+Copyright (C) 2007-2016 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&.
diff --git a/doxygen/manpages/man1/movescu.1 b/doxygen/manpages/man1/movescu.1
index d70d7b3..423b320 100644
--- a/doxygen/manpages/man1/movescu.1
+++ b/doxygen/manpages/man1/movescu.1
@@ -1,4 +1,4 @@
-.TH "movescu" 1 "Tue Feb 16 2016" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
+.TH "movescu" 1 "Thu Jun 30 2016" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
.nh
.SH NAME
movescu \- DICOM retrieve (C-MOVE) SCU
@@ -392,12 +392,14 @@ DigitalIntraOralXRayImageStorageForPresentation 1.2.840.10008.5.1.4.1.1.1.3
DigitalIntraOralXRayImageStorageForProcessing 1.2.840.10008.5.1.4.1.1.1.3.1
CTImageStorage 1.2.840.10008.5.1.4.1.1.2
EnhancedCTImageStorage 1.2.840.10008.5.1.4.1.1.2.1
+LegacyConvertedEnhancedCTImageStorage 1.2.840.10008.5.1.4.1.1.2.2
RETIRED_UltrasoundMultiframeImageStorage 1.2.840.10008.5.1.4.1.1.3
UltrasoundMultiframeImageStorage 1.2.840.10008.5.1.4.1.1.3.1
MRImageStorage 1.2.840.10008.5.1.4.1.1.4
EnhancedMRImageStorage 1.2.840.10008.5.1.4.1.1.4.1
MRSpectroscopyStorage 1.2.840.10008.5.1.4.1.1.4.2
EnhancedMRColorImageStorage 1.2.840.10008.5.1.4.1.1.4.3
+LegacyConvertedEnhancedMRImageStorage 1.2.840.10008.5.1.4.1.1.4.4
RETIRED_NuclearMedicineImageStorage 1.2.840.10008.5.1.4.1.1.5
RETIRED_UltrasoundImageStorage 1.2.840.10008.5.1.4.1.1.6
UltrasoundImageStorage 1.2.840.10008.5.1.4.1.1.6.1
@@ -426,6 +428,8 @@ ColorSoftcopyPresentationStateStorage 1.2.840.10008.5.1.4.1.1.11.
PseudoColorSoftcopyPresentationStateStorage 1.2.840.10008.5.1.4.1.1.11.3
BlendingSoftcopyPresentationStateStorage 1.2.840.10008.5.1.4.1.1.11.4
XAXRFGrayscaleSoftcopyPresentationStateStorage 1.2.840.10008.5.1.4.1.1.11.5
+GrayscalePlanarMPRVolumetricPresentationStateStorage 1.2.840.10008.5.1.4.1.1.11.6
+CompositingPlanarMPRVolumetricPresentationStateStor. 1.2.840.10008.5.1.4.1.1.11.7
XRayAngiographicImageStorage 1.2.840.10008.5.1.4.1.1.12.1
EnhancedXAImageStorage 1.2.840.10008.5.1.4.1.1.12.1.1
XRayRadiofluoroscopicImageStorage 1.2.840.10008.5.1.4.1.1.12.2
@@ -434,15 +438,19 @@ RETIRED_XRayAngiographicBiPlaneImageStorage 1.2.840.10008.5.1.4.1.1.12.
XRay3DAngiographicImageStorage 1.2.840.10008.5.1.4.1.1.13.1.1
XRay3DCraniofacialImageStorage 1.2.840.10008.5.1.4.1.1.13.1.2
BreastTomosynthesisImageStorage 1.2.840.10008.5.1.4.1.1.13.1.3
+BreastProjectionXRayImageStorageForPresentation 1.2.840.10008.5.1.4.1.1.13.1.4
+BreastProjectionXRayImageStorageForProcessing 1.2.840.10008.5.1.4.1.1.13.1.5
IntravascularOpt.Coh.Tom.ImageStorageForPresentation 1.2.840.10008.5.1.4.1.1.14.1
IntravascularOpt.Coh.Tom.ImageStorageForProcessing 1.2.840.10008.5.1.4.1.1.14.2
NuclearMedicineImageStorage 1.2.840.10008.5.1.4.1.1.20
+ParametricMapStorage 1.2.840.10008.5.1.4.1.1.30
RawDataStorage 1.2.840.10008.5.1.4.1.1.66
SpatialRegistrationStorage 1.2.840.10008.5.1.4.1.1.66.1
SpatialFiducialsStorage 1.2.840.10008.5.1.4.1.1.66.2
DeformableSpatialRegistrationStorage 1.2.840.10008.5.1.4.1.1.66.3
SegmentationStorage 1.2.840.10008.5.1.4.1.1.66.4
SurfaceSegmentationStorage 1.2.840.10008.5.1.4.1.1.66.5
+TractographyResultsStorage 1.2.840.10008.5.1.4.1.1.66.6
RealWorldValueMappingStorage 1.2.840.10008.5.1.4.1.1.67
SurfaceScanMeshStorage 1.2.840.10008.5.1.4.1.1.68.1
SurfaceScanPointCloudStorage 1.2.840.10008.5.1.4.1.1.68.2
@@ -458,6 +466,8 @@ OphthalmicPhotography8BitImageStorage 1.2.840.10008.5.1.4.1.1.77.
OphthalmicPhotography16BitImageStorage 1.2.840.10008.5.1.4.1.1.77.1.5.2
StereometricRelationshipStorage 1.2.840.10008.5.1.4.1.1.77.1.5.3
OphthalmicTomographyImageStorage 1.2.840.10008.5.1.4.1.1.77.1.5.4
+WideFieldOphthalmicPhoto.Stereogr.Proj.ImageStorage 1.2.840.10008.5.1.4.1.1.77.1.5.5
+WideFieldOphthalmicPhotogr.3DCoordinatesImageStorage 1.2.840.10008.5.1.4.1.1.77.1.5.6
VLWholeSlideMicroscopyImageStorage 1.2.840.10008.5.1.4.1.1.77.1.6
RETIRED_VLMultiFrameImageStorage 1.2.840.10008.5.1.4.1.1.77.2
LensometryMeasurementsStorage 1.2.840.10008.5.1.4.1.1.78.1
@@ -471,6 +481,7 @@ IntraocularLensCalculationsStorage 1.2.840.10008.5.1.4.1.1.78.
MacularGridThicknessAndVolumeReportStorage 1.2.840.10008.5.1.4.1.1.79.1
OphthalmicVisualFieldStaticPerimetryMeasurementsSt. 1.2.840.10008.5.1.4.1.1.80.1
OphthalmicThicknessMapStorage 1.2.840.10008.5.1.4.1.1.81.1
+CornealTopographyMapStorage 1.2.840.10008.5.1.4.1.1.82.1
DRAFT_SRTextStorage 1.2.840.10008.5.1.4.1.1.88.1
DRAFT_SRAudioStorage 1.2.840.10008.5.1.4.1.1.88.2
DRAFT_SRDetailStorage 1.2.840.10008.5.1.4.1.1.88.3
@@ -479,16 +490,21 @@ BasicTextSRStorage 1.2.840.10008.5.1.4.1.1.88.
EnhancedSRStorage 1.2.840.10008.5.1.4.1.1.88.22
ComprehensiveSRStorage 1.2.840.10008.5.1.4.1.1.88.33
Comprehensive3DSRStorage 1.2.840.10008.5.1.4.1.1.88.34
+ExtensibleSRStorage 1.2.840.10008.5.1.4.1.1.88.35
ProcedureLogStorage 1.2.840.10008.5.1.4.1.1.88.40
MammographyCADSRStorage 1.2.840.10008.5.1.4.1.1.88.50
KeyObjectSelectionDocumentStorage 1.2.840.10008.5.1.4.1.1.88.59
ChestCADSRStorage 1.2.840.10008.5.1.4.1.1.88.65
XRayRadiationDoseSRStorage 1.2.840.10008.5.1.4.1.1.88.67
+RadiopharmaceuticalRadiationDoseSRStorage 1.2.840.10008.5.1.4.1.1.88.68
ColonCADSRStorage 1.2.840.10008.5.1.4.1.1.88.69
ImplantationPlanSRDocumentStorage 1.2.840.10008.5.1.4.1.1.88.70
+AcquisitionContextSRStorage 1.2.840.10008.5.1.4.1.1.88.71
+ContentAssessmentResultsStorage 1.2.840.10008.5.1.4.1.1.90.1
EncapsulatedPDFStorage 1.2.840.10008.5.1.4.1.1.104.1
EncapsulatedCDAStorage 1.2.840.10008.5.1.4.1.1.104.2
PositronEmissionTomographyImageStorage 1.2.840.10008.5.1.4.1.1.128
+LegacyConvertedEnhancedPETImageStorage 1.2.840.10008.5.1.4.1.1.128.1
RETIRED_StandalonePETCurveStorage 1.2.840.10008.5.1.4.1.1.129
EnhancedPETImageStorage 1.2.840.10008.5.1.4.1.1.130
BasicStructuredDisplayStorage 1.2.840.10008.5.1.4.1.1.131
@@ -505,10 +521,14 @@ DICOS_CTImageStorage 1.2.840.10008.5.1.4.1.1.501
DICOS_DigitalXRayImageStorageForPresentation 1.2.840.10008.5.1.4.1.1.501.2.1
DICOS_DigitalXRayImageStorageForProcessing 1.2.840.10008.5.1.4.1.1.501.2.2
DICOS_ThreatDetectionReportStorage 1.2.840.10008.5.1.4.1.1.501.3
+DICOS_2DAITStorage 1.2.840.10008.5.1.4.1.1.501.4
+DICOS_3DAITStorage 1.2.840.10008.5.1.4.1.1.501.5
+DICOS_QuadrupoleResonanceStorage 1.2.840.10008.5.1.4.1.1.501.6
DICONDE_EddyCurrentImageStorage 1.2.840.10008.5.1.4.1.1.601.1
DICONDE_EddyCurrentMultiframeImageStorage 1.2.840.10008.5.1.4.1.1.601.2
DRAFT_RTBeamsDeliveryInstructionStorage 1.2.840.10008.5.1.4.34.1
RTBeamsDeliveryInstructionStorage 1.2.840.10008.5.1.4.34.7
+RTBrachyApplicationSetupDeliveryInstructionStorage 1.2.840.10008.5.1.4.34.10
GenericImplantTemplateStorage 1.2.840.10008.5.1.4.43.1
ImplantAssemblyTemplateStorage 1.2.840.10008.5.1.4.44.1
ImplantTemplateGroupStorage 1.2.840.10008.5.1.4.45.1
@@ -561,7 +581,7 @@ movescu --patient --port 9876 --move TEST_AE --call ARCHIVE caesar 104 q.dcm
.fi
.PP
.PP
-sends the attributes contained in the DICOM file 'q\&.dcm' as part of a C-MOVE request to application entity ARCHIVE on the host caesar at port 104 using the Patient Root query model\&. \fBmovescu\fP itself uses the default AE title MOVESCU\&. The C-MOVE request will specifiy that images should be transferred to the destination AE title TEST_AE (via the \fI--move\fP option)\&. How the SCP interprets this request depends on its configuration\&. \fBmovescu\fP will listen on part 9876 for i [...]
+sends the attributes contained in the DICOM file 'q\&.dcm' as part of a C-MOVE request to application entity ARCHIVE on the host caesar at port 104 using the Patient Root query model\&. \fBmovescu\fP itself uses the default AE title MOVESCU\&. The C-MOVE request will specify that images should be transferred to the destination AE title TEST_AE (via the \fI--move\fP option)\&. How the SCP interprets this request depends on its configuration\&. \fBmovescu\fP will listen on part 9876 for in [...]
.PP
Images can be copied to a third party by using a different destination AE title (e\&.g\&. \fI--move\fP ANOTHER_AE)\&. Of course, the SCP must 'know' this AE title and the destination must be acting as an SCP of the Storage Service Class (the \fBstorescp\fP application can be used for this purpose)\&.
.SH "LOGGING"
@@ -586,4 +606,4 @@ The default behavior should be preferred and the \fIDCMDICTPATH\fP environment v
\fBfindscu\fP(1), \fBstorescp\fP(1), \fBdump2dcm\fP(1)
.SH "COPYRIGHT"
.PP
-Copyright (C) 1994-2014 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&.
+Copyright (C) 1994-2016 by OFFIS e\&.V\&., Escherweg 2, 26121 Oldenburg, Germany\&.
diff --git a/doxygen/manpages/man1/pdf2dcm.1 b/doxygen/manpages/man1/pdf2dcm.1
index 4681de1..9c15deb 100644
--- a/doxygen/manpages/man1/pdf2dcm.1
+++ b/doxygen/manpages/man1/pdf2dcm.1
@@ -1,4 +1,4 @@
-.TH "pdf2dcm" 1 "Tue Feb 16 2016" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
+.TH "pdf2dcm" 1 "Thu Jun 30 2016" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
.nh
.SH NAME
pdf2dcm \- Convert PDF file to DICOM
diff --git a/doxygen/manpages/man1/storescp.1 b/doxygen/manpages/man1/storescp.1
index 19667d9..00ac7d7 100644
--- a/doxygen/manpages/man1/storescp.1
+++ b/doxygen/manpages/man1/storescp.1
@@ -1,4 +1,4 @@
-.TH "storescp" 1 "Tue Feb 16 2016" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
+.TH "storescp" 1 "Thu Jun 30 2016" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
.nh
.SH NAME
storescp \- DICOM storage (C-STORE) SCP
@@ -594,6 +594,7 @@ RadiopharmaceuticalRadiationDoseSRStorage 1.2.840.10008.5.1.4.1.1.88.
ColonCADSRStorage 1.2.840.10008.5.1.4.1.1.88.69
ImplantationPlanSRDocumentStorage 1.2.840.10008.5.1.4.1.1.88.70
AcquisitionContextSRStorage 1.2.840.10008.5.1.4.1.1.88.71
+ContentAssessmentResultsStorage 1.2.840.10008.5.1.4.1.1.90.1
EncapsulatedPDFStorage 1.2.840.10008.5.1.4.1.1.104.1
EncapsulatedCDAStorage 1.2.840.10008.5.1.4.1.1.104.2
PositronEmissionTomographyImageStorage 1.2.840.10008.5.1.4.1.1.128
@@ -614,6 +615,9 @@ DICOS_CTImageStorage 1.2.840.10008.5.1.4.1.1.501
DICOS_DigitalXRayImageStorageForPresentation 1.2.840.10008.5.1.4.1.1.501.2.1
DICOS_DigitalXRayImageStorageForProcessing 1.2.840.10008.5.1.4.1.1.501.2.2
DICOS_ThreatDetectionReportStorage 1.2.840.10008.5.1.4.1.1.501.3
+DICOS_2DAITStorage 1.2.840.10008.5.1.4.1.1.501.4
+DICOS_3DAITStorage 1.2.840.10008.5.1.4.1.1.501.5
+DICOS_QuadrupoleResonanceStorage 1.2.840.10008.5.1.4.1.1.501.6
DICONDE_EddyCurrentImageStorage 1.2.840.10008.5.1.4.1.1.601.1
DICONDE_EddyCurrentMultiframeImageStorage 1.2.840.10008.5.1.4.1.1.601.2
DRAFT_RTBeamsDeliveryInstructionStorage 1.2.840.10008.5.1.4.34.1
diff --git a/doxygen/manpages/man1/storescu.1 b/doxygen/manpages/man1/storescu.1
index 8e93d36..275ed6a 100644
--- a/doxygen/manpages/man1/storescu.1
+++ b/doxygen/manpages/man1/storescu.1
@@ -1,4 +1,4 @@
-.TH "storescu" 1 "Tue Feb 16 2016" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
+.TH "storescu" 1 "Thu Jun 30 2016" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
.nh
.SH NAME
storescu \- DICOM storage (C-STORE) SCU
diff --git a/doxygen/manpages/man1/termscu.1 b/doxygen/manpages/man1/termscu.1
index e54e54a..a968b58 100644
--- a/doxygen/manpages/man1/termscu.1
+++ b/doxygen/manpages/man1/termscu.1
@@ -1,4 +1,4 @@
-.TH "termscu" 1 "Tue Feb 16 2016" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
+.TH "termscu" 1 "Thu Jun 30 2016" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
.nh
.SH NAME
termscu \- DICOM termination SCU
diff --git a/doxygen/manpages/man1/wlmscpfs.1 b/doxygen/manpages/man1/wlmscpfs.1
index 96fed18..0e12999 100644
--- a/doxygen/manpages/man1/wlmscpfs.1
+++ b/doxygen/manpages/man1/wlmscpfs.1
@@ -1,4 +1,4 @@
-.TH "wlmscpfs" 1 "Tue Feb 16 2016" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
+.TH "wlmscpfs" 1 "Thu Jun 30 2016" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
.nh
.SH NAME
wlmscpfs \- DICOM Basic Worklist Management SCP (based on data files)
diff --git a/doxygen/manpages/man1/xml2dcm.1 b/doxygen/manpages/man1/xml2dcm.1
index 70f905c..24bcd7b 100644
--- a/doxygen/manpages/man1/xml2dcm.1
+++ b/doxygen/manpages/man1/xml2dcm.1
@@ -1,4 +1,4 @@
-.TH "xml2dcm" 1 "Tue Feb 16 2016" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
+.TH "xml2dcm" 1 "Thu Jun 30 2016" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
.nh
.SH NAME
xml2dcm \- Convert XML document to DICOM file or data set
diff --git a/doxygen/manpages/man1/xml2dsr.1 b/doxygen/manpages/man1/xml2dsr.1
index b44ab9f..cee3c23 100644
--- a/doxygen/manpages/man1/xml2dsr.1
+++ b/doxygen/manpages/man1/xml2dsr.1
@@ -1,4 +1,4 @@
-.TH "xml2dsr" 1 "Tue Feb 16 2016" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
+.TH "xml2dsr" 1 "Thu Jun 30 2016" "Version 3.6.1" "OFFIS DCMTK" \" -*- nroff -*-
.nh
.SH NAME
xml2dsr \- Convert DICOM SR file and data set to XML
diff --git a/oflog/libsrc/timehelp.cc b/oflog/libsrc/timehelp.cc
index e590ac5..70ca8bb 100644
--- a/oflog/libsrc/timehelp.cc
+++ b/oflog/libsrc/timehelp.cc
@@ -200,7 +200,7 @@ Time::localtime(tm* t) const
}
-namespace
+namespace
{
@@ -234,7 +234,7 @@ build_q_value (log4cplus::tstring & q_str, long tv_usec)
static
-void
+void
build_uc_q_value (log4cplus::tstring & uc_q_str, long tv_usec,
log4cplus::tstring & tmp)
{
@@ -257,19 +257,19 @@ Time::getFormattedTime(const log4cplus::tstring& fmt_orig, bool use_gmtime) cons
if (fmt_orig.empty () || fmt_orig[0] == 0)
return log4cplus::tstring ();
- tm time;
-
+ tm time = {};
+
if (use_gmtime)
gmtime(&time);
- else
+ else
localtime(&time);
-
+
enum State
{
TEXT,
PERCENT_SIGN
};
-
+
internal::gft_scratch_pad & gft_sp = internal::get_gft_scratch_pad ();
gft_sp.reset ();
@@ -278,7 +278,7 @@ Time::getFormattedTime(const log4cplus::tstring& fmt_orig, bool use_gmtime) cons
State state = TEXT;
// Walk the format string and process all occurences of %q and %Q.
-
+
for (log4cplus::tstring::const_iterator fmt_it = gft_sp.fmt.begin ();
fmt_it != gft_sp.fmt.end (); ++fmt_it)
{
@@ -292,7 +292,7 @@ Time::getFormattedTime(const log4cplus::tstring& fmt_orig, bool use_gmtime) cons
gft_sp.ret.append(1, *fmt_it);
}
break;
-
+
case PERCENT_SIGN:
{
switch (*fmt_it)
@@ -308,7 +308,7 @@ Time::getFormattedTime(const log4cplus::tstring& fmt_orig, bool use_gmtime) cons
state = TEXT;
}
break;
-
+
case DCMTK_LOG4CPLUS_TEXT ('Q'):
{
if (! gft_sp.uc_q_str_valid)
@@ -356,7 +356,7 @@ Time::getFormattedTime(const log4cplus::tstring& fmt_orig, bool use_gmtime) cons
// Limit how far can the buffer grow. This is necessary so that we
// catch bad format string. Some implementations of strftime() signal
// both too small buffer and invalid format string by returning 0
- // without changing errno.
+ // without changing errno.
size_t const buffer_size_max
= MAX(OFstatic_cast(size_t, 1024), buffer_size * 16);
@@ -382,7 +382,7 @@ Time::getFormattedTime(const log4cplus::tstring& fmt_orig, bool use_gmtime) cons
+ convertIntegerToString (eno), true);
}
}
- }
+ }
while (len == 0);
return tstring (&*gft_sp.buffer.begin (), len);
@@ -424,7 +424,7 @@ Time::operator/=(long rhs)
{
long rem_secs = OFstatic_cast(long, tv_sec % rhs);
tv_sec /= rhs;
-
+
tv_usec /= rhs;
tv_usec += OFstatic_cast(long, (rem_secs * ONE_SEC_IN_USEC) / rhs);
@@ -483,7 +483,7 @@ bool
operator<(const Time& lhs, const Time& rhs)
{
return ( (lhs.sec() < rhs.sec())
- || ( (lhs.sec() == rhs.sec())
+ || ( (lhs.sec() == rhs.sec())
&& (lhs.usec() < rhs.usec())) );
}
@@ -499,7 +499,7 @@ bool
operator>(const Time& lhs, const Time& rhs)
{
return ( (lhs.sec() > rhs.sec())
- || ( (lhs.sec() == rhs.sec())
+ || ( (lhs.sec() == rhs.sec())
&& (lhs.usec() > rhs.usec())) );
}
diff --git a/ofstd/include/dcmtk/ofstd/ofbmanip.h b/ofstd/include/dcmtk/ofstd/ofbmanip.h
index ba21797..b425a53 100644
--- a/ofstd/include/dcmtk/ofstd/ofbmanip.h
+++ b/ofstd/include/dcmtk/ofstd/ofbmanip.h
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 1997-2014, OFFIS e.V.
+ * Copyright (C) 1997-2016, OFFIS e.V.
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation were developed by
@@ -58,9 +58,9 @@ class OFBitmanipTemplate
#ifdef HAVE_MEMCPY
memcpy(OFstatic_cast(void *, dest), OFstatic_cast(const void *, src), count * sizeof(T));
#else
- register size_t i;
- register const T *p = src;
- register T *q = dest;
+ size_t i;
+ const T *p = src;
+ T *q = dest;
for (i = count; i != 0; --i)
*q++ = *p++;
#endif
@@ -86,9 +86,9 @@ class OFBitmanipTemplate
if (src == dest)
return;
- register size_t i;
- register const T *p = src;
- register T *q = dest;
+ size_t i;
+ const T *p = src;
+ T *q = dest;
if (src > dest)
{
// src is above dest in memory, we start copying from the start
@@ -123,8 +123,8 @@ class OFBitmanipTemplate
else
#endif
{
- register size_t i;
- register T *q = dest;
+ size_t i;
+ T *q = dest;
for (i = count; i != 0; --i)
*q++ = value;
}
@@ -142,8 +142,8 @@ class OFBitmanipTemplate
#ifdef HAVE_MEMZERO
memzero(dest, OFstatic_cast(size_t, count) * sizeof(T));
#else
- register size_t i;
- register T *q = dest;
+ size_t i;
+ T *q = dest;
for (i = count; i != 0; --i)
*q++ = 0;
#endif
diff --git a/ofstd/include/dcmtk/ofstd/oflimits.h b/ofstd/include/dcmtk/ofstd/oflimits.h
index 032a8ed..0dc6f4c 100644
--- a/ofstd/include/dcmtk/ofstd/oflimits.h
+++ b/ofstd/include/dcmtk/ofstd/oflimits.h
@@ -948,9 +948,9 @@ struct OFnumeric_limits
static const int max_exponent10 = 0;
static const OFBool traps = OFFalse;
static const OFBool tinyness_before = OFFalse;
- static inline T min() { return T(); }
+ static inline T (min)() { return T(); }
static inline T lowest() { return T(); }
- static inline T max() { return T(); }
+ static inline T (max)() { return T(); }
static inline T epsilon() { return T(); }
static inline T round_error() { return T(); }
static inline T infinity() { return T(); }
@@ -986,9 +986,9 @@ struct OFnumeric_limits<bool>
static const int max_exponent10 = 0;
static const OFBool traps = OFFalse;
static const OFBool tinyness_before = OFFalse;
- static inline bool min() { return OFFalse; }
+ static inline bool (min)() { return OFFalse; }
static inline bool lowest() { return OFFalse; }
- static inline bool max() { return OFTrue; }
+ static inline bool (max)() { return OFTrue; }
static inline bool epsilon() { return OFFalse; }
static inline bool round_error() { return OFFalse; }
static inline bool infinity() { return OFFalse; }
@@ -1028,9 +1028,9 @@ struct OFnumeric_limits<char>
static const int max_exponent10 = 0;
static const OFBool traps = DCMTK_CHAR_TRAPS;
static const OFBool tinyness_before = OFFalse;
- static inline char min() { return OFstatic_cast( char, CHAR_MIN ); }
+ static inline char (min)() { return OFstatic_cast( char, CHAR_MIN ); }
static inline char lowest() { return OFstatic_cast( char, CHAR_MIN ); }
- static inline char max() { return OFstatic_cast( char, CHAR_MAX ); }
+ static inline char (max)() { return OFstatic_cast( char, CHAR_MAX ); }
static inline char epsilon() { return OFstatic_cast( char, 0 ); }
static inline char round_error() { return OFstatic_cast( char, 0 ); }
static inline char infinity() { return OFstatic_cast( char, 0 ); }
@@ -1065,9 +1065,9 @@ struct OFnumeric_limits<signed char>
static const int max_exponent10 = 0;
static const OFBool traps = DCMTK_SIGNED_CHAR_TRAPS;
static const OFBool tinyness_before = OFFalse;
- static inline signed char min() { return OFstatic_cast( signed char, SCHAR_MIN ); }
+ static inline signed char (min)() { return OFstatic_cast( signed char, SCHAR_MIN ); }
static inline signed char lowest() { return OFstatic_cast( signed char, SCHAR_MIN ); }
- static inline signed char max() { return OFstatic_cast( signed char, SCHAR_MAX ); }
+ static inline signed char (max)() { return OFstatic_cast( signed char, SCHAR_MAX ); }
static inline signed char epsilon() { return OFstatic_cast( signed char, 0 ); }
static inline signed char round_error() { return OFstatic_cast( signed char, 0 ); }
static inline signed char infinity() { return OFstatic_cast( signed char, 0 ); }
@@ -1102,9 +1102,9 @@ struct OFnumeric_limits<unsigned char>
static const int max_exponent10 = 0;
static const OFBool traps = DCMTK_UNSIGNED_CHAR_TRAPS;
static const OFBool tinyness_before = OFFalse;
- static inline unsigned char min() { return OFstatic_cast( unsigned char, 0 ); }
+ static inline unsigned char (min)() { return OFstatic_cast( unsigned char, 0 ); }
static inline unsigned char lowest() { return OFstatic_cast( unsigned char, 0 ); }
- static inline unsigned char max() { return OFstatic_cast( unsigned char, UCHAR_MAX ); }
+ static inline unsigned char (max)() { return OFstatic_cast( unsigned char, UCHAR_MAX ); }
static inline unsigned char epsilon() { return OFstatic_cast( unsigned char, 0 ); }
static inline unsigned char round_error() { return OFstatic_cast( unsigned char, 0 ); }
static inline unsigned char infinity() { return OFstatic_cast( unsigned char, 0 ); }
@@ -1139,9 +1139,9 @@ struct OFnumeric_limits<signed short>
static const int max_exponent10 = 0;
static const OFBool traps = DCMTK_SIGNED_SHORT_TRAPS;
static const OFBool tinyness_before = OFFalse;
- static inline signed short min() { return OFstatic_cast( signed short, SHRT_MIN ); }
+ static inline signed short (min)() { return OFstatic_cast( signed short, SHRT_MIN ); }
static inline signed short lowest() { return OFstatic_cast( signed short, SHRT_MIN ); }
- static inline signed short max() { return OFstatic_cast( signed short, SHRT_MAX ); }
+ static inline signed short (max)() { return OFstatic_cast( signed short, SHRT_MAX ); }
static inline signed short epsilon() { return OFstatic_cast( signed short, 0 ); }
static inline signed short round_error() { return OFstatic_cast( signed short, 0 ); }
static inline signed short infinity() { return OFstatic_cast( signed short, 0 ); }
@@ -1176,9 +1176,9 @@ struct OFnumeric_limits<unsigned short>
static const int max_exponent10 = 0;
static const OFBool traps = DCMTK_UNSIGNED_SHORT_TRAPS;
static const OFBool tinyness_before = OFFalse;
- static inline unsigned short min() { return OFstatic_cast( unsigned short, 0 ); }
+ static inline unsigned short (min)() { return OFstatic_cast( unsigned short, 0 ); }
static inline unsigned short lowest() { return OFstatic_cast( unsigned short, 0 ); }
- static inline unsigned short max() { return OFstatic_cast( unsigned short, USHRT_MAX ); }
+ static inline unsigned short (max)() { return OFstatic_cast( unsigned short, USHRT_MAX ); }
static inline unsigned short epsilon() { return OFstatic_cast( unsigned short, 0 ); }
static inline unsigned short round_error() { return OFstatic_cast( unsigned short, 0 ); }
static inline unsigned short infinity() { return OFstatic_cast( unsigned short, 0 ); }
@@ -1213,9 +1213,9 @@ struct OFnumeric_limits<signed int>
static const int max_exponent10 = 0;
static const OFBool traps = DCMTK_SIGNED_INT_TRAPS;
static const OFBool tinyness_before = OFFalse;
- static inline signed int min() { return OFstatic_cast( signed int, INT_MIN ); }
+ static inline signed int (min)() { return OFstatic_cast( signed int, INT_MIN ); }
static inline signed int lowest() { return OFstatic_cast( signed int, INT_MIN ); }
- static inline signed int max() { return OFstatic_cast( signed int, INT_MAX ); }
+ static inline signed int (max)() { return OFstatic_cast( signed int, INT_MAX ); }
static inline signed int epsilon() { return OFstatic_cast( signed int, 0 ); }
static inline signed int round_error() { return OFstatic_cast( signed int, 0 ); }
static inline signed int infinity() { return OFstatic_cast( signed int, 0 ); }
@@ -1250,9 +1250,9 @@ struct OFnumeric_limits<unsigned int>
static const int max_exponent10 = 0;
static const OFBool traps = DCMTK_UNSIGNED_INT_TRAPS;
static const OFBool tinyness_before = OFFalse;
- static inline unsigned int min() { return OFstatic_cast( unsigned int, 0 ); }
+ static inline unsigned int (min)() { return OFstatic_cast( unsigned int, 0 ); }
static inline unsigned int lowest() { return OFstatic_cast( unsigned int, 0 ); }
- static inline unsigned int max() { return OFstatic_cast( unsigned int, UINT_MAX ); }
+ static inline unsigned int (max)() { return OFstatic_cast( unsigned int, UINT_MAX ); }
static inline unsigned int epsilon() { return OFstatic_cast( unsigned int, 0 ); }
static inline unsigned int round_error() { return OFstatic_cast( unsigned int, 0 ); }
static inline unsigned int infinity() { return OFstatic_cast( unsigned int, 0 ); }
@@ -1287,9 +1287,9 @@ struct OFnumeric_limits<signed long>
static const int max_exponent10 = 0;
static const OFBool traps = DCMTK_SIGNED_LONG_TRAPS;
static const OFBool tinyness_before = OFFalse;
- static inline signed long min() { return OFstatic_cast( signed long, LONG_MIN ); }
+ static inline signed long (min)() { return OFstatic_cast( signed long, LONG_MIN ); }
static inline signed long lowest() { return OFstatic_cast( signed long, LONG_MIN ); }
- static inline signed long max() { return OFstatic_cast( signed long, LONG_MAX ); }
+ static inline signed long (max)() { return OFstatic_cast( signed long, LONG_MAX ); }
static inline signed long epsilon() { return OFstatic_cast( signed long, 0 ); }
static inline signed long round_error() { return OFstatic_cast( signed long, 0 ); }
static inline signed long infinity() { return OFstatic_cast( signed long, 0 ); }
@@ -1324,9 +1324,9 @@ struct OFnumeric_limits<unsigned long>
static const int max_exponent10 = 0;
static const OFBool traps = DCMTK_UNSIGNED_LONG_TRAPS;
static const OFBool tinyness_before = OFFalse;
- static inline unsigned long min() { return OFstatic_cast( unsigned long, 0 ); }
+ static inline unsigned long (min)() { return OFstatic_cast( unsigned long, 0 ); }
static inline unsigned long lowest() { return OFstatic_cast( unsigned long, 0 ); }
- static inline unsigned long max() { return OFstatic_cast( unsigned long, ULONG_MAX ); }
+ static inline unsigned long (max)() { return OFstatic_cast( unsigned long, ULONG_MAX ); }
static inline unsigned long epsilon() { return OFstatic_cast( unsigned long, 0 ); }
static inline unsigned long round_error() { return OFstatic_cast( unsigned long, 0 ); }
static inline unsigned long infinity() { return OFstatic_cast( unsigned long, 0 ); }
@@ -1361,9 +1361,9 @@ struct OFnumeric_limits<float>
static const int max_exponent10 = FLT_MAX_10_EXP;
static const OFBool traps = DCMTK_FLOAT_TRAPS;
static const OFBool tinyness_before = DCMTK_FLOAT_TINYNESS_BEFORE;
- static inline float min() { return OFstatic_cast( float, FLT_MIN ); }
+ static inline float (min)() { return OFstatic_cast( float, FLT_MIN ); }
static inline float lowest() { return OFstatic_cast( float, -FLT_MAX ); }
- static inline float max() { return OFstatic_cast( float, FLT_MAX ); }
+ static inline float (max)() { return OFstatic_cast( float, FLT_MAX ); }
static inline float epsilon() { return OFstatic_cast( float, FLT_EPSILON ); }
static inline float round_error() { return OFstatic_cast( float, 0.5f ); }
static inline float infinity() { return DCMTK_FLOAT_INFINITY; }
@@ -1398,9 +1398,9 @@ struct OFnumeric_limits<double>
static const int max_exponent10 = DBL_MAX_10_EXP;
static const OFBool traps = DCMTK_DOUBLE_TRAPS;
static const OFBool tinyness_before = DCMTK_DOUBLE_TINYNESS_BEFORE;
- static inline double min() { return OFstatic_cast( double, DBL_MIN ); }
+ static inline double (min)() { return OFstatic_cast( double, DBL_MIN ); }
static inline double lowest() { return OFstatic_cast( double, -DBL_MAX ); }
- static inline double max() { return OFstatic_cast( double, DBL_MAX ); }
+ static inline double (max)() { return OFstatic_cast( double, DBL_MAX ); }
static inline double epsilon() { return OFstatic_cast( double, DBL_EPSILON ); }
static inline double round_error() { return OFstatic_cast( double, 0.5 ); }
static inline double infinity() { return DCMTK_DOUBLE_INFINITY; }
diff --git a/ofstd/include/dcmtk/ofstd/ofstd.h b/ofstd/include/dcmtk/ofstd/ofstd.h
index 6f24049..97705ac 100644
--- a/ofstd/include/dcmtk/ofstd/ofstd.h
+++ b/ofstd/include/dcmtk/ofstd/ofstd.h
@@ -876,7 +876,7 @@ class DCMTK_OFSTD_EXPORT OFStandard
safeAdd(T a, T b, T& sum)
{
assert(!OFnumeric_limits<T>::is_signed);
- if (OFnumeric_limits<T>::max() - a < b) {
+ if ((OFnumeric_limits<T>::max)() - a < b) {
return OFFalse;
} else {
sum = a + b;
diff --git a/ofstd/include/dcmtk/ofstd/ofvector.h b/ofstd/include/dcmtk/ofstd/ofvector.h
index 17cc2da..c9f545e 100644
--- a/ofstd/include/dcmtk/ofstd/ofvector.h
+++ b/ofstd/include/dcmtk/ofstd/ofvector.h
@@ -232,7 +232,11 @@ public:
iterator insert(iterator it, const T& v)
{
size_type idx = it - begin();
- reserve(size_ + 1);
+
+ if (size_ == allocated_) {
+ reserve(size_ * 2);
+ }
+
if (idx < size_)
for (size_type i = size_; i > idx; i--) {
values_[i] = values_[i - 1];
diff --git a/ofstd/libsrc/Makefile.dep b/ofstd/libsrc/Makefile.dep
index 277ff0e..1241249 100644
--- a/ofstd/libsrc/Makefile.dep
+++ b/ofstd/libsrc/Makefile.dep
@@ -85,11 +85,12 @@ oflist.o: oflist.cc ../../config/include/dcmtk/config/osconfig.h \
../include/dcmtk/ofstd/ofdefine.h ../include/dcmtk/ofstd/ofcast.h \
../include/dcmtk/ofstd/ofexport.h ../include/dcmtk/ofstd/ofstdinc.h \
../include/dcmtk/ofstd/ofstream.h
-ofmath.o: ofmath.cc ../../config/include/dcmtk/config/osconfig.h \
+ofmath.o: ofmath.cc ../../config/math.cc \
+ ../../config/include/dcmtk/config/osconfig.h \
../include/dcmtk/ofstd/ofstdinc.h ../include/dcmtk/ofstd/ofstream.h \
- ../include/dcmtk/ofstd/ofmath.h ../include/dcmtk/ofstd/oftypes.h \
- ../include/dcmtk/ofstd/ofdefine.h ../include/dcmtk/ofstd/ofcast.h \
- ../include/dcmtk/ofstd/ofexport.h ../include/dcmtk/ofstd/oftraits.h
+ ../include/dcmtk/ofstd/oftypes.h ../include/dcmtk/ofstd/ofdefine.h \
+ ../include/dcmtk/ofstd/ofcast.h ../include/dcmtk/ofstd/ofexport.h \
+ ../include/dcmtk/ofstd/ofmath.h ../include/dcmtk/ofstd/oftraits.h
ofstd.o: ofstd.cc ../../config/include/dcmtk/config/osconfig.h \
../include/dcmtk/ofstd/ofstd.h ../include/dcmtk/ofstd/oflist.h \
../include/dcmtk/ofstd/oftypes.h ../include/dcmtk/ofstd/ofdefine.h \
diff --git a/ofstd/libsrc/ofmath.cc b/ofstd/libsrc/ofmath.cc
index 90c9e61..927cc13 100644
--- a/ofstd/libsrc/ofmath.cc
+++ b/ofstd/libsrc/ofmath.cc
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2015, OFFIS e.V.
+ * Copyright (C) 2015-2016, OFFIS e.V.
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation were developed by
@@ -15,119 +15,33 @@
*
* Author: Jan Schlamelcher
*
- * Purpose: Platform independent definition of basic functions declared
- * in <math.h> resp. <cmath>.
+ * Purpose: Platform independent definition of several basic math
+ * utility functions.
*
*/
-
-#include "dcmtk/config/osconfig.h" /* make sure OS specific configuration is included first */
-
-#define INCLUDE_CMATH
-#define INCLUDE_CFLOAT
-#define INCLUDE_IOSTREAM
-#include "dcmtk/ofstd/ofstdinc.h"
+// include configuration specific implementation of basic functionality
+// (this also includes osconfig.h, etc.)
+#include "../../config/math.cc"
+// include the high-level interface definition
#include "dcmtk/ofstd/ofmath.h"
-#ifdef HAVE_WINDOWS_H
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#endif
-
-/* Some MacOS X versions define isinf() and isnan() in <math.h> but not in <cmath> */
-#if defined(__APPLE__) && defined(__MACH__) && !defined (__INTEL_COMPILER)
-#undef HAVE_PROTOTYPE_ISINF
-#undef HAVE_PROTOTYPE_ISNAN
-#endif
-
-
-// some systems don't properly define isnan()
-#ifdef HAVE_ISNAN
-#ifndef HAVE_PROTOTYPE_ISNAN
-extern "C"
-{
- int isnan(double value);
-}
-#endif
-#endif
-
-
-// some systems don't properly define finite()
-#ifdef HAVE_FINITE
-#ifndef HAVE_PROTOTYPE_FINITE
-extern "C"
-{
- int finite(double value);
-}
-#endif
-#endif
-
-#if !defined(HAVE_ISINF) && defined(HAVE_PROTOTYPE_ISINF)
-# define HAVE_ISINF 1
-#endif
-
-// some systems don't properly define isinf()
-#ifdef HAVE_ISINF
-#ifndef HAVE_PROTOTYPE_ISINF
-extern "C"
-{
- int isinf(double value);
-}
-#endif
-
-#elif !defined(HAVE_PROTOTYPE_STD__ISINF)
-
-static int my_isinf(double x)
-{
-#ifdef HAVE_WINDOWS_H
- return (! _finite(x)) && (! _isnan(x));
-#else
- // Solaris 2.5.1 has finite() and isnan() but not isinf().
- return (! finite(x)) && (! isnan(x));
-#endif
-}
-#endif /* HAVE_ISINF */
-
OFBool OFMath::isnan( float f )
{
-#ifdef HAVE_WINDOWS_H
- return _isnan(f) != 0;
-#elif defined(HAVE_PROTOTYPE_STD__ISNAN)
- return STD_NAMESPACE isnan(f);
-#else
- return ::isnan(f);
-#endif
+ return (dcmtk_config_math::isnan)( f );
}
OFBool OFMath::isnan( double d )
{
-#ifdef HAVE_WINDOWS_H
- return _isnan(d) != 0;
-#elif defined(HAVE_PROTOTYPE_STD__ISNAN)
- return STD_NAMESPACE isnan(d);
-#else
- return ::isnan(d);
-#endif
+ return (dcmtk_config_math::isnan)( d );
}
OFBool OFMath::isinf( float f )
{
-#ifdef HAVE_PROTOTYPE_STD__ISINF
- return STD_NAMESPACE isinf( f );
-#elif defined(HAVE_ISINF)
- return ::isinf( f );
-#else
- return my_isinf( f ) != 0;
-#endif
+ return (dcmtk_config_math::isinf)( f );
}
OFBool OFMath::isinf( double d )
{
-#ifdef HAVE_PROTOTYPE_STD__ISINF
- return STD_NAMESPACE isinf( d );
-#elif defined(HAVE_ISINF)
- return ::isinf( d );
-#else
- return my_isinf( d ) != 0;
-#endif
+ return (dcmtk_config_math::isinf)( d );
}
diff --git a/ofstd/libsrc/ofstd.cc b/ofstd/libsrc/ofstd.cc
index cb35fad..d4fb683 100644
--- a/ofstd/libsrc/ofstd.cc
+++ b/ofstd/libsrc/ofstd.cc
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2001-2015, OFFIS e.V.
+ * Copyright (C) 2001-2016, OFFIS e.V.
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation were developed by
@@ -183,9 +183,9 @@ const unsigned int OFStandard::ftoa_zeropad = 0x20;
*/
size_t OFStandard::my_strlcpy(char *dst, const char *src, size_t siz)
{
- register char *d = dst;
- register const char *s = src;
- register size_t n = siz;
+ char *d = dst;
+ const char *s = src;
+ size_t n = siz;
/* Copy as many bytes as will fit */
if (n != 0 && --n != 0)
@@ -220,9 +220,9 @@ size_t OFStandard::my_strlcpy(char *dst, const char *src, size_t siz)
*/
size_t OFStandard::my_strlcat(char *dst, const char *src, size_t siz)
{
- register char *d = dst;
- register const char *s = src;
- register size_t n = siz;
+ char *d = dst;
+ const char *s = src;
+ size_t n = siz;
size_t dlen;
/* Find the end of dst and adjust bytes left but don't go past end */
@@ -825,6 +825,12 @@ OFCondition OFStandard::removeRootDirFromPathname(OFFilename &result,
result.set("", OFTrue /*convert*/);
status = EC_Normal;
}
+ /* check for empty root dir */
+ else if (rootLength == 0)
+ {
+ result.set(pathValue, OFTrue /*convert*/);
+ status = EC_Normal;
+ }
/* check for "compatible" length */
else if (rootLength <= pathLength)
{
@@ -858,6 +864,12 @@ OFCondition OFStandard::removeRootDirFromPathname(OFFilename &result,
result.set("");
status = EC_Normal;
}
+ /* check for empty root dir */
+ else if (rootLength == 0)
+ {
+ result.set(pathValue);
+ status = EC_Normal;
+ }
/* check for "compatible" length */
else if (rootLength <= pathLength)
{
@@ -1773,8 +1785,8 @@ static const double atof_powersOf10[] =
double OFStandard::atof(const char *s, OFBool *success)
{
if (success) *success = OFFalse;
- register const char *p = s;
- register char c;
+ const char *p = s;
+ char c;
int sign = 0;
int expSign = 0;
double fraction;
@@ -2099,7 +2111,7 @@ static char *ftoa_exponent(char *p, int exponent, char fmtch)
*p++ = '-';
}
else *p++ = '+';
- register char *t = expbuf + FTOA_MAXEXP;
+ char *t = expbuf + FTOA_MAXEXP;
if (exponent > 9)
{
do
@@ -2186,8 +2198,8 @@ static char *ftoa_round(double fract, int *expon, char *start, char *end, char c
*/
static int ftoa_convert(double val, int prec, int flags, char *signp, char fmtch, char *startp, char *endp)
{
- register char *p;
- register double fract;
+ char *p;
+ double fract;
int dotrim = 0;
int expcnt = 0;
int gformat = 0;
@@ -2196,7 +2208,7 @@ static int ftoa_convert(double val, int prec, int flags, char *signp, char fmtch
fract = modf(val, &integer);
/* get an extra slot for rounding. */
- register char *t = ++startp;
+ char *t = ++startp;
/*
* get integer portion of val; put into the end of the buffer; the
@@ -2418,7 +2430,7 @@ void OFStandard::ftoa(
char softsign = 0; /* temporary negative sign for floats */
char buf[FTOA_BUFSIZE]; /* space for %c, %[diouxX], %[eEfgG] */
char sign = '\0'; /* sign prefix (' ', '+', '-', or \0) */
- register int n;
+ int n;
unsigned char fmtch = 'G';
FTOAStringBuffer sb(FTOA_BUFSIZE+1);
@@ -2464,7 +2476,7 @@ void OFStandard::ftoa(
*buf = 0;
int size = ftoa_convert(val, prec, flags, &softsign, fmtch, buf, buf + sizeof(buf));
if (softsign) sign = '-';
- register char *t = *buf ? buf : buf + 1;
+ char *t = *buf ? buf : buf + 1;
/* At this point, `t' points to a string which (if not flags&FTOA_LEFT_ADJUSTMENT)
* should be padded out to `width' places. If flags&FTOA_ZEROPAD, it should
diff --git a/ofstd/tests/Makefile.dep b/ofstd/tests/Makefile.dep
index b209f72..8175ae3 100644
--- a/ofstd/tests/Makefile.dep
+++ b/ofstd/tests/Makefile.dep
@@ -1,14 +1,3 @@
-taddsub.o: taddsub.cc ../../config/include/dcmtk/config/osconfig.h \
- ../include/dcmtk/ofstd/oftest.h ../include/dcmtk/ofstd/ofconapp.h \
- ../include/dcmtk/ofstd/oftypes.h ../include/dcmtk/ofstd/ofdefine.h \
- ../include/dcmtk/ofstd/ofcast.h ../include/dcmtk/ofstd/ofexport.h \
- ../include/dcmtk/ofstd/ofstdinc.h ../include/dcmtk/ofstd/ofstream.h \
- ../include/dcmtk/ofstd/ofcmdln.h ../include/dcmtk/ofstd/oflist.h \
- ../include/dcmtk/ofstd/ofstring.h ../include/dcmtk/ofstd/ofconsol.h \
- ../include/dcmtk/ofstd/ofthread.h ../include/dcmtk/ofstd/offile.h \
- ../include/dcmtk/ofstd/ofstd.h ../include/dcmtk/ofstd/oftraits.h \
- ../include/dcmtk/ofstd/ofcond.h ../include/dcmtk/ofstd/oflimits.h \
- ../../config/include/dcmtk/config/arith.h
tatof.o: tatof.cc ../../config/include/dcmtk/config/osconfig.h \
../include/dcmtk/ofstd/ofstd.h ../include/dcmtk/ofstd/oflist.h \
../include/dcmtk/ofstd/oftypes.h ../include/dcmtk/ofstd/ofdefine.h \
diff --git a/ofstd/tests/taddsub.cc b/ofstd/tests/taddsub.cc
deleted file mode 100644
index 7cec09a..0000000
--- a/ofstd/tests/taddsub.cc
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- *
- * Copyright (C) 2015, Open Connections GmbH
- * All rights reserved. See COPYRIGHT file for details.
- *
- * This software and supporting documentation were developed by
- *
- * OFFIS e.V.
- * R&D Division Health
- * Escherweg 2
- * D-26121 Oldenburg, Germany
- *
- *
- * Module: ofstd
- *
- * Author: Michael Onken
- *
- * Purpose: test program for safe subtraction and addition
- *
- */
-
-
-#include "dcmtk/config/osconfig.h" /* make sure OS specific configuration is included first */
-#define OFTEST_OFSTD_ONLY
-#include "dcmtk/ofstd/oftest.h"
-#include "dcmtk/ofstd/ofstd.h"
-
-
-OFTEST(ofstd_safeSubtractAndAdd)
-{
- // --------------- Subtraction ----------------
-
- unsigned int a = 1;
- unsigned int b = 2;
- // check whether underflow occurs (it should)
- OFCHECK(OFStandard::safeSubtract(a, b, a) == OFFalse);
- // check whether a has not been modified
- OFCHECK_EQUAL(a, 1);
-
- a = OFnumeric_limits<unsigned int>::max();
- b = OFnumeric_limits<unsigned int>::max()-1;
- // check whether no underflow occured (it shouldnt)
- OFCHECK(OFStandard::safeSubtract(a, b, a) == OFTrue);
- // check whether the result a was computed as expected
- OFCHECK_EQUAL(a, 1);
-
- // --------------- Addition ----------------
-
- a = OFnumeric_limits<unsigned int>::max()-1;
- b = OFnumeric_limits<unsigned int>::max()-1;
- // check whether overflow occured (it should)
- OFCHECK(OFStandard::safeAdd(a, b, a) == OFFalse);
- // check whether a has not been modified
- OFCHECK_EQUAL(a, OFnumeric_limits<unsigned int>::max()-1);
-
- b = 1; // a still equals max-1
- // check whether no overflow occured (it shouldnt)
- OFCHECK(OFStandard::safeAdd(a, b, a) == OFTrue);
- // check whether the result a was computed as expected.
- // dividing and then multiplying by 2 is required since max maybe be an
- // odd number so that max/2 is rounded to the floor number.
- OFCHECK_EQUAL(a, OFnumeric_limits<unsigned int>::max());
-}
diff --git a/ofstd/tests/tofstd.cc b/ofstd/tests/tofstd.cc
index 637e7f4..d8382c2 100644
--- a/ofstd/tests/tofstd.cc
+++ b/ofstd/tests/tofstd.cc
@@ -1,6 +1,6 @@
/*
*
- * Copyright (C) 2002-2015, OFFIS e.V.
+ * Copyright (C) 2002-2016, OFFIS e.V.
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation were developed by
@@ -257,7 +257,6 @@ OFTEST(ofstd_OFStandard_removeRootDirFromPathname)
OFCHECK(OFStandard::removeRootDirFromPathname(result, nullPtr, nullPtr).good());
}
-
OFTEST(ofstd_safeSubtractAndAdd)
{
// --------------- Subtraction ----------------
@@ -271,7 +270,7 @@ OFTEST(ofstd_safeSubtractAndAdd)
a = OFnumeric_limits<unsigned int>::max();
b = OFnumeric_limits<unsigned int>::max()-1;
- // check whether no underflow occured (it shouldnt)
+ // check whether no underflow occurred (it shouldn't)
OFCHECK(OFStandard::safeSubtract(a, b, a) == OFTrue);
// check whether the result a was computed as expected
OFCHECK_EQUAL(a, 1);
@@ -280,16 +279,16 @@ OFTEST(ofstd_safeSubtractAndAdd)
a = OFnumeric_limits<unsigned int>::max()-1;
b = OFnumeric_limits<unsigned int>::max()-1;
- // check whether overflow occured (it should)
+ // check whether overflow occurred (it should)
OFCHECK(OFStandard::safeAdd(a, b, a) == OFFalse);
// check whether a has not been modified
OFCHECK_EQUAL(a, OFnumeric_limits<unsigned int>::max()-1);
b = 1; // a still equals max-1
- // check whether no overflow occured (it shouldnt)
+ // check whether no overflow occurred (it shouldn't)
OFCHECK(OFStandard::safeAdd(a, b, a) == OFTrue);
// check whether the result a was computed as expected.
- // dividing and then multiplying by 2 is required since max may be be an
+ // dividing and then multiplying by 2 is required since max may be an
// odd number so that max/2 is rounded to the floor number.
OFCHECK_EQUAL(a, OFnumeric_limits<unsigned int>::max());
}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/dcmtk.git
More information about the debian-med-commit
mailing list