diff --git a/Modules/ThirdParty/GDCM/src/gdcm/CMakeLists.txt b/Modules/ThirdParty/GDCM/src/gdcm/CMakeLists.txt index b24cf2656d5..9c3c707b45f 100644 --- a/Modules/ThirdParty/GDCM/src/gdcm/CMakeLists.txt +++ b/Modules/ThirdParty/GDCM/src/gdcm/CMakeLists.txt @@ -17,7 +17,7 @@ endif() #---------------------------------------------------------------------------- project(GDCM - VERSION 3.0.9 + VERSION 3.0.10 LANGUAGES CXX C ) ## NOTE: the "DESCRIPTION" feature of project() was introduced in cmake 3.10.0 @@ -180,23 +180,12 @@ macro(CHECK_INCLUDE_FILE_CONCAT FILE VARIABLE) endif() endmacro() -CHECK_INCLUDE_FILE("stdint.h" GDCM_HAVE_STDINT_H) -if(UNIX) #Avoid polluting Win32 cmakecache - CHECK_INCLUDE_FILE("inttypes.h" GDCM_HAVE_INTTYPES_H) -endif() - #include(${GDCM_SOURCE_DIR}/CMake/gdcmPlatformCxxTests.cmake) # #GDCM_PLATFORM_CXX_TEST(GDCM_CXX_HAS_FUNCTION # "Checking whether compiler has __FUNCTION__" DIRECT) -#----------------------------------------------------------------------------- -# Build the main lib... -if(NOT GDCM_HAVE_STDINT_H) - message(FATAL_ERROR "You system does not have stdint.h") -endif() - # -------------------------------------------------------------------------- # Configure the export configuration @@ -800,7 +789,7 @@ if(GDCM_STANDALONE) # disabled for ITK distribution of gdcm set(CPACK_NUGET_PACKAGE_DESCRIPTION "Grassroots DiCoM is a C++ library for DICOM medical files. It is accessible from Python, C#, Java and PHP. It supports RAW, JPEG, JPEG 2000, JPEG-LS, RLE and deflated transfer syntax. It comes with a super fast scanner implementation to quickly scan hundreds of DICOM files. It supports SCU network operations (C-ECHO, C-FIND, C-STORE, C-MOVE). PS 3.3 & 3.6 are distributed as XML files. - It also provides PS 3.15 certificates and password based mecanism to anonymize and de-identify DICOM datasets.") + It also provides PS 3.15 certificates and password based mechanism to anonymize and de-identify DICOM datasets.") set(CPACK_NUGET_PACKAGE_LICENSEURL "http://gdcm.sourceforge.net/Copyright.html") set(CPACK_NUGET_PACKAGE_HOMEPAGE_URL "http://gdcm.sourceforge.net") set(CPACK_NUGET_PACKAGE_TAGS "dicom" "medical") diff --git a/Modules/ThirdParty/GDCM/src/gdcm/Source/Common/gdcmBase64.cxx b/Modules/ThirdParty/GDCM/src/gdcm/Source/Common/gdcmBase64.cxx index 228813fd751..fbe2290acb4 100644 --- a/Modules/ThirdParty/GDCM/src/gdcm/Source/Common/gdcmBase64.cxx +++ b/Modules/ThirdParty/GDCM/src/gdcm/Source/Common/gdcmBase64.cxx @@ -59,7 +59,6 @@ static std::string base64_encode(unsigned char const* bytes_to_encode, size_t in { std::string ret; size_t i = 0; - size_t j = 0; unsigned char char_array_3[3]; unsigned char char_array_4[4]; @@ -79,7 +78,7 @@ static std::string base64_encode(unsigned char const* bytes_to_encode, size_t in if (i) { - for(j = i; j < 3; j++) + for(size_t j = i; j < 3; j++) char_array_3[j] = '\0'; char_array_4[0] = (unsigned char)((char_array_3[0] & 0xfc) >> 2); @@ -87,7 +86,7 @@ static std::string base64_encode(unsigned char const* bytes_to_encode, size_t in char_array_4[2] = (unsigned char)(((char_array_3[1] & 0x0f) << 2) + ((char_array_3[2] & 0xc0) >> 6)); char_array_4[3] = (unsigned char)(char_array_3[2] & 0x3f); - for (j = 0; j < i + 1; j++) + for (size_t j = 0; j < i + 1; j++) ret += base64_chars[char_array_4[j]]; while((i++ < 3)) @@ -102,7 +101,6 @@ static std::string base64_decode(std::string const& encoded_string) { size_t in_len = encoded_string.size(); size_t i = 0; - size_t j = 0; size_t in_ = 0; unsigned char char_array_4[4], char_array_3[3]; std::string ret; @@ -124,17 +122,18 @@ static std::string base64_decode(std::string const& encoded_string) } if (i) { - for (j = i; j <4; j++) + for (size_t j = i; j <4; j++) char_array_4[j] = 0; - for (j = 0; j <4; j++) + for (size_t j = 0; j <4; j++) char_array_4[j] = (unsigned char)base64_chars.find(char_array_4[j]); char_array_3[0] = (unsigned char)((char_array_4[0] << 2) + ((char_array_4[1] & 0x30) >> 4)); char_array_3[1] = (unsigned char)(((char_array_4[1] & 0xf) << 4) + ((char_array_4[2] & 0x3c) >> 2)); char_array_3[2] = (unsigned char)(((char_array_4[2] & 0x3) << 6) + char_array_4[3]); - for (j = 0; (j < i - 1); j++) ret += char_array_3[j]; + for (size_t j = 0; (j < i - 1); j++) + ret += char_array_3[j]; } return ret; diff --git a/Modules/ThirdParty/GDCM/src/gdcm/Source/Common/gdcmByteSwap.h b/Modules/ThirdParty/GDCM/src/gdcm/Source/Common/gdcmByteSwap.h index 3b6b34f47f8..fdf4d2991f0 100644 --- a/Modules/ThirdParty/GDCM/src/gdcm/Source/Common/gdcmByteSwap.h +++ b/Modules/ThirdParty/GDCM/src/gdcm/Source/Common/gdcmByteSwap.h @@ -22,7 +22,7 @@ namespace gdcm /** * \brief ByteSwap - * \details Perform machine dependent byte swaping (Little Endian, + * \details Perform machine dependent byte swapping (Little Endian, * Big Endian, Bad Little Endian, Bad Big Endian). * TODO: bswap_32 / bswap_64 ... */ diff --git a/Modules/ThirdParty/GDCM/src/gdcm/Source/Common/gdcmConfigure.h.in b/Modules/ThirdParty/GDCM/src/gdcm/Source/Common/gdcmConfigure.h.in index 716f5bdb457..8ac4b8d8a97 100644 --- a/Modules/ThirdParty/GDCM/src/gdcm/Source/Common/gdcmConfigure.h.in +++ b/Modules/ThirdParty/GDCM/src/gdcm/Source/Common/gdcmConfigure.h.in @@ -32,13 +32,10 @@ # define GDCM_WORDS_BIGENDIAN #endif -/* Allow access to UINT32_MAX , cf gdcmCommon.h */ -#define __STDC_LIMIT_MACROS - /* Hard code the path to the public dictionary */ #define PUB_DICT_PATH "@GDCM_PUB_DICT_PATH@" -/* Usefull in particular for loadshared where the full path +/* Useful in particular for loadshared where the full path * to the lib is needed */ #define GDCM_SOURCE_DIR "@GDCM_SOURCE_DIR@" #define GDCM_EXECUTABLE_OUTPUT_PATH "@EXECUTABLE_OUTPUT_PATH@" @@ -78,10 +75,6 @@ #cmakedefine GDCM_AUTOLOAD_GDCMJNI -/* I guess something important */ -#cmakedefine GDCM_HAVE_STDINT_H -#cmakedefine GDCM_HAVE_INTTYPES_H - /* This variable allows you to have helpful debug statement */ /* That are in between #ifdef / endif in the gdcm code */ /* That means if GDCM_DEBUG is OFF there shouldn't be any 'cout' at all ! */ diff --git a/Modules/ThirdParty/GDCM/src/gdcm/Source/Common/gdcmCryptoFactory.h b/Modules/ThirdParty/GDCM/src/gdcm/Source/Common/gdcmCryptoFactory.h index 7362b203640..cd454dacb45 100644 --- a/Modules/ThirdParty/GDCM/src/gdcm/Source/Common/gdcmCryptoFactory.h +++ b/Modules/ThirdParty/GDCM/src/gdcm/Source/Common/gdcmCryptoFactory.h @@ -22,7 +22,7 @@ namespace gdcm /** * \brief Class to do handle the crypto factory - * \details GDCM needs to access in a platform independant way + * \details GDCM needs to access in a platform independent way * the user specified crypto engine. It can be: * \li CAPI (windows only) * \li OPENSSL (portable) diff --git a/Modules/ThirdParty/GDCM/src/gdcm/Source/Common/gdcmDirectory.cxx b/Modules/ThirdParty/GDCM/src/gdcm/Source/Common/gdcmDirectory.cxx index b639c8c6fda..684b99605cf 100644 --- a/Modules/ThirdParty/GDCM/src/gdcm/Source/Common/gdcmDirectory.cxx +++ b/Modules/ThirdParty/GDCM/src/gdcm/Source/Common/gdcmDirectory.cxx @@ -118,7 +118,7 @@ unsigned int Directory::Explore(FilenameType const &name, bool recursive) } // According to POSIX, the dirent structure contains a field char d_name[] - // of unspecified size, with at most NAME_MAX characters preceeding the + // of unspecified size, with at most NAME_MAX characters preceding the // terminating null character. Use of other fields will harm the porta- // bility of your programs. diff --git a/Modules/ThirdParty/GDCM/src/gdcm/Source/Common/gdcmDirectory.h b/Modules/ThirdParty/GDCM/src/gdcm/Source/Common/gdcmDirectory.h index 6b261a8db48..dd59e2657d3 100644 --- a/Modules/ThirdParty/GDCM/src/gdcm/Source/Common/gdcmDirectory.h +++ b/Modules/ThirdParty/GDCM/src/gdcm/Source/Common/gdcmDirectory.h @@ -27,7 +27,7 @@ namespace gdcm * \brief Class for manipulation directories * * \note This implementation provide a cross platform implementation - * for manipulating directores: basically traversing directories + * for manipulating directories: basically traversing directories * and harvesting files * * \note diff --git a/Modules/ThirdParty/GDCM/src/gdcm/Source/Common/gdcmFilename.h b/Modules/ThirdParty/GDCM/src/gdcm/Source/Common/gdcmFilename.h index f90a0678553..c9ab1bdac69 100644 --- a/Modules/ThirdParty/GDCM/src/gdcm/Source/Common/gdcmFilename.h +++ b/Modules/ThirdParty/GDCM/src/gdcm/Source/Common/gdcmFilename.h @@ -22,7 +22,7 @@ namespace gdcm { /** * \brief Class to manipulate file name's - * \note OS independant representation of a filename (to query path, name and extension from a filename) + * \note OS independent representation of a filename (to query path, name and extension from a filename) */ class GDCM_EXPORT Filename { @@ -55,9 +55,9 @@ class GDCM_EXPORT Filename operator const char * () const { return GetFileName(); } // FIXME: I don't like this function - // It hides the realpath call (maybe usefull) + // It hides the realpath call (maybe useful) // and it forces file to exist on the disk whereas Filename - // should be independant from file existence. + // should be independent from file existence. bool IsIdentical(Filename const &fn) const; /// Does the filename ends with a particular string ? diff --git a/Modules/ThirdParty/GDCM/src/gdcm/Source/Common/gdcmFilenameGenerator.cxx b/Modules/ThirdParty/GDCM/src/gdcm/Source/Common/gdcmFilenameGenerator.cxx index b29b544760b..d3b40f1128b 100644 --- a/Modules/ThirdParty/GDCM/src/gdcm/Source/Common/gdcmFilenameGenerator.cxx +++ b/Modules/ThirdParty/GDCM/src/gdcm/Source/Common/gdcmFilenameGenerator.cxx @@ -84,7 +84,7 @@ bool FilenameGenerator::Generate() if ( num_percent != 1 ) { // Bug: what if someone wants to output file such as %%%02 ... oh well - gdcmDebugMacro( "No more than one % in string formating please" ); + gdcmDebugMacro( "No more than one % in string formatting please" ); return false; } bool success = true; diff --git a/Modules/ThirdParty/GDCM/src/gdcm/Source/Common/gdcmObject.cxx b/Modules/ThirdParty/GDCM/src/gdcm/Source/Common/gdcmObject.cxx index ed1e7989de0..9338321f2fa 100644 --- a/Modules/ThirdParty/GDCM/src/gdcm/Source/Common/gdcmObject.cxx +++ b/Modules/ThirdParty/GDCM/src/gdcm/Source/Common/gdcmObject.cxx @@ -17,7 +17,7 @@ namespace gdcm { // Don't ask why, but this is EXTREMELY important on Win32 // Apparently the compiler is doing something special the first time it compiles - // this instanciation unit + // this instantiation unit // If this fake file is not present I get an unresolved symbol for each function // of the gdcm::Object class diff --git a/Modules/ThirdParty/GDCM/src/gdcm/Source/Common/gdcmOpenSSLCryptographicMessageSyntax.cxx b/Modules/ThirdParty/GDCM/src/gdcm/Source/Common/gdcmOpenSSLCryptographicMessageSyntax.cxx index 54c3a03ac67..ac07b73620e 100644 --- a/Modules/ThirdParty/GDCM/src/gdcm/Source/Common/gdcmOpenSSLCryptographicMessageSyntax.cxx +++ b/Modules/ThirdParty/GDCM/src/gdcm/Source/Common/gdcmOpenSSLCryptographicMessageSyntax.cxx @@ -115,7 +115,7 @@ bool OpenSSLCryptographicMessageSyntax::Encrypt(char *output, size_t &outlen, co cms = CMS_encrypt(recips, in, internalCipherType, flags); if (!cms) { - gdcmErrorMacro( "Error at creating the CMS strucutre." ); + gdcmErrorMacro( "Error at creating the CMS structure." ); goto err; } diff --git a/Modules/ThirdParty/GDCM/src/gdcm/Source/Common/gdcmRegion.h b/Modules/ThirdParty/GDCM/src/gdcm/Source/Common/gdcmRegion.h index 557d165f3ae..0aceab70b3a 100644 --- a/Modules/ThirdParty/GDCM/src/gdcm/Source/Common/gdcmRegion.h +++ b/Modules/ThirdParty/GDCM/src/gdcm/Source/Common/gdcmRegion.h @@ -43,7 +43,7 @@ public : /// compute the area virtual size_t Area() const = 0; - // implementation detail of heterogenous container in C++ + // implementation detail of heterogeneous container in C++ virtual Region *Clone() const = 0; /// Return the Axis-Aligned minimum bounding box for all regions diff --git a/Modules/ThirdParty/GDCM/src/gdcm/Source/Common/gdcmString.h b/Modules/ThirdParty/GDCM/src/gdcm/Source/Common/gdcmString.h index b456df9deec..64ab475bbcd 100644 --- a/Modules/ThirdParty/GDCM/src/gdcm/Source/Common/gdcmString.h +++ b/Modules/ThirdParty/GDCM/src/gdcm/Source/Common/gdcmString.h @@ -24,7 +24,7 @@ namespace gdcm * \brief String * * \note TDelimiter template parameter is used to separate multiple String (VM1 >) - * TMaxLength is only a hint. Noone actually respect the max length + * TMaxLength is only a hint. No one actually respect the max length * TPadChar is the string padding (0 or space) */ template @@ -57,7 +57,7 @@ class /*GDCM_EXPORT*/ String : public std::string /* PLEASE do not export me */ } String(const value_type* s, size_type n): std::string(s, n) { - // We are being passed a const char* pointer, so s[n] == 0 (garanteed!) + // We are being passed a const char* pointer, so s[n] == 0 (guaranteed!) if( n % 2 ) { push_back( TPadChar ); diff --git a/Modules/ThirdParty/GDCM/src/gdcm/Source/Common/gdcmSubject.h b/Modules/ThirdParty/GDCM/src/gdcm/Source/Common/gdcmSubject.h index 7cbf5de6d89..faf49bd0a62 100644 --- a/Modules/ThirdParty/GDCM/src/gdcm/Source/Common/gdcmSubject.h +++ b/Modules/ThirdParty/GDCM/src/gdcm/Source/Common/gdcmSubject.h @@ -43,7 +43,7 @@ class GDCM_EXPORT Subject : public Object unsigned long AddObserver(const Event & event, Command *) const; /** Get the command associated with the given tag. NOTE: This returns - * a pointer to a Command, but it is safe to asign this to a + * a pointer to a Command, but it is safe to assign this to a * Command::Pointer. Since Command inherits from LightObject, at this * point in the code, only a pointer or a reference to the Command can * be used. */ diff --git a/Modules/ThirdParty/GDCM/src/gdcm/Source/Common/gdcmSwapper.txx b/Modules/ThirdParty/GDCM/src/gdcm/Source/Common/gdcmSwapper.txx index 88e530a7bc3..9a1ba854e31 100644 --- a/Modules/ThirdParty/GDCM/src/gdcm/Source/Common/gdcmSwapper.txx +++ b/Modules/ThirdParty/GDCM/src/gdcm/Source/Common/gdcmSwapper.txx @@ -106,7 +106,9 @@ namespace gdcm } template <> inline float SwapperNoOp::Swap(float val) { - return Swap((uint32_t)val); + uint32_t temp; + memcpy(&temp, &val, sizeof(uint32_t)); + return static_cast(Swap(temp)); } template <> inline uint64_t SwapperNoOp::Swap(uint64_t val) { @@ -118,7 +120,9 @@ namespace gdcm } template <> inline double SwapperNoOp::Swap(double val) { - return Swap((uint64_t)val); + uint64_t temp; + memcpy(&temp, &val, sizeof(uint64_t)); + return static_cast(Swap(temp)); } template <> inline Tag SwapperNoOp::Swap(Tag val) @@ -172,7 +176,9 @@ namespace gdcm } template <> inline float SwapperDoOp::Swap(float val) { - return static_cast(Swap((uint32_t)val)); + uint32_t temp; + memcpy(&temp, &val, sizeof(uint32_t)); + return static_cast(Swap(temp)); } template <> inline uint64_t SwapperDoOp::Swap(uint64_t val) { @@ -184,7 +190,9 @@ namespace gdcm } template <> inline double SwapperDoOp::Swap(double val) { - return static_cast(Swap((uint64_t)val)); + uint64_t temp; + memcpy(&temp, &val, sizeof(uint64_t)); + return static_cast(Swap(temp)); } template <> inline Tag SwapperDoOp::Swap(Tag val) diff --git a/Modules/ThirdParty/GDCM/src/gdcm/Source/Common/gdcmSystem.h b/Modules/ThirdParty/GDCM/src/gdcm/Source/Common/gdcmSystem.h index 52ba3adcb41..4137b9672e4 100644 --- a/Modules/ThirdParty/GDCM/src/gdcm/Source/Common/gdcmSystem.h +++ b/Modules/ThirdParty/GDCM/src/gdcm/Source/Common/gdcmSystem.h @@ -28,7 +28,7 @@ class GDCM_EXPORT System public: /// Create a directory name path static bool MakeDirectory(const char *path); - /// Check whether the specified file exist on the sytem + /// Check whether the specified file exist on the system static bool FileExists(const char* filename); /// Check whether the file specified is a directory: static bool FileIsDirectory(const char* name); @@ -73,7 +73,7 @@ class GDCM_EXPORT System // Chdir // copy a file - /// Retrieve the hostname, only the first 255 byte are copyied. + /// Retrieve the hostname, only the first 255 byte are copied. /// This may come handy to specify the Station Name static bool GetHostName(char hostname[255]); diff --git a/Modules/ThirdParty/GDCM/src/gdcm/Source/Common/gdcmTypes.h b/Modules/ThirdParty/GDCM/src/gdcm/Source/Common/gdcmTypes.h index a8d26d43aae..8ea55458311 100644 --- a/Modules/ThirdParty/GDCM/src/gdcm/Source/Common/gdcmTypes.h +++ b/Modules/ThirdParty/GDCM/src/gdcm/Source/Common/gdcmTypes.h @@ -19,39 +19,7 @@ #include "gdcmLegacyMacro.h" //----------------------------------------------------------------------------- -#ifdef GDCM_HAVE_STDINT_H -#ifndef __STDC_LIMIT_MACROS -#define __STDC_LIMIT_MACROS -#endif // __STDC_LIMIT_MACROS -#include -//#undef __STDC_LIMIT_MACROS -#else -#ifdef GDCM_HAVE_INTTYPES_H -// Old system only have this -#include // For uint8_t uint16_t and uint32_t -#else -// Broken plateforms do not respect C99 and do not provide those typedef -// Special case for recent Borland compiler, comes with stdint.h -#if defined(__BORLANDC__) && (__BORLANDC__ < 0x0560) || defined(__MINGW32__) -typedef signed char int8_t; -typedef signed short int16_t; -typedef signed int int32_t; -typedef unsigned char uint8_t; -typedef unsigned short uint16_t; -typedef unsigned int uint32_t; -typedef unsigned __int64 uint64_t; -#elif defined(_MSC_VER) -#include "stdint.h" -#else -#error "Sorry, your platform is not supported" -#endif // defined(_MSC_VER) || defined(__BORLANDC__) && (__BORLANDC__ < 0x0560) || defined(__MINGW32__) -#endif // GDCM_HAVE_INTTYPES_H -#endif // GDCM_HAVE_STDINT_H - -// Basically for VS6 and bcc 5.5.1: -#ifndef UINT32_MAX -#define UINT32_MAX (4294967295U) -#endif +#include //----------------------------------------------------------------------------- #endif //GDCMTYPES_H diff --git a/Modules/ThirdParty/GDCM/src/gdcm/Source/Common/zipstreamimpl.hpp b/Modules/ThirdParty/GDCM/src/gdcm/Source/Common/zipstreamimpl.hpp index 03392d4657c..c0448904a7a 100644 --- a/Modules/ThirdParty/GDCM/src/gdcm/Source/Common/zipstreamimpl.hpp +++ b/Modules/ThirdParty/GDCM/src/gdcm/Source/Common/zipstreamimpl.hpp @@ -158,7 +158,7 @@ std::streamsize basic_zip_streambuf::flush() { written_byte_size = static_cast(_output_buffer.size()) - _zip_stream.avail_out; total_written_byte_size += written_byte_size; - // ouput buffer is full, dumping to ostream + // output buffer is full, dumping to ostream _ostream.write( (const char_type*) &(_output_buffer[0]), static_cast(written_byte_size/sizeof(char_type)*sizeof(char))); @@ -263,7 +263,7 @@ bool basic_zip_streambuf::zip_to_stream( written_byte_size= static_cast(_output_buffer.size()) - _zip_stream.avail_out; total_written_byte_size += written_byte_size; - // ouput buffer is full, dumping to ostream + // output buffer is full, dumping to ostream _ostream.write((const char_type*) &_output_buffer[0], static_cast(written_byte_size / sizeof(char_type))); @@ -711,7 +711,7 @@ basic_zip_istream::is_gzip() const * This must be called after the reading of compressed data is finished! This * method compares it to the crc of the uncompressed data. * - * \return true if crc check is succesful + * \return true if crc check is successful */ template inline bool diff --git a/Modules/ThirdParty/GDCM/src/gdcm/Source/DataDictionary/CSADefaultDicts.xsl b/Modules/ThirdParty/GDCM/src/gdcm/Source/DataDictionary/CSADefaultDicts.xsl index 56f8e3989ab..6dd4c4ddd97 100644 --- a/Modules/ThirdParty/GDCM/src/gdcm/Source/DataDictionary/CSADefaultDicts.xsl +++ b/Modules/ThirdParty/GDCM/src/gdcm/Source/DataDictionary/CSADefaultDicts.xsl @@ -166,7 +166,7 @@ generating group length for arbitrary even group number seems to get my xsltproc - {0,0,VR::INVALID,VM::VM0,0 } // Gard + {0,0,VR::INVALID,VM::VM0,0 } // Guard }; void CSAHeaderDict::LoadDefault() diff --git a/Modules/ThirdParty/GDCM/src/gdcm/Source/DataDictionary/CSAHeader.xml b/Modules/ThirdParty/GDCM/src/gdcm/Source/DataDictionary/CSAHeader.xml index 197bdb8b756..94853663d5d 100644 --- a/Modules/ThirdParty/GDCM/src/gdcm/Source/DataDictionary/CSAHeader.xml +++ b/Modules/ThirdParty/GDCM/src/gdcm/Source/DataDictionary/CSAHeader.xml @@ -51,11 +51,11 @@ sKSpace.ucPhasePartialFourier = 0x10 - + - + @@ -177,7 +177,7 @@ sKSpace.ucPhasePartialFourier = 0x10 - + @@ -187,7 +187,7 @@ sKSpace.ucPhasePartialFourier = 0x10 - + @@ -249,7 +249,7 @@ sKSpace.ucPhasePartialFourier = 0x10 - + diff --git a/Modules/ThirdParty/GDCM/src/gdcm/Source/DataDictionary/DefaultDicts.xsl b/Modules/ThirdParty/GDCM/src/gdcm/Source/DataDictionary/DefaultDicts.xsl index 6a898892650..d7917e414ff 100644 --- a/Modules/ThirdParty/GDCM/src/gdcm/Source/DataDictionary/DefaultDicts.xsl +++ b/Modules/ThirdParty/GDCM/src/gdcm/Source/DataDictionary/DefaultDicts.xsl @@ -164,7 +164,7 @@ generating group length for arbitrary even group number seems to get my xsltproc // FIXME: need a dummy element {0xffff,0xffff,VR::INVALID,VM::VM0,"","",true }, // dummy - {0xffff,0xffff,VR::INVALID,VM::VM0,0,0,true } // Gard + {0xffff,0xffff,VR::INVALID,VM::VM0,0,0,true } // Guard }; void Dict::LoadDefault() diff --git a/Modules/ThirdParty/GDCM/src/gdcm/Source/DataDictionary/DefaultPrivateDicts.xsl b/Modules/ThirdParty/GDCM/src/gdcm/Source/DataDictionary/DefaultPrivateDicts.xsl index 9be337dbcfd..7d9ba8b43e5 100644 --- a/Modules/ThirdParty/GDCM/src/gdcm/Source/DataDictionary/DefaultPrivateDicts.xsl +++ b/Modules/ThirdParty/GDCM/src/gdcm/Source/DataDictionary/DefaultPrivateDicts.xsl @@ -153,7 +153,7 @@ generating group length for arbitrary even group number seems to get my xsltproc - {0xffff,0xffff,0,VR::INVALID,VM::VM0,0,true } // Gard + {0xffff,0xffff,0,VR::INVALID,VM::VM0,0,true } // Guard }; void Dict::LoadDefault() diff --git a/Modules/ThirdParty/GDCM/src/gdcm/Source/DataDictionary/Part6todcm4che.xsl b/Modules/ThirdParty/GDCM/src/gdcm/Source/DataDictionary/Part6todcm4che.xsl index 459c6da6293..2859428731e 100644 --- a/Modules/ThirdParty/GDCM/src/gdcm/Source/DataDictionary/Part6todcm4che.xsl +++ b/Modules/ThirdParty/GDCM/src/gdcm/Source/DataDictionary/Part6todcm4che.xsl @@ -1,7 +1,7 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -746,7 +1237,7 @@ - + @@ -1406,83 +1897,83 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2203,7 +2694,7 @@ - + @@ -2306,7 +2797,7 @@ - + @@ -2663,7 +3154,7 @@ - + @@ -3689,7 +4180,7 @@ - + @@ -3791,8 +4282,8 @@ - - + + @@ -4581,7 +5072,7 @@ - + @@ -4642,10 +5133,10 @@ - + - + @@ -5703,7 +6194,7 @@ - + @@ -5818,9 +6309,9 @@ - + - + @@ -6528,8 +7019,8 @@ - - + + @@ -7752,7 +8243,7 @@ - + @@ -8293,7 +8784,7 @@ - + @@ -8671,11 +9162,13 @@ - + + + diff --git a/Modules/ThirdParty/GDCM/src/gdcm/Source/DataStructureAndEncodingDefinition/gdcmAttribute.h b/Modules/ThirdParty/GDCM/src/gdcm/Source/DataStructureAndEncodingDefinition/gdcmAttribute.h index 6eaeb24622a..2829603aed4 100644 --- a/Modules/ThirdParty/GDCM/src/gdcm/Source/DataStructureAndEncodingDefinition/gdcmAttribute.h +++ b/Modules/ThirdParty/GDCM/src/gdcm/Source/DataStructureAndEncodingDefinition/gdcmAttribute.h @@ -66,7 +66,7 @@ template<> class VRVLSize<1> { /** * \brief Attribute class * This class use template metaprograming tricks to let the user know when the template - * instanciation does not match the public dictionary. + * instantiation does not match the public dictionary. * * Typical example that compile is: * Attribute<0x0008,0x9007> a = {"ORIGINAL","PRIMARY","T1","NONE"}; @@ -118,7 +118,7 @@ class Attribute os << GetTag() << " "; os << TagToType::GetVRString() << " "; os << TagToType::GetVMString() << " "; - os << Internal[0]; // VM is at least garantee to be one + os << Internal[0]; // VM is at least guarantee to be one for(unsigned int i=1; i os << GetTag() << " "; os << TagToType::GetVRString() << " "; os << TagToType::GetVMString() << " "; - os << Internal; // VM is at least garantee to be one + os << Internal; // VM is at least guarantee to be one } // copy: //ArrayType GetValue(unsigned int idx = 0) { @@ -593,7 +593,7 @@ class Attribute os << GetTag() << " "; os << GetVR() << " "; os << GetVM() << " "; - os << Internal[0]; // VM is at least garantee to be one + os << Internal[0]; // VM is at least guarantee to be one for(unsigned int i=1; i : public Attribute } // Implementation of Print is common to all Mode (ASCII/Binary) void Print(std::ostream &_os) const { - _os << Internal[0]; // VM is at least garantee to be one + _os << Internal[0]; // VM is at least guarantee to be one for(int i=1; i::Length; ++i) _os << "," << Internal[i]; } @@ -869,7 +869,7 @@ class Attribute void Print(std::ostream &_os) const { assert( Length ); assert( Internal ); - _os << Internal[0]; // VM is at least garantee to be one + _os << Internal[0]; // VM is at least guarantee to be one const unsigned long length = GetLength() < 25 ? GetLength() : 25; for(unsigned long i=1; i::Length; ++i) _os << "," << Internal[i]; } @@ -514,7 +514,7 @@ template<> class EncodingImplementation { }; // For particular case for ASCII string -// WARNING: This template explicitly instanciates a particular +// WARNING: This template explicitly instantiates a particular // EncodingImplementation THEREFORE it is required to be declared after the // EncodingImplementation is needs (doh!) #if 0 @@ -546,7 +546,7 @@ class Element } // Implementation of Print is common to all Mode (ASCII/Binary) void Print(std::ostream &_os) const { - _os << Internal[0]; // VM is at least garantee to be one + _os << Internal[0]; // VM is at least guarantee to be one for(int i=1; i::Length; ++i) _os << "," << Internal[i]; } @@ -697,7 +697,7 @@ class Element void Print(std::ostream &_os) const { assert( Length ); assert( Internal ); - _os << Internal[0]; // VM is at least garantee to be one + _os << Internal[0]; // VM is at least guarantee to be one const unsigned long length = GetLength() < 25 ? GetLength() : 25; for(unsigned long i=1; i(is) ) { // GENESIS_SIGNA-JPEG-CorruptFrag.dcm - // JPEG fragment is declared to have 61902, but infact really is only 61901 + // JPEG fragment is declared to have 61902, but in fact really is only 61901 // so we end up reading 0xddff,0x00e0, and VL = 0x0 (1 byte) throw Exception( "Problem #2" ); - return is; } #ifdef GDCM_SUPPORT_BROKEN_IMPLEMENTATION if( TagField != itemStart && TagField != seqDelItem ) @@ -107,7 +105,6 @@ class GDCM_EXPORT Fragment : public DataElement ParseException pe; pe.SetLastElement( *this ); throw pe; - return is; } ValueField = bv; return is; @@ -136,7 +133,6 @@ class GDCM_EXPORT Fragment : public DataElement { gdcmErrorMacro( "Giving up" ); throw "Impossible to backtrack"; - return is; } } else @@ -162,7 +158,6 @@ class GDCM_EXPORT Fragment : public DataElement ParseException pe; pe.SetLastElement( *this ); throw pe; - return is; } ValueField = bv; return is; diff --git a/Modules/ThirdParty/GDCM/src/gdcm/Source/DataStructureAndEncodingDefinition/gdcmItem.h b/Modules/ThirdParty/GDCM/src/gdcm/Source/DataStructureAndEncodingDefinition/gdcmItem.h index 6fd9a6d8435..f6415cd6f70 100644 --- a/Modules/ThirdParty/GDCM/src/gdcm/Source/DataStructureAndEncodingDefinition/gdcmItem.h +++ b/Modules/ThirdParty/GDCM/src/gdcm/Source/DataStructureAndEncodingDefinition/gdcmItem.h @@ -34,7 +34,7 @@ class DataSet; * Sequence of Items. * An Item contains a Data Set . * See PS 3.5 7.5.1 Item Encoding Rules - * Each Item of a Data Element of VR SQ shall be encoded as a DICOM Standart + * Each Item of a Data Element of VR SQ shall be encoded as a DICOM Standard * Data Element with a specific Data Element Tag of Value (FFFE,E000). The Item * Tag is followed by a 4 byte Item Length field encoded in one of the * following two ways Explicit/ Implicit @@ -123,7 +123,7 @@ class GDCM_EXPORT Item : public DataElement return is; } // Self - // Some file written by GDCM 1.0 we writting 0xFFFFFFFF instead of 0x0 + // Some file written by GDCM 1.0 we write 0xFFFFFFFF instead of 0x0 if( TagField == Tag(0xfffe,0xe0dd) ) { if( ValueLengthField ) diff --git a/Modules/ThirdParty/GDCM/src/gdcm/Source/DataStructureAndEncodingDefinition/gdcmParser.h b/Modules/ThirdParty/GDCM/src/gdcm/Source/DataStructureAndEncodingDefinition/gdcmParser.h index 175cc0805f2..2ae55736c85 100644 --- a/Modules/ThirdParty/GDCM/src/gdcm/Source/DataStructureAndEncodingDefinition/gdcmParser.h +++ b/Modules/ThirdParty/GDCM/src/gdcm/Source/DataStructureAndEncodingDefinition/gdcmParser.h @@ -26,7 +26,7 @@ namespace gdcm /** * \brief Parser ala XML_Parser from expat (SAX) * - * \details Detailled description here + * \details Detailed description here * \note Simple API for DICOM */ class GDCM_EXPORT Parser /*: private IStream*/ diff --git a/Modules/ThirdParty/GDCM/src/gdcm/Source/DataStructureAndEncodingDefinition/gdcmPreamble.cxx b/Modules/ThirdParty/GDCM/src/gdcm/Source/DataStructureAndEncodingDefinition/gdcmPreamble.cxx index bb6e77bdfdc..213e3e9bead 100644 --- a/Modules/ThirdParty/GDCM/src/gdcm/Source/DataStructureAndEncodingDefinition/gdcmPreamble.cxx +++ b/Modules/ThirdParty/GDCM/src/gdcm/Source/DataStructureAndEncodingDefinition/gdcmPreamble.cxx @@ -29,7 +29,7 @@ Preamble::~Preamble() std::istream &Preamble::Read(std::istream &is) { - // \precondition: we are at beg of Preamble + // \precondition: we are at beginning of Preamble gdcmAssertAlwaysMacro( !IsEmpty() /*&& is.tellg() == 0*/ ); if( is.read(Internal, 128+4) ) { @@ -47,7 +47,7 @@ std::istream &Preamble::Read(std::istream &is) Internal = nullptr; throw Exception( "Not a DICOM V3 file (No Preamble)" ); - // \postcondition we are after the Preamble (or at beg of file if none) + // \postcondition we are after the Preamble (or at the beginning of file if none) } void Preamble::Valid() @@ -79,7 +79,7 @@ std::ostream const &Preamble::Write(std::ostream &os) const os.write( Internal, 128+4); } - // \postcondition a valid Preamble has been writen to stream + // \postcondition a valid Preamble has been written to stream return os; } diff --git a/Modules/ThirdParty/GDCM/src/gdcm/Source/DataStructureAndEncodingDefinition/gdcmReader.cxx b/Modules/ThirdParty/GDCM/src/gdcm/Source/DataStructureAndEncodingDefinition/gdcmReader.cxx index 88e0df7b212..6b9d5843913 100644 --- a/Modules/ThirdParty/GDCM/src/gdcm/Source/DataStructureAndEncodingDefinition/gdcmReader.cxx +++ b/Modules/ThirdParty/GDCM/src/gdcm/Source/DataStructureAndEncodingDefinition/gdcmReader.cxx @@ -172,7 +172,7 @@ TransferSyntax Reader::GuessTransferSyntax() { nts = TransferSyntax::Implicit; // We are reading a private creator (0x0010) so it's LO, it's - // difficult to come up with someting to check, maybe that + // difficult to come up with something to check, maybe that // VL < 256 ... gdcmWarningMacro( "Very dangerous assertion needs some work" ); } @@ -735,6 +735,8 @@ static inline bool isasciiupper( char c ) { // scope of this function. bool Reader::CanRead() const { + if( !Stream ) return false; + // fastpath std::istream &is = *Stream; if( is.bad() ) return false; diff --git a/Modules/ThirdParty/GDCM/src/gdcm/Source/DataStructureAndEncodingDefinition/gdcmReader.h b/Modules/ThirdParty/GDCM/src/gdcm/Source/DataStructureAndEncodingDefinition/gdcmReader.h index 3c1d0ef9d68..1c405ab3f42 100644 --- a/Modules/ThirdParty/GDCM/src/gdcm/Source/DataStructureAndEncodingDefinition/gdcmReader.h +++ b/Modules/ThirdParty/GDCM/src/gdcm/Source/DataStructureAndEncodingDefinition/gdcmReader.h @@ -28,7 +28,7 @@ namespace gdcm_ns * formedness check only, and to some extent catch known error (non * well-formed document). * - * Detailled description here + * Detailed description here * * A DataSet DOES NOT contains group 0x0002 (see FileMetaInformation) * diff --git a/Modules/ThirdParty/GDCM/src/gdcm/Source/DataStructureAndEncodingDefinition/gdcmSequenceOfFragments.cxx b/Modules/ThirdParty/GDCM/src/gdcm/Source/DataStructureAndEncodingDefinition/gdcmSequenceOfFragments.cxx index 125b6beaffc..d756ed57451 100644 --- a/Modules/ThirdParty/GDCM/src/gdcm/Source/DataStructureAndEncodingDefinition/gdcmSequenceOfFragments.cxx +++ b/Modules/ThirdParty/GDCM/src/gdcm/Source/DataStructureAndEncodingDefinition/gdcmSequenceOfFragments.cxx @@ -50,7 +50,7 @@ VL SequenceOfFragments::ComputeLength() const length += fraglen; } assert( SequenceLengthField.IsUndefined() ); - length += 8; // seq end delimitor (tag + vl) + length += 8; // seq end delimiter (tag + vl) return length; } diff --git a/Modules/ThirdParty/GDCM/src/gdcm/Source/DataStructureAndEncodingDefinition/gdcmSequenceOfItems.txx b/Modules/ThirdParty/GDCM/src/gdcm/Source/DataStructureAndEncodingDefinition/gdcmSequenceOfItems.txx index 8a0b2efef86..3dc251e675d 100644 --- a/Modules/ThirdParty/GDCM/src/gdcm/Source/DataStructureAndEncodingDefinition/gdcmSequenceOfItems.txx +++ b/Modules/ThirdParty/GDCM/src/gdcm/Source/DataStructureAndEncodingDefinition/gdcmSequenceOfItems.txx @@ -28,7 +28,7 @@ VL SequenceOfItems::ComputeLength() const } if( SequenceLengthField.IsUndefined() ) { - length += 8; // item end delimitor (tag + vl) + length += 8; // item end delimiter (tag + vl) } // For defined length SQ, make sure computation is correct (compare // to original length) diff --git a/Modules/ThirdParty/GDCM/src/gdcm/Source/DataStructureAndEncodingDefinition/gdcmTag.h b/Modules/ThirdParty/GDCM/src/gdcm/Source/DataStructureAndEncodingDefinition/gdcmTag.h index 8abfe03a981..dc21df325d1 100644 --- a/Modules/ThirdParty/GDCM/src/gdcm/Source/DataStructureAndEncodingDefinition/gdcmTag.h +++ b/Modules/ThirdParty/GDCM/src/gdcm/Source/DataStructureAndEncodingDefinition/gdcmTag.h @@ -114,7 +114,7 @@ class GDCM_EXPORT Tag // FIXME FIXME FIXME TODO // the following is pretty dumb. Since we have control over who is group // and who is element, we should reverse them in little endian and big endian case - // since what we really want is fast comparison and not garantee that group is in #0 + // since what we really want is fast comparison and not guarantee that group is in #0 // ... bool operator<(const Tag &_val) const { @@ -237,7 +237,7 @@ class GDCM_EXPORT Tag } /// Read from a comma separated string. - /// This is a highly user oriented function, the string should be formated as: + /// This is a highly user oriented function, the string should be formatted as: /// 1234,5678 to specify the tag (0x1234,0x5678) /// The notation comes from the DICOM standard, and is handy to use from a /// command line program diff --git a/Modules/ThirdParty/GDCM/src/gdcm/Source/DataStructureAndEncodingDefinition/gdcmTransferSyntax.cxx b/Modules/ThirdParty/GDCM/src/gdcm/Source/DataStructureAndEncodingDefinition/gdcmTransferSyntax.cxx index 9c8cf1450e9..437504c28f3 100644 --- a/Modules/ThirdParty/GDCM/src/gdcm/Source/DataStructureAndEncodingDefinition/gdcmTransferSyntax.cxx +++ b/Modules/ThirdParty/GDCM/src/gdcm/Source/DataStructureAndEncodingDefinition/gdcmTransferSyntax.cxx @@ -175,7 +175,7 @@ bool TransferSyntax::IsLossy() const // transfer syntax. If you use the JPEG compression algorithm (ITU-T T.81, // ISO/IEC IS 10918-1), You will not be able to declare a lossy compress pixel // data using JPEGLosslessProcess14_1 For the same reason using J2K (ITU-T -// T.800, ISO/IEC IS 15444-1), you shoult not be allowed to stored an +// T.800, ISO/IEC IS 15444-1), you should not be allowed to stored an // irreversible wavelet compressed pixel data in a file declared with transfer // syntax JPEG2000Lossless. // Same goes for JPEG-LS (ITU-T T.87, ISO/IEC IS 14495-1), and to some extent diff --git a/Modules/ThirdParty/GDCM/src/gdcm/Source/DataStructureAndEncodingDefinition/gdcmTransferSyntax.h b/Modules/ThirdParty/GDCM/src/gdcm/Source/DataStructureAndEncodingDefinition/gdcmTransferSyntax.h index 51fcdf96aef..8be7a3e5dbc 100644 --- a/Modules/ThirdParty/GDCM/src/gdcm/Source/DataStructureAndEncodingDefinition/gdcmTransferSyntax.h +++ b/Modules/ThirdParty/GDCM/src/gdcm/Source/DataStructureAndEncodingDefinition/gdcmTransferSyntax.h @@ -46,7 +46,7 @@ class GDCM_EXPORT TransferSyntax } NegociatedType; #if 0 - //NOT FLEXIBLE, since force user to update lib everytime new module + //NOT FLEXIBLE, since forces user to update lib every time new module //comes out... // TODO typedef enum { diff --git a/Modules/ThirdParty/GDCM/src/gdcm/Source/DataStructureAndEncodingDefinition/gdcmVL.h b/Modules/ThirdParty/GDCM/src/gdcm/Source/DataStructureAndEncodingDefinition/gdcmVL.h index c4d5ec54cb8..764707b9b99 100644 --- a/Modules/ThirdParty/GDCM/src/gdcm/Source/DataStructureAndEncodingDefinition/gdcmVL.h +++ b/Modules/ThirdParty/GDCM/src/gdcm/Source/DataStructureAndEncodingDefinition/gdcmVL.h @@ -73,7 +73,7 @@ class GDCM_EXPORT VL friend std::ostream& operator<<(std::ostream& os, const VL& vl); - // PURPOSELY not implemented (could not differenciate 16bits vs 32bits VL) + // PURPOSELY not implemented (could not differentiate 16bits vs 32bits VL) //friend std::istream& operator>>(std::istream& is, VL& n); template diff --git a/Modules/ThirdParty/GDCM/src/gdcm/Source/DataStructureAndEncodingDefinition/gdcmVR16ExplicitDataElement.h b/Modules/ThirdParty/GDCM/src/gdcm/Source/DataStructureAndEncodingDefinition/gdcmVR16ExplicitDataElement.h index 035c2e9df0f..61cbbb94fb9 100644 --- a/Modules/ThirdParty/GDCM/src/gdcm/Source/DataStructureAndEncodingDefinition/gdcmVR16ExplicitDataElement.h +++ b/Modules/ThirdParty/GDCM/src/gdcm/Source/DataStructureAndEncodingDefinition/gdcmVR16ExplicitDataElement.h @@ -21,7 +21,7 @@ namespace gdcm // Data Element (Explicit) /** * \brief Class to read/write a DataElement as Explicit Data Element - * \note This class support 16 bits when finding an unkown VR: + * \note This class support 16 bits when finding an unknown VR: * For instance: * Siemens_CT_Sensation64_has_VR_RT.dcm */ diff --git a/Modules/ThirdParty/GDCM/src/gdcm/Source/DataStructureAndEncodingDefinition/gdcmVR16ExplicitDataElement.txx b/Modules/ThirdParty/GDCM/src/gdcm/Source/DataStructureAndEncodingDefinition/gdcmVR16ExplicitDataElement.txx index 372780dd0ed..39b4706545c 100644 --- a/Modules/ThirdParty/GDCM/src/gdcm/Source/DataStructureAndEncodingDefinition/gdcmVR16ExplicitDataElement.txx +++ b/Modules/ThirdParty/GDCM/src/gdcm/Source/DataStructureAndEncodingDefinition/gdcmVR16ExplicitDataElement.txx @@ -97,7 +97,7 @@ std::istream &VR16ExplicitDataElement::ReadPreValue(std::istream &is) // gdcm-MR-PHILIPS-16-Multi-Seq.dcm if( TagField == Tag(0xfffe, 0xe000) ) { - gdcmWarningMacro( "Found item delimitor in item" ); + gdcmWarningMacro( "Found item delimiter in item" ); ParseException pe; pe.SetLastElement( *this ); throw pe; diff --git a/Modules/ThirdParty/GDCM/src/gdcm/Source/DataStructureAndEncodingDefinition/gdcmWriter.h b/Modules/ThirdParty/GDCM/src/gdcm/Source/DataStructureAndEncodingDefinition/gdcmWriter.h index 807619b6cd5..3b9acc4b437 100644 --- a/Modules/ThirdParty/GDCM/src/gdcm/Source/DataStructureAndEncodingDefinition/gdcmWriter.h +++ b/Modules/ThirdParty/GDCM/src/gdcm/Source/DataStructureAndEncodingDefinition/gdcmWriter.h @@ -26,7 +26,7 @@ class FileMetaInformation; * \details This class is a non-validating writer, it will only performs well- * formedness check only. * - * \details Detailled description here + * \details Detailed description here * To avoid GDCM being yet another broken DICOM lib we try to * be user level and avoid writing illegal stuff (odd length, * non-zero value for Item start/end length ...) @@ -36,7 +36,7 @@ class FileMetaInformation; * - Correct Meta Information Header (see gdcm::FileMetaInformation) * - Zero value for Item Length (0xfffe, 0xe00d/0xe0dd) * - Even length for any elements - * - Alphabetical order for elements (garanteed by design of internals) + * - Alphabetical order for elements (guaranteed by design of internals) * - 32bits VR will be rewritten with 00 * * \warning diff --git a/Modules/ThirdParty/GDCM/src/gdcm/Source/InformationObjectDefinition/Part3.xml b/Modules/ThirdParty/GDCM/src/gdcm/Source/InformationObjectDefinition/Part3.xml index ad0c3e5b74a..802c69d9f1a 100644 --- a/Modules/ThirdParty/GDCM/src/gdcm/Source/InformationObjectDefinition/Part3.xml +++ b/Modules/ThirdParty/GDCM/src/gdcm/Source/InformationObjectDefinition/Part3.xml @@ -2261,7 +2261,7 @@ Zero or more Items may be included in the sequence. The sequence items are order - A modifer for a Patient's Primary Language. Can be used to specify a national language variant. + A modifier for a Patient's Primary Language. Can be used to specify a national language variant. Exactly one Item may be included in the sequence. @@ -3897,7 +3897,7 @@ The sequence may have one or more Items. A number that identifies this Series. Notes: 1. The value of this attribute should be unique for all series in a study created on the same equipment. -2. Because series can be created on more than one equipment, it can not be guranteed that the value of Series Number (0020,0011) is unique in a study. +2. Because series can be created on more than one equipment, it can not be guaranteed that the value of Series Number (0020,0011) is unique in a study. Uniquely identifies the Performed Procedure Step SOP Instance to which the Series is related (e.g. a Modality or General-Purpose Performed Procedure Step SOP Instance). Only a single Item is permitted in this sequence. @@ -5209,7 +5209,7 @@ Required if Concatenation UID (0020,9161) is present. Required if a group of multi-frame image SOP Instances within a Series are part of a Concatenation. - Identifier for one SOP Instance belonging to a concatenation. See C.7.6.16.2.2.4 for further specification. The first instance in a concatentation (that with the lowest Concatenation Frame Offset Number (0020,9228) value) shall have an In-concatenation Number (0020,9162) value of 1, and subsequent instances shall have values monotonically increasing by 1. + Identifier for one SOP Instance belonging to a concatenation. See C.7.6.16.2.2.4 for further specification. The first instance in a concatenation (that with the lowest Concatenation Frame Offset Number (0020,9228) value) shall have an In-concatenation Number (0020,9162) value of 1, and subsequent instances shall have values monotonically increasing by 1. Required if Concatenation UID (0020,9161) is present.
Due to implementation specific reasons (such as maximum object size) the information of a multi-frame image may be split into more than one SOP Instance. These SOP Instances form together a Concatenation. This is a group of SOP Instances within a Series that is uniquely identified by the Concatenation UID (0020,9161). The Dimension Index Sequence (0020,9222) for each SOP Instance with the same Concatenation UID (0020,9161) shall contain exactly the same tags and values. @@ -13070,7 +13070,7 @@ DOUBLE_SIDED = the Compensator has a shaped (i.e. non-flat) surface on both side Compensator Linear Stopping Power Ratio, relative to water, at the beam energy specified by the Nominal Beam Energy (300A,0114) of the first Control Point of the Ion Control Point Sequence (300A,03A8). - The diameter (in mm) of the milling tool to be used to create the compensator. The diameter is expressed as the actual physcial size and not a projected size at isocenter. + The diameter (in mm) of the milling tool to be used to create the compensator. The diameter is expressed as the actual physical size and not a projected size at isocenter. Number of boli associated with current Beam. @@ -14112,13 +14112,13 @@ c) Table Angle moves from 170 degrees to 160 degrees, Table Rotation Direction Introduces sequence of parameters that were overridden during the administration of the beam segment immediately prior to the current control point. The sequence may contain one or more items. - Contains the Data Element Tag of the parent sequence containing the attribute that was overriden. The value is limited in scope to the Treatment Session Ion Beam Sequence (3008,0021) and all nested sequences therein. + Contains the Data Element Tag of the parent sequence containing the attribute that was overridden. The value is limited in scope to the Treatment Session Ion Beam Sequence (3008,0021) and all nested sequences therein. Contains the Data Element Tag of the attribute that was overridden. - Contains the ones-based sequence item index of the overriden attributes within it's parent sequence. The value is limited in scope to the Treatment Session Ion Beam Sequence (3008,0021) and all nested sequences therein. + Contains the ones-based sequence item index of the overridden attributes within it's parent sequence. The value is limited in scope to the Treatment Session Ion Beam Sequence (3008,0021) and all nested sequences therein. Name of operator who authorized override. @@ -20620,7 +20620,7 @@ Note: Values of 0\0 indicate that the overlay pixels start 1 row above and one c Number of Bits Allocated in the Overlay. -Tthe value of this Attribute shall be 1. +The value of this Attribute shall be 1. Note: Formerly the standard described embedding the overlay data in the Image Pixel Data (7FE0,0010), in which case the value of this Attribute was required to be the same as Bits Allocated (0028,0100). This usage has been retired. See PS 3.3 2004. @@ -22672,7 +22672,7 @@ BASIC FILM BOX PRESENTATION MODULE ATTRIBUTES Maximum density that can be printed, expressed in hundredths of OD. - A sequence which specifies combinations of Medium Type and Film Size ID for which the printer will accept an N-CREATE of a Film Box, but are not physically installed in the printer at this time. It also specifies the Min and Max Densities supported by these media. User intervention may be required to instal these media in the printer. + A sequence which specifies combinations of Medium Type and Film Size ID for which the printer will accept an N-CREATE of a Film Box, but are not physically installed in the printer at this time. It also specifies the Min and Max Densities supported by these media. User intervention may be required to install these media in the printer. One item for each Medium Type and Film Size ID available, but not installed shall be included. @@ -27591,7 +27591,7 @@ Notes: 1. The following attributes from image IODs are examples of some possibl Sequence that defines sorting criteria to be applied to the result of filter and reformat operations, to define the order in which to present the images in the Image Boxes. Zero or more items shall be included in this sequence. See C.23.3.1.2. -
The Items in the Sorting Operations Sequence (0072,0600) define the order in which the images resulting from the filter and reformat operations on the Image Set are to be displayed in the associated Image Boxes of the Display Set. The sorting criteria may include the value of a numeric, date, or time Attribute that is expected to be present in each of the image objects in the filtered Image Set, and/or an abstract sorting category. A sorting direction shall be associated with each sorting criterion. If a textual Attribute is used for sorting, then the INCREASING sorting direction indicates alpabetical order, and DECREASING indicates reverse alphabetical order. +
The Items in the Sorting Operations Sequence (0072,0600) define the order in which the images resulting from the filter and reformat operations on the Image Set are to be displayed in the associated Image Boxes of the Display Set. The sorting criteria may include the value of a numeric, date, or time Attribute that is expected to be present in each of the image objects in the filtered Image Set, and/or an abstract sorting category. A sorting direction shall be associated with each sorting criterion. If a textual Attribute is used for sorting, then the INCREASING sorting direction indicates alphabetical order, and DECREASING indicates reverse alphabetical order. If a code sequence Attribute is used for sorting, then the Code Meaning (0008,0104) shall be sorted alphabetically. If a string numeric Attribute is used for sorting (VR of IS or DS), then sorting shall be on the numeric value, and padding shall be ignored. When sorting by date or time Attribute, then sorting shall be on the temporal value, not the alphabetic string. If there are multiple Items in the Sorting Operations Sequence (0072,0600), then the sorting operations shall be applied in Item order. The least rapidly varying attribute for the sorting operation shall be the first Item in the sequence. Note: For example, a Sorting Operations Sequence (0072,0600) with two Items: @@ -27609,7 +27609,7 @@ Notes: 1. The following attributes from image IODs are examples of some possibl Data Element Tag of an Attribute from an Image IOD to be used for sorting. See C.23.3.1.2 for potential attributes. Required if Sort-by Category (0072,0602) is not present. -
The Items in the Sorting Operations Sequence (0072,0600) define the order in which the images resulting from the filter and reformat operations on the Image Set are to be displayed in the associated Image Boxes of the Display Set. The sorting criteria may include the value of a numeric, date, or time Attribute that is expected to be present in each of the image objects in the filtered Image Set, and/or an abstract sorting category. A sorting direction shall be associated with each sorting criterion. If a textual Attribute is used for sorting, then the INCREASING sorting direction indicates alpabetical order, and DECREASING indicates reverse alphabetical order. +
The Items in the Sorting Operations Sequence (0072,0600) define the order in which the images resulting from the filter and reformat operations on the Image Set are to be displayed in the associated Image Boxes of the Display Set. The sorting criteria may include the value of a numeric, date, or time Attribute that is expected to be present in each of the image objects in the filtered Image Set, and/or an abstract sorting category. A sorting direction shall be associated with each sorting criterion. If a textual Attribute is used for sorting, then the INCREASING sorting direction indicates alphabetical order, and DECREASING indicates reverse alphabetical order. If a code sequence Attribute is used for sorting, then the Code Meaning (0008,0104) shall be sorted alphabetically. If a string numeric Attribute is used for sorting (VR of IS or DS), then sorting shall be on the numeric value, and padding shall be ignored. When sorting by date or time Attribute, then sorting shall be on the temporal value, not the alphabetic string. If there are multiple Items in the Sorting Operations Sequence (0072,0600), then the sorting operations shall be applied in Item order. The least rapidly varying attribute for the sorting operation shall be the first Item in the sequence. Note: For example, a Sorting Operations Sequence (0072,0600) with two Items: @@ -27635,7 +27635,7 @@ Defined terms: ALONG_AXIS: for CT, MR, other cross-sectional image sets BY_ACQ_TIME Required if Selector Attribute (0072,0026) is not present. -
The Items in the Sorting Operations Sequence (0072,0600) define the order in which the images resulting from the filter and reformat operations on the Image Set are to be displayed in the associated Image Boxes of the Display Set. The sorting criteria may include the value of a numeric, date, or time Attribute that is expected to be present in each of the image objects in the filtered Image Set, and/or an abstract sorting category. A sorting direction shall be associated with each sorting criterion. If a textual Attribute is used for sorting, then the INCREASING sorting direction indicates alpabetical order, and DECREASING indicates reverse alphabetical order. +
The Items in the Sorting Operations Sequence (0072,0600) define the order in which the images resulting from the filter and reformat operations on the Image Set are to be displayed in the associated Image Boxes of the Display Set. The sorting criteria may include the value of a numeric, date, or time Attribute that is expected to be present in each of the image objects in the filtered Image Set, and/or an abstract sorting category. A sorting direction shall be associated with each sorting criterion. If a textual Attribute is used for sorting, then the INCREASING sorting direction indicates alphabetical order, and DECREASING indicates reverse alphabetical order. If a code sequence Attribute is used for sorting, then the Code Meaning (0008,0104) shall be sorted alphabetically. If a string numeric Attribute is used for sorting (VR of IS or DS), then sorting shall be on the numeric value, and padding shall be ignored. When sorting by date or time Attribute, then sorting shall be on the temporal value, not the alphabetic string. If there are multiple Items in the Sorting Operations Sequence (0072,0600), then the sorting operations shall be applied in Item order. The least rapidly varying attribute for the sorting operation shall be the first Item in the sequence. Note: For example, a Sorting Operations Sequence (0072,0600) with two Items: diff --git a/Modules/ThirdParty/GDCM/src/gdcm/Source/InformationObjectDefinition/Template.xml.in b/Modules/ThirdParty/GDCM/src/gdcm/Source/InformationObjectDefinition/Template.xml.in index 3197f739ce9..176fed81c26 100644 --- a/Modules/ThirdParty/GDCM/src/gdcm/Source/InformationObjectDefinition/Template.xml.in +++ b/Modules/ThirdParty/GDCM/src/gdcm/Source/InformationObjectDefinition/Template.xml.in @@ -1,6 +1,6 @@ +why we should repeat it. Type is compulsory and Description is not necessary either.--> diff --git a/Modules/ThirdParty/GDCM/src/gdcm/Source/InformationObjectDefinition/gdcmDefs.h b/Modules/ThirdParty/GDCM/src/gdcm/Source/InformationObjectDefinition/gdcmDefs.h index b2a462f4320..cc54c966ef5 100644 --- a/Modules/ThirdParty/GDCM/src/gdcm/Source/InformationObjectDefinition/gdcmDefs.h +++ b/Modules/ThirdParty/GDCM/src/gdcm/Source/InformationObjectDefinition/gdcmDefs.h @@ -41,7 +41,7 @@ class GDCM_EXPORT Defs Modules &GetModules() { return Part3Modules; } /// Users should not directly use Macro. Macro are simply a way for DICOM WG to re-use Tables. - /// Macros are conviently wraped within Modules. See gdcm::Module API directly + /// Macros are conviently wrapped within Modules. See gdcm::Module API directly const Macros &GetMacros() const { return Part3Macros; } Macros &GetMacros() { return Part3Macros; } diff --git a/Modules/ThirdParty/GDCM/src/gdcm/Source/InformationObjectDefinition/gdcmMacro.h b/Modules/ThirdParty/GDCM/src/gdcm/Source/InformationObjectDefinition/gdcmMacro.h index dde90f13e23..dab3334bb28 100644 --- a/Modules/ThirdParty/GDCM/src/gdcm/Source/InformationObjectDefinition/gdcmMacro.h +++ b/Modules/ThirdParty/GDCM/src/gdcm/Source/InformationObjectDefinition/gdcmMacro.h @@ -51,7 +51,7 @@ class GDCM_EXPORT Macro void Clear() { ModuleInternal.clear(); } - /// Will add a ModuleEntry direcly at root-level. See Macro for nested-included level. + /// Will add a ModuleEntry directly at root-level. See Macro for nested-included level. void AddMacroEntry(const Tag& tag, const MacroEntry & module) { ModuleInternal.insert( diff --git a/Modules/ThirdParty/GDCM/src/gdcm/Source/InformationObjectDefinition/gdcmModule.h b/Modules/ThirdParty/GDCM/src/gdcm/Source/InformationObjectDefinition/gdcmModule.h index 352442b61c5..2df2315f036 100644 --- a/Modules/ThirdParty/GDCM/src/gdcm/Source/InformationObjectDefinition/gdcmModule.h +++ b/Modules/ThirdParty/GDCM/src/gdcm/Source/InformationObjectDefinition/gdcmModule.h @@ -52,7 +52,7 @@ class GDCM_EXPORT Module void Clear() { ModuleInternal.clear(); } - /// Will add a ModuleEntry direcly at root-level. See Macro for nested-included level. + /// Will add a ModuleEntry directly at root-level. See Macro for nested-included level. void AddModuleEntry(const Tag& tag, const ModuleEntry & module) { ModuleInternal.insert( diff --git a/Modules/ThirdParty/GDCM/src/gdcm/Source/InformationObjectDefinition/gdcmTableReader.cxx b/Modules/ThirdParty/GDCM/src/gdcm/Source/InformationObjectDefinition/gdcmTableReader.cxx index 0aa6dd48942..fb08e679598 100644 --- a/Modules/ThirdParty/GDCM/src/gdcm/Source/InformationObjectDefinition/gdcmTableReader.cxx +++ b/Modules/ThirdParty/GDCM/src/gdcm/Source/InformationObjectDefinition/gdcmTableReader.cxx @@ -586,7 +586,7 @@ int TableReader::Read() int ret = 0; do { is.read(buf, sizeof(buf)); - std::streamsize len = is.gcount(); + std::streamsize len = is.gcount(); done = (unsigned int)len < sizeof(buf); if (XML_Parse(parser, buf, (int)len, done) == XML_STATUS_ERROR) { fprintf(stderr, diff --git a/Modules/ThirdParty/GDCM/src/gdcm/Source/InformationObjectDefinition/getelements.xsl b/Modules/ThirdParty/GDCM/src/gdcm/Source/InformationObjectDefinition/getelements.xsl index e5381070c4e..2d633665e7b 100644 --- a/Modules/ThirdParty/GDCM/src/gdcm/Source/InformationObjectDefinition/getelements.xsl +++ b/Modules/ThirdParty/GDCM/src/gdcm/Source/InformationObjectDefinition/getelements.xsl @@ -1,7 +1,7 @@ - + + +