Author: malat Date: 2013-11-22 19:10:10 +0000 (Fri, 22 Nov 2013) New Revision: 15251
Removed: trunk/packages/dcmtk/branches/experimental/debian/patches/bufoverflow.patch trunk/packages/dcmtk/branches/experimental/debian/patches/bug706062.patch trunk/packages/dcmtk/branches/experimental/debian/patches/fixlog.patch Modified: trunk/packages/dcmtk/branches/experimental/debian/changelog trunk/packages/dcmtk/branches/experimental/debian/patches/07_doxygen.patch trunk/packages/dcmtk/branches/experimental/debian/patches/debian_iconv.patch trunk/packages/dcmtk/branches/experimental/debian/patches/series trunk/packages/dcmtk/branches/experimental/debian/patches/system_charls.patch Log: New snapshot Modified: trunk/packages/dcmtk/branches/experimental/debian/changelog =================================================================== --- trunk/packages/dcmtk/branches/experimental/debian/changelog 2013-11-22 18:56:00 UTC (rev 15250) +++ trunk/packages/dcmtk/branches/experimental/debian/changelog 2013-11-22 19:10:10 UTC (rev 15251) @@ -1,3 +1,10 @@ +dcmtk (3.6.1~20131114-1) experimental; urgency=low + + * New snapshot. Closes: #723091, #715039 + * Refresh patches + + -- Mathieu Malaterre <ma...@debian.org> Fri, 22 Nov 2013 19:55:25 +0100 + dcmtk (3.6.1~20121102-5) experimental; urgency=low * Fix jquery.js removal when executing build-indep Modified: trunk/packages/dcmtk/branches/experimental/debian/patches/07_doxygen.patch =================================================================== --- trunk/packages/dcmtk/branches/experimental/debian/patches/07_doxygen.patch 2013-11-22 18:56:00 UTC (rev 15250) +++ trunk/packages/dcmtk/branches/experimental/debian/patches/07_doxygen.patch 2013-11-22 19:10:10 UTC (rev 15251) @@ -2,11 +2,11 @@ Author: Mathieu Malaterre <ma...@debian.org> Forwarded: not-needed -Index: dcmtk-3.6.1_20121102/doxygen/htmldocs.cfg +Index: dcmtk-3.6.1_20131114/doxygen/htmldocs.cfg =================================================================== ---- dcmtk-3.6.1_20121102.orig/doxygen/htmldocs.cfg 2013-04-22 10:21:05.600738290 +0200 -+++ dcmtk-3.6.1_20121102/doxygen/htmldocs.cfg 2013-04-22 10:32:35.600730520 +0200 -@@ -1582,7 +1582,7 @@ +--- dcmtk-3.6.1_20131114.orig/doxygen/htmldocs.cfg 2013-11-14 15:44:42.000000000 +0100 ++++ dcmtk-3.6.1_20131114/doxygen/htmldocs.cfg 2013-11-22 19:55:54.838242068 +0100 +@@ -1609,7 +1609,7 @@ # toolkit from AT&T and Lucent Bell Labs. The other options in this section # have no effect if this option is set to NO (the default) @@ -15,7 +15,7 @@ # The DOT_NUM_THREADS specifies the number of dot invocations doxygen is # allowed to run in parallel. When set to 0 (the default) doxygen will -@@ -1690,7 +1690,7 @@ +@@ -1726,7 +1726,7 @@ # HTML_FILE_EXTENSION to xhtml in order to make the SVG files # visible in IE 9+ (other browsers do not have this requirement). Deleted: trunk/packages/dcmtk/branches/experimental/debian/patches/bufoverflow.patch =================================================================== --- trunk/packages/dcmtk/branches/experimental/debian/patches/bufoverflow.patch 2013-11-22 18:56:00 UTC (rev 15250) +++ trunk/packages/dcmtk/branches/experimental/debian/patches/bufoverflow.patch 2013-11-22 19:10:10 UTC (rev 15251) @@ -1,24 +0,0 @@ -From c8423ab1fcf0273061462697b8eca56f894984c7 Mon Sep 17 00:00:00 2001 -From: Michael Onken <di...@offis.de> -Date: Fri, 5 Jul 2013 17:24:56 +0200 -Subject: [PATCH] Fixed too small buffer for UID in Q/R server. - -Thanks to Mathieu Malaterre for the report and fix. ---- - CHANGES.361 | 6 ++++++ - dcmqrdb/include/dcmtk/dcmqrdb/dcmqridx.h | 2 +- - 2 files changed, 7 insertions(+), 1 deletions(-) - -Index: dcmtk-3.6.1~20121102/dcmqrdb/include/dcmtk/dcmqrdb/dcmqridx.h -=================================================================== ---- dcmtk-3.6.1~20121102.orig/dcmqrdb/include/dcmtk/dcmqrdb/dcmqridx.h 2012-11-02 14:35:36.000000000 +0100 -+++ dcmtk-3.6.1~20121102/dcmqrdb/include/dcmtk/dcmqrdb/dcmqridx.h 2013-07-05 17:31:32.617794353 +0200 -@@ -237,7 +237,7 @@ - struct DCMTK_DCMQRDB_EXPORT StudyDescRecord - { - /// Study Instance UID of the study described by this record -- char StudyInstanceUID [UI_MAX_LENGTH] ; -+ char StudyInstanceUID [UI_MAX_LENGTH+1] ; - - /// combined size (in bytes) of all images of this study in the database - long StudySize ; Deleted: trunk/packages/dcmtk/branches/experimental/debian/patches/bug706062.patch =================================================================== --- trunk/packages/dcmtk/branches/experimental/debian/patches/bug706062.patch 2013-11-22 18:56:00 UTC (rev 15250) +++ trunk/packages/dcmtk/branches/experimental/debian/patches/bug706062.patch 2013-11-22 19:10:10 UTC (rev 15251) @@ -1,565 +0,0 @@ -Description: Use SOP Class UID print option -Author: Mathieu Malaterre <ma...@debian.org> -Origin: upstream -Bug-Debian: http://bugs.debian.org/706062 -Forwarded: not-needed - -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 -- -h --help -- print this help text and exit -+ -h --help -+ print this help text and exit - -- --version -- print version information and exit -+ --version -+ print version information and exit - -- --arguments -- print expanded command line arguments -+ --arguments -+ print expanded command line arguments - -- -q --quiet -- quiet mode, print no warnings and errors -+ -q --quiet -+ quiet mode, print no warnings and errors - -- -v --verbose -- verbose mode, print processing details -+ -v --verbose -+ verbose mode, print processing details - -- -d --debug -- debug mode, print debug information -+ -d --debug -+ debug mode, print debug information - -- -ll --log-level [l]evel: string constant -- (fatal, error, warn, info, debug, trace) -- use level l for the logger -+ -ll --log-level [l]evel: string constant -+ (fatal, error, warn, info, debug, trace) -+ use level l for the logger - -- -lc --log-config [f]ilename: string -- use config file f for the logger -+ -lc --log-config [f]ilename: string -+ use config file f for the logger - \endverbatim - - \subsection input_options input options - \verbatim - input file format: - -- +f --read-file -- read file format or data set (default) -+ +f --read-file -+ read file format or data set (default) - -- +fo --read-file-only -- read file format only -+ +fo --read-file-only -+ read file format only - -- -f --read-dataset -- read data set without file meta information -+ -f --read-dataset -+ read data set without file meta information - - input transfer syntax: - -- -t= --read-xfer-auto -- use TS recognition (default) -+ -t= --read-xfer-auto -+ use TS recognition (default) - -- -td --read-xfer-detect -- ignore TS specified in the file meta header -+ -td --read-xfer-detect -+ ignore TS specified in the file meta header - -- -te --read-xfer-little -- read with explicit VR little endian TS -+ -te --read-xfer-little -+ read with explicit VR little endian TS - -- -tb --read-xfer-big -- read with explicit VR big endian TS -+ -tb --read-xfer-big -+ read with explicit VR big endian TS - -- -ti --read-xfer-implicit -- read with implicit VR little endian TS -+ -ti --read-xfer-implicit -+ read with implicit VR little endian TS - \endverbatim - - \subsection processing_options processing options - \verbatim - additional information: - -- -Ip --processing-details -- show currently processed content item -+ -Ip --processing-details -+ show currently processed content item - - error handling: - -- -Er --unknown-relationship -- accept unknown/missing relationship type -+ -Er --unknown-relationship -+ accept unknown/missing relationship type - -- -Ev --invalid-item-value -- accept invalid content item value -- (e.g. violation of VR or VM definition) -- -- -Ec --ignore-constraints -- ignore relationship content constraints -- -- -Ee --ignore-item-errors -- do not abort on content item errors, just warn -- (e.g. missing value type specific attributes) -+ -Ev --invalid-item-value -+ accept invalid content item value -+ (e.g. violation of VR or VM definition) -+ -+ -Ec --ignore-constraints -+ ignore relationship content constraints -+ -+ -Ee --ignore-item-errors -+ do not abort on content item errors, just warn -+ (e.g. missing value type specific attributes) - -- -Ei --skip-invalid-items -- skip invalid content items (incl. sub-tree) -+ -Ei --skip-invalid-items -+ skip invalid content items (including sub-tree) - - specific character set: - -- +U8 --convert-to-utf8 -- convert all element values that are affected -- by Specific Character Set (0008,0005) to UTF-8 -+ +U8 --convert-to-utf8 -+ convert all element values that are affected -+ by Specific Character Set (0008,0005) to UTF-8 - -- # requires support from the libiconv toolkit -+ # requires support from the libiconv toolkit - \endverbatim - - \subsection output_options output options - \verbatim --printing: -+general printing: - -- +Pf --print-filename -- print header with filename for each document -+ +Pf --print-filename -+ print header with filename for each document - -- -Ph --no-document-header -- do not print general document information -+ -Ph --no-document-header -+ do not print general document information - -- +Pn --number-nested-items -- print position string in front of each line -+ +Pn --number-nested-items -+ print position string in front of each line - -- -Pn --indent-nested-items -- indent nested items by spaces (default) -+ -Pn --indent-nested-items -+ indent nested items by spaces (default) - -- +Pl --print-long-values -- print long item values completely -+printing values: - -- -Pl --shorten-long-values -- print long item values shortened (default) -+ +Pl --print-long-values -+ print long item values completely - -- +Pu --print-instance-uid -- print SOP instance UID of referenced objects -+ -Pl --shorten-long-values -+ print long item values shortened (default) - -- +Pc --print-all-codes -- print all codes (incl. concept name codes) -+ +Pu --print-instance-uid -+ print SOP instance UID of referenced objects - -- +Pt --print-template-id -- print template identification information -+ -Ps --print-sopclass-short -+ print short SOP class name of referenced image objects, -+ e.g. "CT image" (default) - -- +C --print-color -- use ANSI escape codes for colored output -+ +Ps --print-sopclass-long -+ print long SOP class name of referenced objects - -- # not available on Windows systems -+ +Psu --print-sopclass-uid -+ print SOP class UID of referenced objects - -- -C --no-color -- do not use any ANSI escape codes (default) -+ +Pc --print-all-codes -+ print all codes (including concept name codes) - -- # not available on Windows systems -+ +Pt --print-template-id -+ print template identification information -+ -+color: -+ -+ +C --print-color -+ use ANSI escape codes for colored output -+ -+ # not available on Windows systems -+ -+ -C --no-color -+ do not use any ANSI escape codes (default) -+ -+ # not available on Windows systems - \endverbatim - - \section notes NOTES -@@ -255,6 +269,6 @@ - - \section copyright COPYRIGHT - --Copyright (C) 2000-2011 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany. -+Copyright (C) 2000-2013 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany. - - */ -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 @@ - /* - * -- * Copyright (C) 2000-2012, OFFIS e.V. -+ * Copyright (C) 2000-2013, OFFIS e.V. - * All rights reserved. See COPYRIGHT file for details. - * - * This software and supporting documentation were developed by -@@ -121,7 +121,7 @@ - } - - --#define SHORTCOL 3 -+#define SHORTCOL 4 - #define LONGCOL 22 - - -@@ -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); -- cmd.addOption("--help", "-h", "print this help text and exit", OFCommandLine::AF_Exclusive); -- cmd.addOption("--version", "print version information and exit", OFCommandLine::AF_Exclusive); -+ cmd.addOption("--help", "-h", "print this help text and exit", OFCommandLine::AF_Exclusive); -+ cmd.addOption("--version", "print version information and exit", OFCommandLine::AF_Exclusive); - OFLog::addOptions(cmd); - - cmd.addGroup("input options:"); - cmd.addSubGroup("input file format:"); -- cmd.addOption("--read-file", "+f", "read file format or data set (default)"); -- cmd.addOption("--read-file-only", "+fo", "read file format only"); -- cmd.addOption("--read-dataset", "-f", "read data set without file meta information"); -+ cmd.addOption("--read-file", "+f", "read file format or data set (default)"); -+ cmd.addOption("--read-file-only", "+fo", "read file format only"); -+ cmd.addOption("--read-dataset", "-f", "read data set without file meta information"); - cmd.addSubGroup("input transfer syntax:"); -- cmd.addOption("--read-xfer-auto", "-t=", "use TS recognition (default)"); -- cmd.addOption("--read-xfer-detect", "-td", "ignore TS specified in the file meta header"); -- cmd.addOption("--read-xfer-little", "-te", "read with explicit VR little endian TS"); -- cmd.addOption("--read-xfer-big", "-tb", "read with explicit VR big endian TS"); -- cmd.addOption("--read-xfer-implicit", "-ti", "read with implicit VR little endian TS"); -+ cmd.addOption("--read-xfer-auto", "-t=", "use TS recognition (default)"); -+ cmd.addOption("--read-xfer-detect", "-td", "ignore TS specified in the file meta header"); -+ cmd.addOption("--read-xfer-little", "-te", "read with explicit VR little endian TS"); -+ cmd.addOption("--read-xfer-big", "-tb", "read with explicit VR big endian TS"); -+ cmd.addOption("--read-xfer-implicit", "-ti", "read with implicit VR little endian TS"); - - cmd.addGroup("processing options:"); - cmd.addSubGroup("additional information:"); -- cmd.addOption("--processing-details", "-Ip", "show currently processed content item"); -+ cmd.addOption("--processing-details", "-Ip", "show currently processed content item"); - cmd.addSubGroup("error handling:"); -- cmd.addOption("--unknown-relationship", "-Er", "accept unknown/missing relationship type"); -- cmd.addOption("--invalid-item-value", "-Ev", "accept invalid content item value\n(e.g. violation of VR or VM definition)"); -- cmd.addOption("--ignore-constraints", "-Ec", "ignore relationship content constraints"); -- cmd.addOption("--ignore-item-errors", "-Ee", "do not abort on content item errors, just warn\n(e.g. missing value type specific attributes)"); -- cmd.addOption("--skip-invalid-items", "-Ei", "skip invalid content items (incl. sub-tree)"); -+ cmd.addOption("--unknown-relationship", "-Er", "accept unknown/missing relationship type"); -+ cmd.addOption("--invalid-item-value", "-Ev", "accept invalid content item value\n(e.g. violation of VR or VM definition)"); -+ cmd.addOption("--ignore-constraints", "-Ec", "ignore relationship content constraints"); -+ cmd.addOption("--ignore-item-errors", "-Ee", "do not abort on content item errors, just warn\n(e.g. missing value type specific attributes)"); -+ cmd.addOption("--skip-invalid-items", "-Ei", "skip invalid content items (incl. sub-tree)"); - #ifdef WITH_LIBICONV - cmd.addSubGroup("specific character set:"); -- cmd.addOption("--convert-to-utf8", "+U8", "convert all element values that are affected\nby Specific Character Set (0008,0005) to UTF-8"); -+ cmd.addOption("--convert-to-utf8", "+U8", "convert all element values that are affected\nby Specific Character Set (0008,0005) to UTF-8"); - #endif - - cmd.addGroup("output options:"); -- cmd.addSubGroup("printing:"); -- cmd.addOption("--print-filename", "+Pf", "print header with filename for each document"); -- cmd.addOption("--no-document-header", "-Ph", "do not print general document information"); -- cmd.addOption("--number-nested-items", "+Pn", "print position string in front of each line"); -- cmd.addOption("--indent-nested-items", "-Pn", "indent nested items by spaces (default)"); -- cmd.addOption("--print-long-values", "+Pl", "print long item values completely"); -- cmd.addOption("--shorten-long-values", "-Pl", "print long item values shortened (default)"); -- cmd.addOption("--print-instance-uid", "+Pu", "print SOP instance UID of referenced objects"); -- cmd.addOption("--print-all-codes", "+Pc", "print all codes (incl. concept name codes)"); -- cmd.addOption("--print-template-id", "+Pt", "print template identification information"); -+ cmd.addSubGroup("general printing:"); -+ cmd.addOption("--print-filename", "+Pf", "print header with filename for each document"); -+ cmd.addOption("--no-document-header", "-Ph", "do not print general document information"); -+ cmd.addOption("--number-nested-items", "+Pn", "print position string in front of each line"); -+ cmd.addOption("--indent-nested-items", "-Pn", "indent nested items by spaces (default)"); -+ cmd.addSubGroup("printing values:"); -+ cmd.addOption("--print-long-values", "+Pl", "print long item values completely"); -+ cmd.addOption("--shorten-long-values", "-Pl", "print long item values shortened (default)"); -+ cmd.addOption("--print-instance-uid", "+Pu", "print SOP instance UID of referenced objects"); -+ cmd.addOption("--print-sopclass-short", "-Ps", "print short SOP class name of referenced\nimage objects, e.g. \"CT image\" (default)"); -+ cmd.addOption("--print-sopclass-long", "+Ps", "print long SOP class name of ref. objects"); -+ cmd.addOption("--print-sopclass-uid", "+Psu", "print SOP class UID of referenced objects"); -+ cmd.addOption("--print-all-codes", "+Pc", "print all codes (incl. concept name codes)"); -+ cmd.addOption("--print-template-id", "+Pt", "print template identification information"); - #ifdef ANSI_ESCAPE_CODES_AVAILABLE -- cmd.addOption("--print-color", "+C", "use ANSI escape codes for colored output"); -- cmd.addOption("--no-color", "-C", "do not use any ANSI escape codes (default)"); -+ cmd.addSubGroup("color:"); -+ cmd.addOption("--print-color", "+C", "use ANSI escape codes for colored output"); -+ cmd.addOption("--no-color", "-C", "do not use any ANSI escape codes (default)"); - #endif - - /* evaluate command line */ -@@ -288,6 +293,16 @@ - - if (cmd.findOption("--print-instance-uid")) - opt_printFlags |= DSRTypes::PF_printSOPInstanceUID; -+ -+ cmd.beginOptionBlock(); -+ if (cmd.findOption("--print-sopclass-short")) -+ opt_printFlags = (opt_printFlags & ~(DSRTypes::PF_printLongSOPClassName | DSRTypes::PF_printSOPClassUID)); -+ if (cmd.findOption("--print-sopclass-long")) -+ opt_printFlags = (opt_printFlags & ~DSRTypes::PF_printSOPClassUID) | DSRTypes::PF_printLongSOPClassName; -+ if (cmd.findOption("--print-sopclass-uid")) -+ opt_printFlags = (opt_printFlags & ~DSRTypes::PF_printLongSOPClassName) | DSRTypes::PF_printSOPClassUID; -+ cmd.endOptionBlock(); -+ - if (cmd.findOption("--print-all-codes")) - opt_printFlags |= DSRTypes::PF_printAllCodes; - if (cmd.findOption("--print-template-id")) -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; - -+ /// print long SOP class name of referenced objects (default: short name for images) -+ static const size_t PF_printLongSOPClassName; -+ -+ /// print SOP class UID of referenced objects (instead of the name) -+ static const size_t PF_printSOPClassUID; -+ - /// shortcut: print all codes - static const size_t PF_printAllCodes; - //@} -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 @@ - /* - * -- * Copyright (C) 2000-2012, OFFIS e.V. -+ * Copyright (C) 2000-2013, OFFIS e.V. - * All rights reserved. See COPYRIGHT file for details. - * - * This software and supporting documentation were developed by -@@ -90,13 +90,18 @@ - OFCondition DSRCompositeReferenceValue::print(STD_NAMESPACE ostream &stream, - const size_t flags) const - { -- const char *className = dcmFindNameOfUID(SOPClassUID.c_str()); -- stream << "("; -- if (className != NULL) -- stream << className; -- else -- stream << "\"" << SOPClassUID << "\""; -- stream << ","; -+ /* first, determine SOP class component */ -+ OFString sopClassString = "\"" + SOPClassUID + "\""; -+ if (!(flags & DSRTypes::PF_printSOPClassUID)) -+ { -+ /* look up name of known SOP classes */ -+ const char *className = dcmFindNameOfUID(SOPClassUID.c_str()); -+ if (className != NULL) -+ sopClassString = className; -+ } -+ /* and then, print it */ -+ stream << "(" << sopClassString << ","; -+ /* print SOP instance component (if desired) */ - if (flags & DSRTypes::PF_printSOPInstanceUID) - stream << "\"" << SOPInstanceUID << "\""; - stream << ")"; -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 @@ - /* - * -- * Copyright (C) 2000-2012, OFFIS e.V. -+ * Copyright (C) 2000-2013, OFFIS e.V. - * All rights reserved. See COPYRIGHT file for details. - * - * This software and supporting documentation were developed by -@@ -134,28 +134,58 @@ - OFCondition DSRImageReferenceValue::print(STD_NAMESPACE ostream &stream, - const size_t flags) const - { -- const char *modality = dcmSOPClassUIDToModality(SOPClassUID.c_str()); -- stream << "("; -- if (modality != NULL) -- stream << modality << " image"; -- else -- stream << "\"" << SOPClassUID << "\""; -- stream << ","; -+ /* first, determine SOP class component */ -+ OFString sopClassString = "\"" + SOPClassUID + "\""; -+ if (!(flags & DSRTypes::PF_printSOPClassUID)) -+ { -+ if (flags & DSRTypes::PF_printLongSOPClassName) -+ { -+ /* look up name of known SOP classes */ -+ const char *className = dcmFindNameOfUID(SOPClassUID.c_str()); -+ if (className != NULL) -+ sopClassString = className; -+ } else { -+ /* create short name for SOP class, e.g. "CT image" */ -+ const char *modality = dcmSOPClassUIDToModality(SOPClassUID.c_str()); -+ if (modality != NULL) -+ sopClassString = OFString(modality) + " image"; -+ } -+ } -+ /* and then, print it */ -+ stream << "(" << sopClassString << ","; -+ /* print SOP instance component (if desired) */ - if (flags & DSRTypes::PF_printSOPInstanceUID) - stream << "\"" << SOPInstanceUID << "\""; -+ /* print frame list (if present) */ - if (!FrameList.isEmpty()) - { - stream << ","; - FrameList.print(stream, flags); - } - stream << ")"; -+ /* print information on presentation state (if present) */ - if (PresentationState.isValid()) - { -- 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; -+const size_t DSRTypes::PF_printLongSOPClassName = 1 << 7; -+const size_t DSRTypes::PF_printSOPClassUID = 1 << 8; -+/* shortcuts */ - const size_t DSRTypes::PF_printAllCodes = DSRTypes::PF_printConceptNameCodes; - - /* checkByReferenceRelationships modes */ -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 @@ - /* - * -- * Copyright (C) 2000-2012, OFFIS e.V. -+ * Copyright (C) 2000-2013, OFFIS e.V. - * All rights reserved. See COPYRIGHT file for details. - * - * This software and supporting documentation were developed by -@@ -83,15 +83,21 @@ - OFCondition DSRWaveformReferenceValue::print(STD_NAMESPACE ostream &stream, - const size_t flags) const - { -- const char *className = dcmFindNameOfUID(SOPClassUID.c_str()); -- stream << "("; -- if (className != NULL) -- stream << className; -- else -- stream << "\"" << SOPClassUID << "\""; -- stream << ","; -+ /* first, determine SOP class component */ -+ OFString sopClassString = "\"" + SOPClassUID + "\""; -+ if (!(flags & DSRTypes::PF_printSOPClassUID)) -+ { -+ /* look up name of known SOP classes */ -+ const char *className = dcmFindNameOfUID(SOPClassUID.c_str()); -+ if (className != NULL) -+ sopClassString = className; -+ } -+ /* and then, print it */ -+ stream << "(" << sopClassString << ","; -+ /* print SOP instance component (if desired) */ - if (flags & DSRTypes::PF_printSOPInstanceUID) - stream << "\"" << SOPInstanceUID << "\""; -+ /* print channel list (if present) */ - if (!ChannelList.isEmpty()) - { - stream << ","; Modified: trunk/packages/dcmtk/branches/experimental/debian/patches/debian_iconv.patch =================================================================== --- trunk/packages/dcmtk/branches/experimental/debian/patches/debian_iconv.patch 2013-11-22 18:56:00 UTC (rev 15250) +++ trunk/packages/dcmtk/branches/experimental/debian/patches/debian_iconv.patch 2013-11-22 19:10:10 UTC (rev 15251) @@ -8,10 +8,10 @@ Bug-Debian: http://bugs.debian.org/701802 Forwarded: yes -Index: dcmtk-3.6.1~20121102/CMake/FindICONV.cmake +Index: dcmtk-3.6.1_20131114/CMake/FindICONV.cmake =================================================================== ---- dcmtk-3.6.1~20121102.orig/CMake/FindICONV.cmake 2013-05-31 18:30:43.879801824 +0200 -+++ dcmtk-3.6.1~20121102/CMake/FindICONV.cmake 2013-05-31 18:30:51.411801741 +0200 +--- dcmtk-3.6.1_20131114.orig/CMake/FindICONV.cmake 2013-11-14 15:08:01.000000000 +0100 ++++ dcmtk-3.6.1_20131114/CMake/FindICONV.cmake 2013-11-22 19:56:09.278241875 +0100 @@ -14,11 +14,12 @@ MARK_AS_ADVANCED(LIBICONV_INCLUDE_DIR) @@ -29,10 +29,10 @@ # Copy the result to output variables IF(LIBICONV_FOUND) -Index: dcmtk-3.6.1~20121102/CMake/FindCharset.cmake +Index: dcmtk-3.6.1_20131114/CMake/FindCharset.cmake =================================================================== ---- dcmtk-3.6.1~20121102.orig/CMake/FindCharset.cmake 2013-05-31 18:30:43.891801824 +0200 -+++ dcmtk-3.6.1~20121102/CMake/FindCharset.cmake 2013-05-31 18:30:51.411801741 +0200 +--- dcmtk-3.6.1_20131114.orig/CMake/FindCharset.cmake 2013-11-14 15:08:01.000000000 +0100 ++++ dcmtk-3.6.1_20131114/CMake/FindCharset.cmake 2013-11-22 19:56:09.278241875 +0100 @@ -7,10 +7,14 @@ INCLUDE(FindPackageHandleStandardArgs) @@ -50,10 +50,10 @@ FIND_LIBRARY(LIBCHARSET_LIBRARY NAMES ${LIBCHARSET_LIBS}) MARK_AS_ADVANCED(LIBCHARSET_LIBRARY) -Index: dcmtk-3.6.1~20121102/ofstd/libsrc/ofchrenc.cc +Index: dcmtk-3.6.1_20131114/ofstd/libsrc/ofchrenc.cc =================================================================== ---- dcmtk-3.6.1~20121102.orig/ofstd/libsrc/ofchrenc.cc 2013-05-31 18:30:43.907801824 +0200 -+++ dcmtk-3.6.1~20121102/ofstd/libsrc/ofchrenc.cc 2013-05-31 18:30:51.411801741 +0200 +--- dcmtk-3.6.1_20131114.orig/ofstd/libsrc/ofchrenc.cc 2013-11-14 15:08:01.000000000 +0100 ++++ dcmtk-3.6.1_20131114/ofstd/libsrc/ofchrenc.cc 2013-11-22 19:56:09.278241875 +0100 @@ -28,6 +28,9 @@ #ifdef WITH_LIBICONV #include <iconv.h> @@ -72,11 +72,11 @@ sprintf(buf, "%i.%i", (_libiconv_version >> 8), (_libiconv_version & 0xff)); versionStr.append(buf); return versionStr; -Index: dcmtk-3.6.1~20121102/dcmdata/libsrc/dcspchrs.cc +Index: dcmtk-3.6.1_20131114/dcmdata/libsrc/dcspchrs.cc =================================================================== ---- dcmtk-3.6.1~20121102.orig/dcmdata/libsrc/dcspchrs.cc 2013-05-31 18:30:57.899801668 +0200 -+++ dcmtk-3.6.1~20121102/dcmdata/libsrc/dcspchrs.cc 2013-05-31 18:31:33.095801270 +0200 -@@ -674,8 +674,9 @@ +--- dcmtk-3.6.1_20131114.orig/dcmdata/libsrc/dcspchrs.cc 2013-11-14 15:08:01.000000000 +0100 ++++ dcmtk-3.6.1_20131114/dcmdata/libsrc/dcspchrs.cc 2013-11-22 19:56:09.278241875 +0100 +@@ -710,8 +710,9 @@ OFBool DcmSpecificCharacterSet::isConversionLibraryAvailable() { Deleted: trunk/packages/dcmtk/branches/experimental/debian/patches/fixlog.patch =================================================================== --- trunk/packages/dcmtk/branches/experimental/debian/patches/fixlog.patch 2013-11-22 18:56:00 UTC (rev 15250) +++ trunk/packages/dcmtk/branches/experimental/debian/patches/fixlog.patch 2013-11-22 19:10:10 UTC (rev 15251) @@ -1,119 +0,0 @@ -From 6fe9adc72bcb9a1ac9202efa9e8f4065ebf40220 Mon Sep 17 00:00:00 2001 -From: Joerg Riesmeier <di...@jriesmeier.com> -Date: Fri, 12 Jul 2013 18:02:26 +0200 -Subject: [PATCH] Fixed issue with misplaced log output. - -This output caused the use of an uninitialized variable ("req"). ---- - CHANGES.361 | 30 +++++++++++++++++++----------- - dcmnet/apps/movescu.cc | 20 ++++++++++---------- - 2 files changed, 29 insertions(+), 21 deletions(-) - -Index: dcmtk-3.6.1~20121102/CHANGES.361 -=================================================================== ---- dcmtk-3.6.1~20121102.orig/CHANGES.361 2012-11-02 14:35:36.000000000 +0100 -+++ dcmtk-3.6.1~20121102/CHANGES.361 2013-09-02 11:07:17.463685439 +0200 -@@ -524,14 +524,14 @@ - - Fixed some minor inconsistencies between the data dictionary and part 6 of - the DICOM standard. This mainly affects the spelling of the attribute names. - Also added some tags that were missing because they are not used in part 3. -- Thanks Mathieu Malaterre <mathieu.malate...@gmail.com> for the report. -+ Thanks to Mathieu Malaterre <mathieu.malate...@gmail.com> for the report. - Affects: dcmdata/data/dicom.dic - dcmdata/include/dcmtk/dcmdata/dcdeftag.h - dcmdata/libsrc/dcdictzz.cc - dcmnet/libsrc/dimcmd.cc - - - Fixed wrong attribute tags for Row/ColumnPositionInTotalImagePixelMatrix. -- Thanks Mathieu Malaterre <mathieu.malate...@gmail.com> for the report. -+ Thanks to Mathieu Malaterre <mathieu.malate...@gmail.com> for the report. - Affects: dcmdata/data/dicom.dic - dcmdata/include/dcmtk/dcmdata/dcdeftag.h - dcmdata/libsrc/dcdictzz.cc -@@ -900,7 +900,7 @@ - - - Fixed wrong output format of pixel sequence elements for the DICOM Native - Model (according to PS 3.19). -- Thanks Mathieu Malaterre <mathieu.malate...@gmail.com> for the report. -+ Thanks to Mathieu Malaterre <mathieu.malate...@gmail.com> for the report. - Affects: dcmdata/include/dcmtk/dcmdata/dcpixseq.h - dcmdata/libsrc/dcpixseq.cc - -@@ -908,13 +908,13 @@ - - - Fixed wrong attribute name of BulkData element: According to the XML Schema - in PS 3.19, the name for the UUID reference is "uuid" and not "UUID". -- Thanks Mathieu Malaterre <mathieu.malate...@gmail.com> for the report. -+ Thanks to Mathieu Malaterre <mathieu.malate...@gmail.com> for the report. - Affects: dcmdata/libsrc/dcvrobow.cc - dcmdata/libsrc/dcvrof.cc - - - Made sure that hexadecimal numbers of attribute tags are always printed in - uppercase for the Native Model (as required by the XML Schema in PS 3.19). -- Thanks Mathieu Malaterre <mathieu.malate...@gmail.com> for the report. -+ Thanks to Mathieu Malaterre <mathieu.malate...@gmail.com> for the report. - Affects: dcmdata/libsrc/dcelem.cc - - **** Changes from 2012.07.10 (riesmeier) -@@ -1064,7 +1064,7 @@ - **** Changes from 2012.07.03 (riesmeier) - - - Make sure that "??" is never used for an unknown VR in the XML output. -- Thanks Mathieu Malaterre <mathieu.malate...@gmail.com> for the report. -+ Thanks to Mathieu Malaterre <mathieu.malate...@gmail.com> for the report. - Affects: dcmdata/libsrc/dcelem.cc - dcmdata/libsrc/dcsequen.cc - -@@ -1129,7 +1129,7 @@ - Affects: dcmdata/libsrc/dcfilefo.cc - - - Fixed wrong error message for conflict check of option --write-binary-data. -- Thanks Mathieu Malaterre <mathieu.malate...@gmail.com> for the report. -+ Thanks to Mathieu Malaterre <mathieu.malate...@gmail.com> for the report. - Affects: dcmdata/apps/dcm2xml.cc - - **** Changes from 2012.06.29 (riesmeier) -Index: dcmtk-3.6.1~20121102/dcmnet/apps/movescu.cc -=================================================================== ---- dcmtk-3.6.1~20121102.orig/dcmnet/apps/movescu.cc 2012-11-02 14:35:36.000000000 +0100 -+++ dcmtk-3.6.1~20121102/dcmnet/apps/movescu.cc 2013-09-02 11:07:17.463685439 +0200 -@@ -1,6 +1,6 @@ - /* - * -- * Copyright (C) 1994-2012, OFFIS e.V. -+ * Copyright (C) 1994-2013, OFFIS e.V. - * All rights reserved. See COPYRIGHT file for details. - * - * This software and supporting documentation were developed by -@@ -1567,15 +1567,6 @@ - presId = ASC_findAcceptedPresentationContextID(assoc, sopClass); - if (presId == 0) return DIMSE_NOVALIDPRESENTATIONCONTEXTID; - -- if (movescuLogger.isEnabledFor(OFLogger::DEBUG_LOG_LEVEL)) -- { -- OFLOG_INFO(movescuLogger, "Sending Move Request"); -- OFLOG_DEBUG(movescuLogger, DIMSE_dumpMessage(temp_str, req, DIMSE_OUTGOING, NULL, presId)); -- } else { -- OFLOG_INFO(movescuLogger, "Sending Move Request (MsgID " << msgId << ")"); -- } -- OFLOG_INFO(movescuLogger, "Request Identifiers:" << OFendl << DcmObject::PrintHelper(*dcmff.getDataset())); -- - callbackData.assoc = assoc; - callbackData.presId = presId; - -@@ -1591,6 +1582,15 @@ - strcpy(req.MoveDestination, opt_moveDestination); - } - -+ if (movescuLogger.isEnabledFor(OFLogger::DEBUG_LOG_LEVEL)) -+ { -+ OFLOG_INFO(movescuLogger, "Sending Move Request"); -+ OFLOG_DEBUG(movescuLogger, DIMSE_dumpMessage(temp_str, req, DIMSE_OUTGOING, NULL, presId)); -+ } else { -+ OFLOG_INFO(movescuLogger, "Sending Move Request (MsgID " << msgId << ")"); -+ } -+ OFLOG_INFO(movescuLogger, "Request Identifiers:" << OFendl << DcmObject::PrintHelper(*dcmff.getDataset())); -+ - OFCondition cond = DIMSE_moveUser(assoc, presId, &req, dcmff.getDataset(), - moveCallback, &callbackData, opt_blockMode, opt_dimse_timeout, net, subOpCallback, - NULL, &rsp, &statusDetail, &rspIds, opt_ignorePendingDatasets); Modified: trunk/packages/dcmtk/branches/experimental/debian/patches/series =================================================================== --- trunk/packages/dcmtk/branches/experimental/debian/patches/series 2013-11-22 18:56:00 UTC (rev 15250) +++ trunk/packages/dcmtk/branches/experimental/debian/patches/series 2013-11-22 19:10:10 UTC (rev 15251) @@ -5,6 +5,3 @@ system_charls.patch datadic_install.patch debian_iconv.patch -bug706062.patch -bufoverflow.patch -fixlog.patch Modified: trunk/packages/dcmtk/branches/experimental/debian/patches/system_charls.patch =================================================================== --- trunk/packages/dcmtk/branches/experimental/debian/patches/system_charls.patch 2013-11-22 18:56:00 UTC (rev 15250) +++ trunk/packages/dcmtk/branches/experimental/debian/patches/system_charls.patch 2013-11-22 19:10:10 UTC (rev 15251) @@ -3,10 +3,10 @@ Bug-Debian: http://bugs.debian.org/705923 Forwarded: no -Index: dcmtk-3.6.1_20121102/dcmjpls/CMakeLists.txt +Index: dcmtk-3.6.1_20131114/dcmjpls/CMakeLists.txt =================================================================== ---- dcmtk-3.6.1_20121102.orig/dcmjpls/CMakeLists.txt 2013-05-15 10:20:34.563697497 +0200 -+++ dcmtk-3.6.1_20121102/dcmjpls/CMakeLists.txt 2013-05-15 10:20:37.015697471 +0200 +--- dcmtk-3.6.1_20131114.orig/dcmjpls/CMakeLists.txt 2013-11-22 19:57:00.498241184 +0100 ++++ dcmtk-3.6.1_20131114/dcmjpls/CMakeLists.txt 2013-11-22 19:59:31.318239164 +0100 @@ -2,6 +2,6 @@ PROJECT(dcmjpls) @@ -15,22 +15,10 @@ +FOREACH(SUBDIR libsrc apps include) ADD_SUBDIRECTORY(${SUBDIR}) ENDFOREACH(SUBDIR) -Index: dcmtk-3.6.1_20121102/dcmjpls/apps/CMakeLists.txt +Index: dcmtk-3.6.1_20131114/dcmjpls/libsrc/CMakeLists.txt =================================================================== ---- dcmtk-3.6.1_20121102.orig/dcmjpls/apps/CMakeLists.txt 2013-05-15 10:20:27.151697582 +0200 -+++ dcmtk-3.6.1_20121102/dcmjpls/apps/CMakeLists.txt 2013-05-15 10:20:37.019697471 +0200 -@@ -11,6 +11,6 @@ - - # make sure executables are linked to the corresponding libraries - FOREACH(PROGRAM dcmcjpls dcmdjpls dcml2pnm) -- DCMTK_TARGET_LINK_MODULES(${PROGRAM} dcmjpls charls dcmimage dcmimgle dcmdata oflog ofstd ofstd) -+ DCMTK_TARGET_LINK_MODULES(${PROGRAM} dcmjpls CharLS dcmimage dcmimgle dcmdata oflog ofstd ofstd) - DCMTK_TARGET_LINK_LIBRARIES(${PROGRAM} ${LIBTIFF_LIBS} ${LIBPNG_LIBS} ${ZLIB_LIBS} ${LIBICONV_LIBS} ${THREAD_LIBS} ${WIN32_STD_LIBRARIES}) - ENDFOREACH(PROGRAM) -Index: dcmtk-3.6.1_20121102/dcmjpls/libsrc/CMakeLists.txt -=================================================================== ---- dcmtk-3.6.1_20121102.orig/dcmjpls/libsrc/CMakeLists.txt 2013-05-15 10:20:27.251697581 +0200 -+++ dcmtk-3.6.1_20121102/dcmjpls/libsrc/CMakeLists.txt 2013-05-15 10:20:37.019697471 +0200 +--- dcmtk-3.6.1_20131114.orig/dcmjpls/libsrc/CMakeLists.txt 2013-11-22 19:57:00.526241188 +0100 ++++ dcmtk-3.6.1_20131114/dcmjpls/libsrc/CMakeLists.txt 2013-11-22 19:59:31.318239164 +0100 @@ -1,7 +1,7 @@ # declare additional include directories -INCLUDE_DIRECTORIES(${dcmjpls_SOURCE_DIR}/include ${ofstd_SOURCE_DIR}/include ${oflog_SOURCE_DIR}/include ${dcmdata_SOURCE_DIR}/include ${dcmimgle_SOURCE_DIR}/include ${dcmimage_SOURCE_DIR}/include ${dcmjpls_SOURCE_DIR}/libcharls ${ZLIB_INCDIR}) @@ -41,10 +29,10 @@ -DCMTK_TARGET_LINK_MODULES(dcmjpls ofstd oflog dcmdata dcmimgle dcmimage charls) +DCMTK_TARGET_LINK_MODULES(dcmjpls ofstd oflog dcmdata dcmimgle dcmimage CharLS) -Index: dcmtk-3.6.1_20121102/dcmjpls/libsrc/djerror.h +Index: dcmtk-3.6.1_20131114/dcmjpls/libsrc/djerror.h =================================================================== ---- dcmtk-3.6.1_20121102.orig/dcmjpls/libsrc/djerror.h 2013-05-15 10:20:27.267697579 +0200 -+++ dcmtk-3.6.1_20121102/dcmjpls/libsrc/djerror.h 2013-05-15 10:20:37.019697471 +0200 +--- dcmtk-3.6.1_20131114.orig/dcmjpls/libsrc/djerror.h 2013-11-22 19:57:00.538241184 +0100 ++++ dcmtk-3.6.1_20131114/dcmjpls/libsrc/djerror.h 2013-11-22 19:59:31.318239164 +0100 @@ -24,7 +24,7 @@ #include "dcmtk/config/osconfig.h" @@ -54,10 +42,10 @@ /** Helper class for converting between dcmjpls and CharLS error codes */ -Index: dcmtk-3.6.1_20121102/dcmjpls/libsrc/djcodecd.cc +Index: dcmtk-3.6.1_20131114/dcmjpls/libsrc/djcodecd.cc =================================================================== ---- dcmtk-3.6.1_20121102.orig/dcmjpls/libsrc/djcodecd.cc 2013-05-15 10:20:27.291697579 +0200 -+++ dcmtk-3.6.1_20121102/dcmjpls/libsrc/djcodecd.cc 2013-05-15 10:20:37.019697471 +0200 +--- dcmtk-3.6.1_20131114.orig/dcmjpls/libsrc/djcodecd.cc 2013-11-22 19:57:00.522241190 +0100 ++++ dcmtk-3.6.1_20131114/dcmjpls/libsrc/djcodecd.cc 2013-11-22 19:59:31.318239164 +0100 @@ -37,7 +37,7 @@ #include "djerror.h" /* for private class DJLSError */ @@ -67,10 +55,10 @@ E_TransferSyntax DJLSLosslessDecoder::supportedTransferSyntax() const { -Index: dcmtk-3.6.1_20121102/dcmjpls/libsrc/djcodece.cc +Index: dcmtk-3.6.1_20131114/dcmjpls/libsrc/djcodece.cc =================================================================== ---- dcmtk-3.6.1_20121102.orig/dcmjpls/libsrc/djcodece.cc 2013-05-15 10:20:27.311697580 +0200 -+++ dcmtk-3.6.1_20121102/dcmjpls/libsrc/djcodece.cc 2013-05-15 10:20:37.019697471 +0200 +--- dcmtk-3.6.1_20131114.orig/dcmjpls/libsrc/djcodece.cc 2013-11-22 19:57:00.514241190 +0100 ++++ dcmtk-3.6.1_20131114/dcmjpls/libsrc/djcodece.cc 2013-11-22 19:59:31.318239164 +0100 @@ -55,7 +55,7 @@ #include "dcmtk/dcmimgle/dcmimage.h" /* for class DicomImage */ @@ -80,3 +68,25 @@ BEGIN_EXTERN_C #ifdef HAVE_FCNTL_H +Index: dcmtk-3.6.1_20131114/dcmjpls/apps/CMakeLists.txt +=================================================================== +--- dcmtk-3.6.1_20131114.orig/dcmjpls/apps/CMakeLists.txt 2013-11-22 20:01:11.434237827 +0100 ++++ dcmtk-3.6.1_20131114/dcmjpls/apps/CMakeLists.txt 2013-11-22 20:01:30.242237573 +0100 +@@ -8,5 +8,5 @@ + + # make sure executables are linked to the corresponding libraries + FOREACH(PROGRAM dcmcjpls dcmdjpls dcml2pnm) +- DCMTK_TARGET_LINK_MODULES(${PROGRAM} dcmjpls charls dcmimage dcmimgle dcmdata oflog ofstd ofstd) ++ DCMTK_TARGET_LINK_MODULES(${PROGRAM} dcmjpls CharLS dcmimage dcmimgle dcmdata oflog ofstd ofstd) + ENDFOREACH(PROGRAM) +Index: dcmtk-3.6.1_20131114/dcmjpls/libcharls/CMakeLists.txt +=================================================================== +--- dcmtk-3.6.1_20131114.orig/dcmjpls/libcharls/CMakeLists.txt 2013-11-22 20:01:36.862237482 +0100 ++++ dcmtk-3.6.1_20131114/dcmjpls/libcharls/CMakeLists.txt 2013-11-22 20:01:42.314237411 +0100 +@@ -1,5 +1,5 @@ + # declare additional include directories +-INCLUDE_DIRECTORIES(${dcmjpls_SOURCE_DIR}/libcharls ${ofstd_SOURCE_DIR}/include) ++INCLUDE_DIRECTORIES(${ofstd_SOURCE_DIR}/include) + + # create library from source files + DCMTK_ADD_LIBRARY(charls header intrface jpegls) _______________________________________________ debian-med-commit mailing list debian-med-commit@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit