[med-svn] [Git][med-team/dcmtk][debian/experimental] 3 commits: d/rules: Fix test suite on x87 hardware

[Mathieu Malaterre (@malat)]

Mathieu Malaterre pushed to branch debian/experimental at Debian Med / dcmtk


Commits:
55e72fc5 by Mathieu Malaterre at 2024-01-12T10:33:11+01:00
d/rules: Fix test suite on x87 hardware

- - - - -
2dce6668 by Mathieu Malaterre at 2024-01-12T10:33:52+01:00
d/patches: Import bug fix from upstream

- - - - -
0616f774 by Mathieu Malaterre at 2024-01-12T10:34:53+01:00
d/changelog: Upload 3.6.8-2 to experimental

- - - - -


4 changed files:

- debian/changelog
- + debian/patches/da5370947226783ce3548bf1e5b7112fac70de46.patch
- debian/patches/series
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+dcmtk (3.6.8-2) experimental; urgency=medium
+
+  * d/rules: Fix test suite on x87 hardware
+  * d/patches: Import bug fix from upstream
+
+ -- Mathieu Malaterre <malat at debian.org>  Fri, 12 Jan 2024 10:34:32 +0100
+
 dcmtk (3.6.8-1) experimental; urgency=medium
 
   * New upstream version 3.6.8


=====================================
debian/patches/da5370947226783ce3548bf1e5b7112fac70de46.patch
=====================================
@@ -0,0 +1,57 @@
+From da5370947226783ce3548bf1e5b7112fac70de46 Mon Sep 17 00:00:00 2001
+From: Joerg Riesmeier <dicom at jriesmeier.com>
+Date: Wed, 8 Nov 2023 11:38:54 +0100
+Subject: [PATCH] Fixed issue with delimiters being converted.
+
+Fixed issue with delimiter character "\" being converted when converting
+a DICOM dataset that uses a Specific Character Set of "ISO 2022 IR 13\ISO
+2022 IR 87" to UTF-8. The delimiter "\" was incorrectly converted to the
+Yen sign when processing the value of an "LO" data element that contains
+multiple values but does not use any escape sequences. This issues has
+been fixed now by always treating the delimiters in a special way.
+
+Thanks to Mathieu Malaterre <mathieu.malaterre at gmail.com> for the report
+and David Gobbi <david.gobbi at gmail.com> for the analysis and testing.
+---
+ dcmdata/libsrc/dcspchrs.cc | 14 ++++++++------
+ 1 file changed, 8 insertions(+), 6 deletions(-)
+
+diff --git a/dcmdata/libsrc/dcspchrs.cc b/dcmdata/libsrc/dcspchrs.cc
+index c327a1aa8..69d14a160 100644
+--- a/dcmdata/libsrc/dcspchrs.cc
++++ b/dcmdata/libsrc/dcspchrs.cc
+@@ -1,6 +1,6 @@
+ /*
+  *
+- *  Copyright (C) 2011-2022, OFFIS e.V.
++ *  Copyright (C) 2011-2023, OFFIS e.V.
+  *  All rights reserved.  See COPYRIGHT file for details.
+  *
+  *  This software and supporting documentation were developed by
+@@ -548,8 +548,9 @@ OFCondition DcmSpecificCharacterSet::convertString(const char *fromString,
+                                                    const OFString &delimiters)
+ {
+     OFCondition status = EC_Normal;
+-    // check whether there are any code extensions at all
+-    if (EncodingConverters.empty() || !checkForEscapeCharacter(fromString, fromLength))
++    // check whether there are or could be any code extensions
++    const OFBool hasEscapeChar = checkForEscapeCharacter(fromString, fromLength);
++    if (EncodingConverters.empty() || (!hasEscapeChar && delimiters.empty()))
+     {
+         DCMDATA_DEBUG("DcmSpecificCharacterSet: Converting '"
+             << convertToLengthLimitedOctalString(fromString, fromLength) << "'");
+@@ -564,10 +565,11 @@ OFCondition DcmSpecificCharacterSet::convertString(const char *fromString,
+         } else {
+             DCMDATA_DEBUG("DcmSpecificCharacterSet: Converting '"
+                 << convertToLengthLimitedOctalString(fromString, fromLength)
+-                << "' (with code extensions and delimiters '" << delimiters << "')");
++                << "' (with " << (hasEscapeChar ? "code extensions and " : "")
++                << "delimiters '" << delimiters << "')");
+         }
+-        // code extensions according to ISO 2022 used, so we need to check for
+-        // particular escape sequences in order to switch between character sets
++        // code extensions according to ISO 2022 (possibly) used, so we need to check
++        // for particular escape sequences in order to switch between character sets
+         toString.clear();
+         size_t pos = 0;
+         // some (extended) character sets use more than 1 byte per character


=====================================
debian/patches/series
=====================================
@@ -10,3 +10,4 @@
 #1c8cca4bf6f7c92fc16f9e66faf49409c891a2b0.patch
 #f06a867513524664a1b03dfcf812d8b60fdd02cc.patch
 remove_version.patch
+da5370947226783ce3548bf1e5b7112fac70de46.patch


=====================================
debian/rules
=====================================
@@ -14,8 +14,13 @@ else
   BUILDDOC = ON
 endif
 
+ifeq ($(DEB_HOST_ARCH_CPU),i386)
+  DEB_CXXFLAGS_MAINT_APPEND += -fexcess-precision=fast
+endif
+
 # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1001703
-export DEB_CXXFLAGS_MAINT_APPEND=-DENABLE_DCMJPLS_INTERLEAVE_NONE
+DEB_CXXFLAGS_MAINT_APPEND += -DENABLE_DCMJPLS_INTERLEAVE_NONE
+export DEB_CXXFLAGS_MAINT_APPEND
 
 # when BUILDDOC==OFF, convenient copies of doxygen man pages are used
 # when BUILDDOC==ON, doxygen man pages are being regenerated, this may leads to



View it on GitLab: https://salsa.debian.org/med-team/dcmtk/-/compare/b5de3ce34821fb7526b1c0eabd0f1ffe5fe112e1...0616f774e336978a9e909a638b3776a3e49ce9eb

-- 
View it on GitLab: https://salsa.debian.org/med-team/dcmtk/-/compare/b5de3ce34821fb7526b1c0eabd0f1ffe5fe112e1...0616f774e336978a9e909a638b3776a3e49ce9eb
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20240112/1c59e9cf/attachment-0001.htm>