X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmCommon.h;h=0a115ec234c71e9ad4683d04e6b7377cee1c6b42;hb=90034aefc764a5b6c4815c9073606d36956acab1;hp=a51dd6603d2920aaa065f09e2b47f81bc0a2c88d;hpb=dd9001df5c1b8d5be917f635a6316aa4f0869af7;p=gdcm.git diff --git a/src/gdcmCommon.h b/src/gdcmCommon.h index a51dd660..0a115ec2 100644 --- a/src/gdcmCommon.h +++ b/src/gdcmCommon.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmCommon.h,v $ Language: C++ - Date: $Date: 2005/01/30 17:30:57 $ - Version: $Revision: 1.59 $ + Date: $Date: 2005/02/11 15:22:18 $ + Version: $Revision: 1.62 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -27,6 +27,8 @@ // 'identifier' : class 'type' needs to have dll-interface to be used by // clients of class 'type2' #pragma warning ( disable : 4251 ) +// non dll-interface class 'type' used as base for dll-interface class 'type2' +#pragma warning ( disable : 4275 ) // 'identifier' : identifier was truncated to 'number' characters in the // debug information #pragma warning ( disable : 4786 ) @@ -77,6 +79,7 @@ typedef unsigned int uint32_t; #include +/// \brief namespace for Grass root DiCoM namespace gdcm { @@ -123,7 +126,6 @@ GDCM_EXPORT extern const std::string GDCM_UNREAD; /// a sequence, itself nested in the third item of a sequence is the /// string e.g. /// 0004|1220/2#0008|0082/0#0008|0090 -/// Probabely useless stuff. typedef std::string TagKey; typedef std::string TagName; @@ -135,6 +137,7 @@ enum FileType { ACR_LIBIDO }; +/// \brief type of the elements composing a DICOMDIR (for internal use only) enum DicomDirType { DD_UNKNOWN = 0, DD_META, @@ -144,6 +147,19 @@ enum DicomDirType { DD_IMAGE }; +/** + * \brief structure, for internal use only + */ +GDCM_EXPORT typedef struct +{ + /// DicomGroup number + unsigned short int Group; + /// DicomElement number + unsigned short int Elem; + /// value (coded as a std::string) of the Element + std::string Value; +} Element; + } //namespace gdcm //----------------------------------------------------------------------------- #endif