Author: malat Date: 2013-06-03 13:45:57 +0000 (Mon, 03 Jun 2013) New Revision: 13815
Modified: trunk/packages/dcmtk/branches/experimental/debian/patches/bug706062.patch trunk/packages/dcmtk/branches/experimental/debian/patches/series Log: Referenced SOP Class were missing from initial patch. Modified: trunk/packages/dcmtk/branches/experimental/debian/patches/bug706062.patch =================================================================== --- trunk/packages/dcmtk/branches/experimental/debian/patches/bug706062.patch 2013-06-03 10:12:47 UTC (rev 13814) +++ trunk/packages/dcmtk/branches/experimental/debian/patches/bug706062.patch 2013-06-03 13:45:57 UTC (rev 13815) @@ -4,9 +4,11 @@ Bug-Debian: http://bugs.debian.org/706062 Forwarded: not-needed ---- dcmtk-3.6.1~20121102.orig/dcmsr/docs/dsrdump.man -+++ dcmtk-3.6.1~20121102/dcmsr/docs/dsrdump.man -@@ -37,138 +37,152 @@ dsrfile-in DICOM SR input filename to b +Index: dcmtk-3.6.1~20121102/dcmsr/docs/dsrdump.man +=================================================================== +--- dcmtk-3.6.1~20121102.orig/dcmsr/docs/dsrdump.man 2013-06-03 15:44:37.132995688 +0200 ++++ dcmtk-3.6.1~20121102/dcmsr/docs/dsrdump.man 2013-06-03 15:44:53.572995504 +0200 +@@ -37,138 +37,152 @@ \subsection general_options general options \verbatim @@ -237,7 +239,7 @@ \endverbatim \section notes NOTES -@@ -255,6 +269,6 @@ It is an error if no data dictionary can +@@ -255,6 +269,6 @@ \section copyright COPYRIGHT @@ -245,8 +247,10 @@ +Copyright (C) 2000-2013 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany. */ ---- dcmtk-3.6.1~20121102.orig/dcmsr/apps/dsrdump.cc -+++ dcmtk-3.6.1~20121102/dcmsr/apps/dsrdump.cc +Index: dcmtk-3.6.1~20121102/dcmsr/apps/dsrdump.cc +=================================================================== +--- dcmtk-3.6.1~20121102.orig/dcmsr/apps/dsrdump.cc 2013-06-03 15:44:37.160995688 +0200 ++++ dcmtk-3.6.1~20121102/dcmsr/apps/dsrdump.cc 2013-06-03 15:44:53.572995504 +0200 @@ -1,6 +1,6 @@ /* * @@ -255,7 +259,7 @@ * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by -@@ -121,7 +121,7 @@ static OFCondition dumpFile(STD_NAMESPAC +@@ -121,7 +121,7 @@ } @@ -264,7 +268,7 @@ #define LONGCOL 22 -@@ -142,50 +142,55 @@ int main(int argc, char *argv[]) +@@ -142,50 +142,55 @@ cmd.addParam("dsrfile-in", "DICOM SR input filename to be dumped", OFCmdParam::PM_MultiMandatory); cmd.addGroup("general options:", LONGCOL, SHORTCOL + 2); @@ -349,7 +353,7 @@ #endif /* evaluate command line */ -@@ -288,6 +293,16 @@ int main(int argc, char *argv[]) +@@ -288,6 +293,16 @@ if (cmd.findOption("--print-instance-uid")) opt_printFlags |= DSRTypes::PF_printSOPInstanceUID; @@ -366,9 +370,11 @@ if (cmd.findOption("--print-all-codes")) opt_printFlags |= DSRTypes::PF_printAllCodes; if (cmd.findOption("--print-template-id")) ---- dcmtk-3.6.1~20121102.orig/dcmsr/include/dcmtk/dcmsr/dsrtypes.h -+++ dcmtk-3.6.1~20121102/dcmsr/include/dcmtk/dcmsr/dsrtypes.h -@@ -356,6 +356,12 @@ class DCMTK_DCMSR_EXPORT DSRTypes +Index: dcmtk-3.6.1~20121102/dcmsr/include/dcmtk/dcmsr/dsrtypes.h +=================================================================== +--- dcmtk-3.6.1~20121102.orig/dcmsr/include/dcmtk/dcmsr/dsrtypes.h 2013-06-03 15:44:37.208995688 +0200 ++++ dcmtk-3.6.1~20121102/dcmsr/include/dcmtk/dcmsr/dsrtypes.h 2013-06-03 15:44:53.572995504 +0200 +@@ -356,6 +356,12 @@ /// use ANSI escape codes for output static const size_t PF_useANSIEscapeCodes; @@ -381,8 +387,10 @@ /// shortcut: print all codes static const size_t PF_printAllCodes; //@} ---- dcmtk-3.6.1~20121102.orig/dcmsr/libsrc/dsrcomvl.cc -+++ dcmtk-3.6.1~20121102/dcmsr/libsrc/dsrcomvl.cc +Index: dcmtk-3.6.1~20121102/dcmsr/libsrc/dsrcomvl.cc +=================================================================== +--- dcmtk-3.6.1~20121102.orig/dcmsr/libsrc/dsrcomvl.cc 2013-06-03 15:44:37.244995687 +0200 ++++ dcmtk-3.6.1~20121102/dcmsr/libsrc/dsrcomvl.cc 2013-06-03 15:44:53.572995504 +0200 @@ -1,6 +1,6 @@ /* * @@ -391,7 +399,7 @@ * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by -@@ -90,13 +90,18 @@ OFBool DSRCompositeReferenceValue::isEmp +@@ -90,13 +90,18 @@ OFCondition DSRCompositeReferenceValue::print(STD_NAMESPACE ostream &stream, const size_t flags) const { @@ -417,8 +425,10 @@ if (flags & DSRTypes::PF_printSOPInstanceUID) stream << "\"" << SOPInstanceUID << "\""; stream << ")"; ---- dcmtk-3.6.1~20121102.orig/dcmsr/libsrc/dsrimgvl.cc -+++ dcmtk-3.6.1~20121102/dcmsr/libsrc/dsrimgvl.cc +Index: dcmtk-3.6.1~20121102/dcmsr/libsrc/dsrimgvl.cc +=================================================================== +--- dcmtk-3.6.1~20121102.orig/dcmsr/libsrc/dsrimgvl.cc 2013-06-03 15:44:37.280995687 +0200 ++++ dcmtk-3.6.1~20121102/dcmsr/libsrc/dsrimgvl.cc 2013-06-03 15:44:53.576995504 +0200 @@ -1,6 +1,6 @@ /* * @@ -427,7 +437,7 @@ * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by -@@ -134,21 +134,36 @@ OFBool DSRImageReferenceValue::isShort(c +@@ -134,28 +134,58 @@ OFCondition DSRImageReferenceValue::print(STD_NAMESPACE ostream &stream, const size_t flags) const { @@ -470,10 +480,39 @@ + /* print information on presentation state (if present) */ if (PresentationState.isValid()) { - const DSRTypes::E_PresentationStateType pstateType = DSRTypes::sopClassUIDToPresentationStateType(PresentationState.getSOPClassUID()); ---- dcmtk-3.6.1~20121102.orig/dcmsr/libsrc/dsrtypes.cc -+++ dcmtk-3.6.1~20121102/dcmsr/libsrc/dsrtypes.cc -@@ -133,6 +133,9 @@ const size_t DSRTypes::PF_printConceptNa +- const DSRTypes::E_PresentationStateType pstateType = DSRTypes::sopClassUIDToPresentationStateType(PresentationState.getSOPClassUID()); +- if (pstateType != DSRTypes::PT_invalid) +- stream << ",(" << DSRTypes::presentationStateTypeToShortName(pstateType) << ","; +- else +- stream << ",(" << PresentationState.getSOPClassUID() << ","; ++ /* first, determine SOP class component */ ++ OFString pstateClassString = "\"" + PresentationState.getSOPClassUID() + "\""; ++ if (!(flags & DSRTypes::PF_printSOPClassUID)) ++ { ++ if (flags & DSRTypes::PF_printLongSOPClassName) ++ { ++ /* look up name of known SOP classes */ ++ const char *className = dcmFindNameOfUID(PresentationState.getSOPClassUID().c_str()); ++ if (className != NULL) ++ pstateClassString = className; ++ } else { ++ /* create short name for presentation state, e.g. "GSPS" */ ++ const DSRTypes::E_PresentationStateType pstateType = DSRTypes::sopClassUIDToPresentationStateType(PresentationState.getSOPClassUID()); ++ if (pstateType != DSRTypes::PT_invalid) ++ pstateClassString = DSRTypes::presentationStateTypeToShortName(pstateType); ++ } ++ } ++ /* and, then print it */ ++ stream << ",(" << pstateClassString << ","; ++ /* also print SOP instance component (if desired) */ + if (flags & DSRTypes::PF_printSOPInstanceUID) + stream << "\"" << PresentationState.getSOPInstanceUID() << "\""; + stream << ")"; +Index: dcmtk-3.6.1~20121102/dcmsr/libsrc/dsrtypes.cc +=================================================================== +--- dcmtk-3.6.1~20121102.orig/dcmsr/libsrc/dsrtypes.cc 2013-06-03 15:44:37.308995687 +0200 ++++ dcmtk-3.6.1~20121102/dcmsr/libsrc/dsrtypes.cc 2013-06-03 15:44:53.576995504 +0200 +@@ -133,6 +133,9 @@ const size_t DSRTypes::PF_printNoDocumentHeader = 1 << 4; const size_t DSRTypes::PF_printTemplateIdentification = 1 << 5; const size_t DSRTypes::PF_useANSIEscapeCodes = 1 << 6; @@ -483,8 +522,10 @@ const size_t DSRTypes::PF_printAllCodes = DSRTypes::PF_printConceptNameCodes; /* checkByReferenceRelationships modes */ ---- dcmtk-3.6.1~20121102.orig/dcmsr/libsrc/dsrwavvl.cc -+++ dcmtk-3.6.1~20121102/dcmsr/libsrc/dsrwavvl.cc +Index: dcmtk-3.6.1~20121102/dcmsr/libsrc/dsrwavvl.cc +=================================================================== +--- dcmtk-3.6.1~20121102.orig/dcmsr/libsrc/dsrwavvl.cc 2013-06-03 15:44:37.352995686 +0200 ++++ dcmtk-3.6.1~20121102/dcmsr/libsrc/dsrwavvl.cc 2013-06-03 15:44:53.576995504 +0200 @@ -1,6 +1,6 @@ /* * @@ -493,7 +534,7 @@ * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by -@@ -83,15 +83,21 @@ OFBool DSRWaveformReferenceValue::isShor +@@ -83,15 +83,21 @@ OFCondition DSRWaveformReferenceValue::print(STD_NAMESPACE ostream &stream, const size_t flags) const { Modified: trunk/packages/dcmtk/branches/experimental/debian/patches/series =================================================================== --- trunk/packages/dcmtk/branches/experimental/debian/patches/series 2013-06-03 10:12:47 UTC (rev 13814) +++ trunk/packages/dcmtk/branches/experimental/debian/patches/series 2013-06-03 13:45:57 UTC (rev 13815) @@ -2,7 +2,7 @@ 02_dcmtk_3.6.0-1.patch 07_doxygen.patch prefs.patch -bug706062.patch system_charls.patch datadic_install.patch debian_iconv.patch +bug706062.patch _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
