[Gdcm-hackers] gdcm-git:Grassroots DICOM branch master updated. b7b109dcb6563d6a6e136247e73cbd39755
Cross-platform DICOM implementation
Brought to you by:
malat
|
From: Mathieu M. <ma...@us...> - 2011-02-25 15:13:15
|
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, master has been updated
via b7b109dcb6563d6a6e136247e73cbd397555b002 (commit)
via d4520ced98c75520957c4d5ac7603ab70a1daa57 (commit)
via 68856da39d71af293c9b1a09c0827d4256b14a9b (commit)
via b521a4ea7d80e48ed3ea1e8c534513bd632c845d (commit)
from 239ed2e4997c1ec846638ea20fe020ac86c8bc24 (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 -----------------------------------------------------------------
http://gdcm.git.sourceforge.net/git/gitweb.cgi?p=gdcm/gdcm;a=commit;h=b7b109dcb6563d6a6e136247e73cbd397555b002
commit b7b109dcb6563d6a6e136247e73cbd397555b002
Author: Mathieu Malaterre <mat...@gm...>
Date: Fri Feb 25 16:12:28 2011 +0100
Add API to retrieve MaxPDU allowed for association
diff --git a/Source/MessageExchangeDefinition/gdcmMaximumLengthSub.h b/Source/MessageExchangeDefinition/gdcmMaximumLengthSub.h
index a9a53b1..90878a7 100644
--- a/Source/MessageExchangeDefinition/gdcmMaximumLengthSub.h
+++ b/Source/MessageExchangeDefinition/gdcmMaximumLengthSub.h
@@ -41,6 +41,10 @@ public:
const std::ostream &Write(std::ostream &os) const;
size_t Size() const;
+
+ uint32_t GetMaximumLength() const { return MaximumLength; }
+ void SetMaximumLength(uint32_t maximumlength) { MaximumLength = maximumlength; }
+
private:
static const uint8_t ItemType;
static const uint8_t Reserved2;
diff --git a/Source/MessageExchangeDefinition/gdcmUserInformation.h b/Source/MessageExchangeDefinition/gdcmUserInformation.h
index d64a1f5..c0dc706 100644
--- a/Source/MessageExchangeDefinition/gdcmUserInformation.h
+++ b/Source/MessageExchangeDefinition/gdcmUserInformation.h
@@ -46,6 +46,9 @@ public:
void Print(std::ostream &os) const;
+ const MaximumLengthSub &GetMaximumLengthSub() const { return MLS; }
+ MaximumLengthSub &GetMaximumLengthSub() { return MLS; }
+
private:
static const uint8_t ItemType;
static const uint8_t Reserved2;
http://gdcm.git.sourceforge.net/git/gitweb.cgi?p=gdcm/gdcm;a=commit;h=d4520ced98c75520957c4d5ac7603ab70a1daa57
commit d4520ced98c75520957c4d5ac7603ab70a1daa57
Author: Mathieu Malaterre <mat...@gm...>
Date: Fri Feb 25 16:10:32 2011 +0100
Remove UTF-8 character (C++ is ASCII)
diff --git a/Source/MessageExchangeDefinition/gdcmAAssociateRQPDU.h b/Source/MessageExchangeDefinition/gdcmAAssociateRQPDU.h
index b730e68..3881731 100644
--- a/Source/MessageExchangeDefinition/gdcmAAssociateRQPDU.h
+++ b/Source/MessageExchangeDefinition/gdcmAAssociateRQPDU.h
@@ -102,7 +102,7 @@ private:
11-26 Called-AE-title Destination DICOM Application Name. It shall be encoded as 16
characters as defined by the ISO 646:1990-Basic G0 Set with leading
and trailing spaces (20H) being non-significant. The value made of 16
- spaces (20H) meaning âno Application Name specifiedâ shall not be
+ spaces (20H) meaning "no Application Name specified" shall not be
used. For a complete description of the use of this field, see Section
7.1.1.4.
*/
@@ -111,7 +111,7 @@ private:
27-42 Calling-AE-title Source DICOM Application Name. It shall be encoded as 16
characters as defined by the ISO 646:1990-Basic G0 Set with leading
and trailing spaces (20H) being non-significant. The value made of 16
- spaces (20H) meaning âno Application Name specifiedâ shall not be
+ spaces (20H) meaning "no Application Name specified" shall not be
used. For a complete description of the use of this field, see Section
7.1.1.3.
*/
http://gdcm.git.sourceforge.net/git/gitweb.cgi?p=gdcm/gdcm;a=commit;h=68856da39d71af293c9b1a09c0827d4256b14a9b
commit 68856da39d71af293c9b1a09c0827d4256b14a9b
Author: Mathieu Malaterre <mat...@gm...>
Date: Fri Feb 25 16:10:12 2011 +0100
Adding verbosity on error
diff --git a/Source/MediaStorageAndFileFormat/gdcmFileDerivation.cxx b/Source/MediaStorageAndFileFormat/gdcmFileDerivation.cxx
index 5ade6e9..ffaf99e 100644
--- a/Source/MediaStorageAndFileFormat/gdcmFileDerivation.cxx
+++ b/Source/MediaStorageAndFileFormat/gdcmFileDerivation.cxx
@@ -342,6 +342,7 @@ bool FileDerivation::AddSourceImageSequence()
if( sqi->GetNumberOfItems() )
{
+ gdcmWarningMacro( "Do not support appending Referenced Image" );
return false;
}
std::vector< std::pair< std::string, std::string > >::const_iterator it =
http://gdcm.git.sourceforge.net/git/gitweb.cgi?p=gdcm/gdcm;a=commit;h=b521a4ea7d80e48ed3ea1e8c534513bd632c845d
commit b521a4ea7d80e48ed3ea1e8c534513bd632c845d
Author: Mathieu Malaterre <mat...@gm...>
Date: Fri Feb 25 16:09:49 2011 +0100
Make sure stream is valid (not just pointer)
diff --git a/Source/DataStructureAndEncodingDefinition/gdcmReader.cxx b/Source/DataStructureAndEncodingDefinition/gdcmReader.cxx
index a22786b..def6387 100644
--- a/Source/DataStructureAndEncodingDefinition/gdcmReader.cxx
+++ b/Source/DataStructureAndEncodingDefinition/gdcmReader.cxx
@@ -291,7 +291,7 @@ bool Reader::ReadSelectedTags( std::set<Tag> const & selectedTags )
template <typename T_Caller>
bool Reader::InternalReadCommon(const T_Caller &caller)
{
- if( !Stream )
+ if( !Stream || !*Stream )
{
gdcmErrorMacro( "No File" );
return false;
-----------------------------------------------------------------------
Summary of changes:
.../gdcmReader.cxx | 2 +-
.../gdcmFileDerivation.cxx | 1 +
.../gdcmAAssociateRQPDU.h | 4 ++--
.../gdcmMaximumLengthSub.h | 4 ++++
.../gdcmUserInformation.h | 3 +++
5 files changed, 11 insertions(+), 3 deletions(-)
hooks/post-receive
--
Grassroots DICOM
|