Skip to content
Commits on Source (6)
Show whitespace changes
Inline Side-by-side
debian/changelog
View file @ 9374deb7
......@@ -6,9 +6,12 @@ dcmtk (3.6.4-1~exp1) UNRELEASED; urgency=medium
[ Gert Wollny ]
* New upstream version 3.6.4
* d/p: Update patches for new release
* d/p: Update patches for new release and remove old patches
* d/control: Update lib package name
* d/rules: Change dict install directory to new lib name
* d/dcmtk.postinst: Disable running chown recursively
-- Gert Wollny <gewo@debian.org> Sun, 02 Dec 2018 10:21:24 +0100
-- Gert Wollny <gewo@debian.org> Sat, 22 Dec 2018 01:38:38 +0100
dcmtk (3.6.3-1~exp1) experimental; urgency=medium
......
debian/control
View file @ 9374deb7
......@@ -38,7 +38,7 @@ Description: OFFIS DICOM toolkit command line utilities
.
Note: This version was compiled with libssl support.
Package: libdcmtk13
Package: libdcmtk14
Architecture: any
Section: libs
Depends: ${misc:Depends},
......@@ -67,7 +67,7 @@ Depends: libxml2-dev,
libwrap0-dev,
libcharls-dev,
libtiff-dev,
libdcmtk13 (= ${binary:Version}),
libdcmtk14 (= ${binary:Version}),
${misc:Depends}
Suggests: dcmtk-doc
Breaks: libinsighttoolkit4-dev (<< 4.9.0)
......
debian/dcmtk.postinst
View file @ 9374deb7
......@@ -17,7 +17,7 @@ fi
# work around possible adduser bug, see #119366
[ -d /var/lib/dcmtk/db ] || mkdir -p /var/lib/dcmtk/db
chmod 755 /var/lib/dcmtk/db
chown -h -R dcmtk:dcmtk /var/lib/dcmtk/db || true
chown -h dcmtk:dcmtk /var/lib/dcmtk/db || true
# Handle imagectn -> dcmqrdb transition in (3.5.3 -> 3.5.4)
......
debian/patches/06_soversion_abi.patch deleted 100644 → 0
View file @ becd732d
Description: Add abi-version to library name
Author: Gert Wollny <gw.fossdev@gmail.com>
Last-Update: 2016-04-09
--- a/CMake/dcmtkPrepare.cmake
+++ b/CMake/dcmtkPrepare.cmake
@@ -55,7 +55,7 @@
#SET(DCMTK_PACKAGE_URL "http://www.dcmtk.org/")
# Shared library version information
-SET(DCMTK_LIBRARY_PROPERTIES VERSION "${DCMTK_PACKAGE_VERSION}" SOVERSION "${DCMTK_ABI_VERSION}")
+SET(DCMTK_LIBRARY_PROPERTIES VERSION "${DCMTK_ABI_VERSION}.${DCMTK_PACKAGE_VERSION}" SOVERSION "${DCMTK_ABI_VERSION}")
# General build options and settings
OPTION(BUILD_APPS "Build command line applications and test programs." ON)
debian/patches/09_fix_format_on_32bit.patch deleted 100644 → 0
View file @ becd732d
Description: Fix format errors on 32 bit platforms
For some reason upstream wants to use %lu on 32 bit platforms and
the compiler complains that it expects unsigned long. Why upstream
wants this is not clear, because the variable passed in is Uint32.
Author: Gert Wollny <gewo@debian.org>
Debian-Bug: https://bugs.debian.org/865418
Last-Changed: 2017-09-06
--- a/dcmdata/libsrc/dcpath.cc
+++ b/dcmdata/libsrc/dcpath.cc
@@ -125,11 +125,7 @@
}
else if ( (vr == EVR_item) || (vr == EVR_dataset) )
{
-#if SIZEOF_LONG == 8
sprintf(buf, "[%u]", (*it)->m_itemNo);
-#else
- sprintf(buf, "[%lu]", (*it)->m_itemNo);
-#endif
pathStr.append(buf);
it++;
if (it != endOfList) pathStr.append(".");
@@ -288,11 +284,7 @@
result.push_back("[*]");
else
{
-#if SIZEOF_LONG == 8
if (sprintf(buf, "[%u]", itemNo) < 2) return EC_IllegalParameter;
-#else
- if (sprintf(buf, "[%lu]", itemNo) < 2) return EC_IllegalParameter;
-#endif
result.push_back(buf);
}
nextIsItem = OFFalse;
--- a/dcmdata/libsrc/dcvrul.cc
+++ b/dcmdata/libsrc/dcvrul.cc
@@ -334,11 +334,7 @@
/* get specified value from multi-valued string */
pos = DcmElement::getValueFromString(stringVal, pos, stringLen, value);
if (value.empty() ||
-#if SIZEOF_LONG == 8
(sscanf(value.c_str(), "%u", &field[i]) != 1)
-#else
- (sscanf(value.c_str(), "%lu", &field[i]) != 1)
-#endif
)
{
errorFlag = EC_CorruptedData;
--- a/dcmsr/libsrc/dsrtcosp.cc
+++ b/dcmsr/libsrc/dsrtcosp.cc
@@ -147,11 +147,7 @@
/* retrieve sample positions from string */
while (result.good() && (ptr != NULL))
{
-#if SIZEOF_LONG == 8
if (sscanf(ptr, "%u", &value) == 1)
-#else
- if (sscanf(ptr, "%lu", &value) == 1)
-#endif
{
addItem(value);
/* jump to next time offset */
--- a/dcmdata/libsrc/dcvrsl.cc
+++ b/dcmdata/libsrc/dcvrsl.cc
@@ -335,11 +335,7 @@
/* get specified value from multi-valued string */
pos = DcmElement::getValueFromString(stringVal, pos, stringLen, value);
if (value.empty() ||
-#if SIZEOF_LONG == 8
(sscanf(value.c_str(), "%d", &field[i]) != 1)
-#else
- (sscanf(value.c_str(), "%ld", &field[i]) != 1)
-#endif
)
{
errorFlag = EC_CorruptedData;
--- a/dcmsr/libsrc/dsrimgfr.cc
+++ b/dcmsr/libsrc/dsrimgfr.cc
@@ -127,11 +127,7 @@
{
if (!tmpString.empty())
tmpString += '\\';
-#if SIZEOF_LONG == 8
sprintf(buffer, "%d", *iterator);
-#else
- sprintf(buffer, "%ld", *iterator);
-#endif
tmpString += buffer;
iterator++;
}
@@ -158,11 +154,7 @@
/* retrieve frame values from string */
while (result.good() && (ptr != NULL))
{
-#if SIZEOF_LONG == 8
if (sscanf(ptr, "%d", &value) == 1)
-#else
- if (sscanf(ptr, "%ld", &value) == 1)
-#endif
{
addItem(value);
/* jump to next frame value */
--- a/dcmdata/libsrc/dcvris.cc
+++ b/dcmdata/libsrc/dcvris.cc
@@ -106,11 +106,7 @@
if (l_error.good())
{
/* convert string to integer value */
-#if SIZEOF_LONG == 8
if (sscanf(str.c_str(), "%d", &sintVal) != 1)
-#else
- if (sscanf(str.c_str(), "%ld", &sintVal) != 1)
-#endif
l_error = EC_CorruptedData;
}
return l_error;
--- a/dcmimage/libsrc/dicoimg.cc
+++ b/dcmimage/libsrc/dicoimg.cc
@@ -574,11 +574,7 @@
/* set image resolution */
dataset.putAndInsertUint16(DCM_Columns, Columns);
dataset.putAndInsertUint16(DCM_Rows, Rows);
-#if SIZEOF_LONG == 8
- sprintf(numBuf, "%d", NumberOfFrames);
-#else
- sprintf(numBuf, "%ld", NumberOfFrames);
-#endif
+ sprintf(numBuf, "%u", NumberOfFrames);
dataset.putAndInsertString(DCM_NumberOfFrames, numBuf);
dataset.putAndInsertUint16(DCM_SamplesPerPixel, 3);
dataset.putAndInsertUint16(DCM_PlanarConfiguration, planarConfig);
--- a/dcmimgle/libsrc/dimoimg.cc
+++ b/dcmimgle/libsrc/dimoimg.cc
@@ -2019,11 +2019,7 @@
/* set image resolution */
dataset.putAndInsertUint16(DCM_Columns, Columns);
dataset.putAndInsertUint16(DCM_Rows, Rows);
-#if SIZEOF_LONG == 8
- sprintf(numBuf, "%d", NumberOfFrames);
-#else
- sprintf(numBuf, "%ld", NumberOfFrames);
-#endif
+ sprintf(numBuf, "%u", NumberOfFrames);
dataset.putAndInsertString(DCM_NumberOfFrames, numBuf);
dataset.putAndInsertUint16(DCM_SamplesPerPixel, 1);
/* set pixel encoding and data */
debian/patches/09_round_time.patch deleted 100644 → 0
View file @ becd732d
Author: Gert Wollny <gewo@debian.org>
Description: work around numerical instability by rounding the time in seconds
to the six decimal points supported in dicom
Bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=859204
--- a/ofstd/libsrc/oftime.cc
+++ b/ofstd/libsrc/oftime.cc
@@ -48,6 +48,7 @@
#include "dcmtk/ofstd/oftime.h"
#include "dcmtk/ofstd/ofstd.h"
+#include <cmath>
/*------------------*
* implementation *
@@ -528,6 +529,7 @@
{
/* compute number of seconds since 00:00:00 */
double result = ((OFstatic_cast(double, hour) - timeZone) * 60 + OFstatic_cast(double, minute)) * 60 + second;
+
/* normalize the result to the range [0.0,86400.0[ */
if (normalize)
result -= OFstatic_cast(double, OFstatic_cast(unsigned long, result / 86400) * 86400);
debian/patches/10_correct_format_output_size.patch deleted 100644 → 0
View file @ becd732d
Author: Gert Wollny <gw.fossdev@gmail.com>
Description: Fix warning about writing beyond end of character array.
Actually, the overflow is _very_unlikely, because having a series with
more then one million frames in a series is highly unlikely, but this
fix has no relevant implications on the memory and runtime footprint of
the code.
Last-Changed: 2017-09-06
--- a/dcmnet/apps/storescp.cc
+++ b/dcmnet/apps/storescp.cc
@@ -2470,7 +2470,7 @@
// determine the new file name: The first two characters of the old file name make up the [modality-prefix].
// The value for [consecutive-numbering] will be determined using the counter variable.
char modalityId[3];
- char newFileName[9];
+ char newFileName[13];
if (opt_timeNames)
{
// modality prefix are the first 2 characters after serial number (if present)
debian/rules
View file @ 9374deb7
......@@ -38,7 +38,7 @@ CMAKE_EXTRA_FLAGS += -DCMAKE_BUILD_TYPE:STRING=None \
-DDCMTK_WITH_ICONV:BOOL=ON \
-DUSE_COMPILER_HIDDEN_VISIBILITY:BOOL=ON \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DDCMTK_INSTALL_DATDIC:STRING=share/libdcmtk13 \
-DDCMTK_INSTALL_DATDIC:STRING=share/libdcmtk14 \
-DCMAKE_SKIP_RPATH:BOOL=OFF \
-DDCMTK_USE_CXX11_STL:BOOL=ON \
-DDCMTK_ENABLE_CXX11:BOOL=ON
......