[med-svn] [Git][med-team/orthanc][master] 2 commits: fix for big-endian

[Sebastien Jodogne]

Sebastien Jodogne pushed to branch master at Debian Med / orthanc


Commits:
d071fc70 by jodogne-guest at 2020-05-23T12:28:31+02:00
fix for big-endian

- - - - -
132b43d1 by jodogne-guest at 2020-05-23T12:52:18+02:00
Upload to unstable

- - - - -


3 changed files:

- debian/changelog
- + debian/patches/big-endian
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,9 @@
+orthanc (1.7.0+dfsg-2) unstable; urgency=medium
+
+  * Fix unit tests on big-endian architectures
+
+ -- Sebastien Jodogne <s.jodogne at gmail.com>  Sat, 23 May 2020 12:27:16 +0200
+
 orthanc (1.7.0+dfsg-1) unstable; urgency=medium
 
   * New upstream version


=====================================
debian/patches/big-endian
=====================================
@@ -0,0 +1,36 @@
+Description: Fix unit tests on big-endian architectures
+Author: Sebastien Jodogne <s.jodogne at orthanc-labs.com>
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: Orthanc-1.7.0/UnitTestsSources/FromDcmtkTests.cpp
+===================================================================
+--- Orthanc-1.7.0.orig/UnitTestsSources/FromDcmtkTests.cpp
++++ Orthanc-1.7.0/UnitTestsSources/FromDcmtkTests.cpp
+@@ -514,7 +514,9 @@ TEST(ParsedDicomFile, InsertReplaceStrin
+ 
+   std::string s;
+   ASSERT_TRUE(f.LookupTransferSyntax(s));
+-  ASSERT_EQ(s, GetTransferSyntaxUid(DicomTransferSyntax_LittleEndianExplicit));
++  // The default transfer syntax depends on the OS endianness
++  ASSERT_TRUE(s == GetTransferSyntaxUid(DicomTransferSyntax_LittleEndianExplicit) ||
++              s == GetTransferSyntaxUid(DicomTransferSyntax_BigEndianExplicit));
+ 
+   ASSERT_THROW(f.Replace(DICOM_TAG_ACCESSION_NUMBER, std::string("Accession"),
+                          false, DicomReplaceMode_ThrowIfAbsent, ""), OrthancException);
+Index: Orthanc-1.7.0/UnitTestsSources/ServerIndexTests.cpp
+===================================================================
+--- Orthanc-1.7.0.orig/UnitTestsSources/ServerIndexTests.cpp
++++ Orthanc-1.7.0/UnitTestsSources/ServerIndexTests.cpp
+@@ -734,8 +734,10 @@ TEST(ServerIndex, AttachmentRecycling)
+     ASSERT_TRUE(instanceMetadata.find(MetadataType_Instance_TransferSyntax) != instanceMetadata.end());
+     ASSERT_TRUE(instanceMetadata.find(MetadataType_Instance_SopClassUid) != instanceMetadata.end());
+ 
+-    // By default, an Explicit VR Little Endian is used by Orthanc
+-    ASSERT_EQ("1.2.840.10008.1.2.1", instanceMetadata[MetadataType_Instance_TransferSyntax]);
++    // The default transfer syntax depends on the OS endianness
++    std::string s = instanceMetadata[MetadataType_Instance_TransferSyntax];
++    ASSERT_TRUE(s == "1.2.840.10008.1.2.1" ||
++                s == "1.2.840.10008.1.2.2");
+ 
+     ASSERT_EQ("1.2.840.10008.5.1.4.1.1.1", instanceMetadata[MetadataType_Instance_SopClassUid]);
+ 


=====================================
debian/patches/series
=====================================
@@ -0,0 +1 @@
+big-endian



View it on GitLab: https://salsa.debian.org/med-team/orthanc/-/compare/338590fde494780ed5455c06f37c478fd8fcce68...132b43d1ba53985de5a7b4625279f3abc522f1b4

-- 
View it on GitLab: https://salsa.debian.org/med-team/orthanc/-/compare/338590fde494780ed5455c06f37c478fd8fcce68...132b43d1ba53985de5a7b4625279f3abc522f1b4
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/20200523/8d3c8336/attachment-0001.html>