[Gdcm-hackers] gdcm-git:Grassroots DICOM branch release updated. e98bda90c57f22a6cd9a35bfe22b8c26ba
Cross-platform DICOM implementation
Brought to you by:
malat
|
From: Mathieu M. <ma...@us...> - 2019-02-11 07:35:57
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Grassroots DICOM".
The branch, release has been updated
via e98bda90c57f22a6cd9a35bfe22b8c26ba90188f (commit)
via 21c6d86537ce4f0a09fcc595616ed11b03a6faae (commit)
via 0d903faa5b7a122da694bc1045aba68fb09b6734 (commit)
from 3fb24e60f84f3df1e7df7e1cbb92894395b6b9bc (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://sourceforge.net/p/gdcm/gdcm/ci/e98bda90c57f22a6cd9a35bfe22b8c26ba90188f/
commit e98bda90c57f22a6cd9a35bfe22b8c26ba90188f
Author: Mathieu Malaterre <mat...@gm...>
Date: Mon Feb 11 02:35:15 2019 -0500
Fixup sha1sum after manual editing
diff --git a/Testing/Source/Common/Cxx/TestSHA1.cxx b/Testing/Source/Common/Cxx/TestSHA1.cxx
index 1e8639751..b31fadc5d 100644
--- a/Testing/Source/Common/Cxx/TestSHA1.cxx
+++ b/Testing/Source/Common/Cxx/TestSHA1.cxx
@@ -66,7 +66,7 @@ static const char * const gdcmSHA1SumFiles[][2] = {
{ "c6188f2ae06a55d596d4d6b4d914b404f7bf5786" , "D_CLUNIE_RG2_JPLY.dcm" },
{ "5035a6298cf8590932605cb4bb10f128df971fcb" , "D_CLUNIE_RG2_RLE.dcm" },
{ "d2a56de2e035095c3dea9be80878f9607c63728d" , "D_CLUNIE_RG3_JPLL.dcm" },
-{ "41abc80638b12a2601e7764805a9c4ddc385bdc5" , "D_CLUNIE_RG3_JPLY.dcm" },
+{ "c90b8543259ca7189fa76201f864c2f32e6ebef3" , "D_CLUNIE_RG3_JPLY.dcm" },
{ "eb417a88c6b3fe6c5768ab705990fc0d54558816" , "D_CLUNIE_RG3_RLE.dcm" },
{ "8e27c853a156038e1f6daebb04f2c9059ebfbd82" , "D_CLUNIE_SC1_JPLY.dcm" },
{ "6a6ca811ae87ae1ca4549f49724b58562eea714b" , "D_CLUNIE_SC1_RLE.dcm" },
https://sourceforge.net/p/gdcm/gdcm/ci/21c6d86537ce4f0a09fcc595616ed11b03a6faae/
commit 21c6d86537ce4f0a09fcc595616ed11b03a6faae
Author: Mathieu Malaterre <mat...@gm...>
Date: Mon Feb 11 02:34:19 2019 -0500
Add mising sha1sum for JPEGLS_CharLS_10742.dcm
diff --git a/Testing/Source/Common/Cxx/TestSHA1.cxx b/Testing/Source/Common/Cxx/TestSHA1.cxx
index 951dcd79a..1e8639751 100644
--- a/Testing/Source/Common/Cxx/TestSHA1.cxx
+++ b/Testing/Source/Common/Cxx/TestSHA1.cxx
@@ -235,6 +235,7 @@ static const char * const gdcmSHA1SumFiles[][2] = {
{ "08828e913a7a1ebbc0129c42974b64ce702814b6" , "JPEGNote_missing.dcm" },
{ "99c169688190a66100b61319eaeefb3db1936125" , "RLEDebianBug816607Orig.dcm" },
{ "f18f91631b59f0242b5daca547878e4c5cbf6a5b" , "GE_MR_0025xx1bProtocolDataBlockXML.dcm" },
+{ "8c46efd571b33264d7c0bed14fb6dd0282330b92" , "JPEGLS_CharLS_10742.dcm" },
{ NULL, NULL}
};
https://sourceforge.net/p/gdcm/gdcm/ci/0d903faa5b7a122da694bc1045aba68fb09b6734/
commit 0d903faa5b7a122da694bc1045aba68fb09b6734
Author: Mathieu Malaterre <mat...@gm...>
Date: Wed Feb 6 05:42:35 2019 -0500
Partial revert of d6c0a3f0
diff --git a/Source/DataStructureAndEncodingDefinition/gdcmBasicOffsetTable.h b/Source/DataStructureAndEncodingDefinition/gdcmBasicOffsetTable.h
index 4b22b11ff..745add577 100644
--- a/Source/DataStructureAndEncodingDefinition/gdcmBasicOffsetTable.h
+++ b/Source/DataStructureAndEncodingDefinition/gdcmBasicOffsetTable.h
@@ -54,8 +54,11 @@ public:
if( TagField != itemStart )
{
// Bug_Siemens_PrivateIconNoItem.dcm
- gdcmDebugMacro( "Could be Bug_Siemens_PrivateIconNoItem.dcm" );
- throw "SIEMENS Icon thingy";
+ //gdcmDebugMacro( "Could be Bug_Siemens_PrivateIconNoItem.dcm" );
+ ParseException pe;
+ pe.SetLastElement(*this);
+ //throw "SIEMENS Icon thingy";
+ throw pe;
}
if( !ValueLengthField.Read<TSwap>(is) )
{
diff --git a/Source/DataStructureAndEncodingDefinition/gdcmSequenceOfFragments.h b/Source/DataStructureAndEncodingDefinition/gdcmSequenceOfFragments.h
index 4a50ea8f3..e3e429efa 100644
--- a/Source/DataStructureAndEncodingDefinition/gdcmSequenceOfFragments.h
+++ b/Source/DataStructureAndEncodingDefinition/gdcmSequenceOfFragments.h
@@ -93,8 +93,8 @@ std::istream& Read(std::istream &is, bool readvalues = true)
template <typename TSwap>
std::istream& ReadPreValue(std::istream &is)
{
- //if( SequenceLengthField.IsUndefined() )
// First item is the basic offset table:
+#if 0
try
{
Table.Read<TSwap>(is);
@@ -125,6 +125,10 @@ std::istream& ReadPreValue(std::istream &is)
//assert(0);
}
}
+#else
+ Table.Read<TSwap>(is);
+ gdcmDebugMacro( "Table: " << Table );
+#endif
return is;
}
-----------------------------------------------------------------------
Summary of changes:
Source/DataStructureAndEncodingDefinition/gdcmBasicOffsetTable.h | 7 +++++--
.../DataStructureAndEncodingDefinition/gdcmSequenceOfFragments.h | 6 +++++-
Testing/Source/Common/Cxx/TestSHA1.cxx | 3 ++-
3 files changed, 12 insertions(+), 4 deletions(-)
hooks/post-receive
--
Grassroots DICOM
|