[med-svn] [gdcm] 01/02: Add patch to fix regression that made ITK test suite fail. Related: #808491

[Gert Wollny]

This is an automated email from the git hooks/post-receive script.

gert-guest pushed a commit to branch master
in repository gdcm.

commit 76958d3e57848fcfa6440e4d1b36fadfa35eb2ef
Author: Gert Wollny <gw.fossdev at gmail.com>
Date:   Mon Dec 21 01:20:26 2015 +0100

    Add patch to fix regression that made ITK test suite fail. Related: #808491
---
 .../06_fix_regression_with_ITK_test_suite.patch    | 30 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 31 insertions(+)

diff --git a/debian/patches/06_fix_regression_with_ITK_test_suite.patch b/debian/patches/06_fix_regression_with_ITK_test_suite.patch
new file mode 100644
index 0000000..047d3b4
--- /dev/null
+++ b/debian/patches/06_fix_regression_with_ITK_test_suite.patch
@@ -0,0 +1,30 @@
+Sescription: Fix a regression that made ITK test suite fail
+ We should not check for presence of Pixel Data at this point. This broke
+ a test in ITK test suite.
+Author: Mathieu Malaterre <mathieu.malaterre at gmail.com>
+Origin: https://sourceforge.net/p/gdcm/gdcm/ci/11c5f4e8a6e8bc6368bdd04f1711f3be10c29a22/
+Forwarded: no
+Last-Update: 2015-12-21
+
+--- a/Source/DataStructureAndEncodingDefinition/gdcmMediaStorage.cxx
++++ b/Source/DataStructureAndEncodingDefinition/gdcmMediaStorage.cxx
+@@ -484,7 +484,9 @@
+ bool MediaStorage::SetFromModality(DataSet const &ds)
+ {
+   // Ok let's try againg with little luck it contains a pixel data...
+-  if( ds.FindDataElement( Tag(0x7fe0,0x0010) ) )
++  // technically GDCM is called with a template DataSet before Pixel Data
++  // is even set, so do not check for presence of this attribute at this point
++  //if( ds.FindDataElement( Tag(0x7fe0,0x0010) ) )
+     {
+     // Pixel Data found !
+     // Attempt to recover from the modality (0008,0060):
+@@ -512,7 +514,7 @@
+       }
+     return true;
+     }
+-  return false;
++  //return false;
+ }
+ 
+ bool MediaStorage::SetFromFile(File const &file)
diff --git a/debian/patches/series b/debian/patches/series
index 937093a..a8d8de3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 03_linkvtkdoc.patch
 04_multiarch.patch
 05_cleanup_doxygen.patch
+06_fix_regression_with_ITK_test_suite.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/gdcm.git