From: malaterre Date: Tue, 11 Jan 2005 17:19:38 +0000 (+0000) Subject: STYLE: minor clean up X-Git-Tag: Version1.0.bp~391 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=6578460d701eb48ccdac0a8ca316360fc6dd3944;p=gdcm.git STYLE: minor clean up --- diff --git a/Testing/TestTS.cxx b/Testing/TestTS.cxx index b2f57f82..58226439 100644 --- a/Testing/TestTS.cxx +++ b/Testing/TestTS.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: TestTS.cxx,v $ Language: C++ - Date: $Date: 2005/01/11 16:44:42 $ - Version: $Revision: 1.6 $ + Date: $Date: 2005/01/11 17:19:38 $ + Version: $Revision: 1.7 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -16,6 +16,7 @@ =========================================================================*/ #include "gdcmTS.h" +#include "gdcmGlobal.h" int TestTS(int , char *[]) { @@ -68,6 +69,7 @@ int TestTS(int , char *[]) std::cout << ts.IsJPEG( "1.2.840.10008.1.2.5") << std::endl; std::cout << ts.IsEncapsulate( "1.2.840.10008.1.2.5") << std::endl; std::cout << ts.GetSpecialTransferSyntax( ts.GetSpecialTransferSyntax( "1.2.840.10008.1.2.5")) << std::endl; + std::cout << gdcm::Global::GetTS()->IsRLELossless( "1.2.840.10008.1.2.5" ) << std::endl; return ts.GetValue( "" ) != gdcm::GDCM_UNFOUND; } diff --git a/src/gdcmDocument.cxx b/src/gdcmDocument.cxx index f4b47a1e..1a10f5b8 100644 --- a/src/gdcmDocument.cxx +++ b/src/gdcmDocument.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDocument.cxx,v $ Language: C++ - Date: $Date: 2005/01/11 16:44:43 $ - Version: $Revision: 1.174 $ + Date: $Date: 2005/01/11 17:19:39 $ + Version: $Revision: 1.175 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -1577,7 +1577,8 @@ void Document::FindDocEntryLength( DocEntry *entry ) if ( element == 0x0000 && length16 == 0x0400 ) { std::string ts = GetTransferSyntax(); - if ( Global::GetTS()->GetSpecialTransferSyntax(ts) != TS::ExplicitVRBigEndian ) + if ( Global::GetTS()->GetSpecialTransferSyntax(ts) + != TS::ExplicitVRBigEndian ) { throw FormatError( "Document::FindDocEntryLength()", " not explicit VR." ); diff --git a/src/gdcmDocument.h b/src/gdcmDocument.h index aee3aaa1..59fbb270 100644 --- a/src/gdcmDocument.h +++ b/src/gdcmDocument.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDocument.h,v $ Language: C++ - Date: $Date: 2005/01/11 16:44:43 $ - Version: $Revision: 1.80 $ + Date: $Date: 2005/01/11 17:19:39 $ + Version: $Revision: 1.81 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -92,8 +92,8 @@ public: uint16_t group, uint16_t element); virtual bool SetEntry(uint8_t *content, int lgth, uint16_t group, uint16_t element); - virtual bool SetEntry(std::string const &content,ValEntry *entry); - virtual bool SetEntry(uint8_t *content, int lgth,BinEntry *entry); + virtual bool SetEntry(std::string const &content, ValEntry *entry); + virtual bool SetEntry(uint8_t *content, int lgth, BinEntry *entry); virtual void *GetEntryBinArea(uint16_t group, uint16_t elem); @@ -113,8 +113,8 @@ public: TagName const &vr = GDCM_UNKNOWN); SeqEntry *ReplaceOrCreate(uint16_t group, uint16_t elem); - bool ReplaceIfExist ( std::string const &value, - uint16_t group, uint16_t elem ); + bool ReplaceIfExist(std::string const &value, + uint16_t group, uint16_t elem ); virtual void LoadEntryBinArea(uint16_t group, uint16_t elem); virtual void LoadEntryBinArea(BinEntry *entry);