Program: gdcm
Module: $RCSfile: gdcmCommon.h,v $
Language: C++
- Date: $Date: 2005/10/18 12:58:27 $
- Version: $Revision: 1.95 $
+ Date: $Date: 2005/10/20 15:24:08 $
+ Version: $Revision: 1.100 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include "gdcmConfigure.h"
#include "gdcmSystem.h"
+#include "gdcmMacro.h"
-#define FASTTAGKEY 0
+#include <string>
-// FIXME: Should rewrite this:
-#if FASTTAGKEY
- #include <iostream>
- #include <iomanip>
-#endif
- #if defined(_MSC_VER) && (_MSC_VER == 1200)
- /* ostream operator for std::string since VS6 does not provide it*/
- #include <iostream>
+//-----------------------------------------------------------------------------
+#if defined(_WIN32) && defined(BUILD_SHARED_LIBS)
+ #ifdef gdcm_EXPORTS
+ #define GDCM_EXPORT __declspec( dllexport )
+ #else
+ #define GDCM_EXPORT __declspec( dllimport )
+ #endif
+#else
+ #define GDCM_EXPORT
#endif
//-----------------------------------------------------------------------------
/// We'll fix the mess up -without any change in the API- as soon as the bench
/// marks are fully performed.
-#if FASTTAGKEY
-typedef union {
- uint16_t tab[2];
- uint32_t tagkey;
- } TagKey;
-/* ostream operator for TagKey */
-inline std::ostream& operator<<(std::ostream& _O, TagKey _val)
-{
- _O.setf( std::ios::right);
- return (_O << std::hex << std::setw( 4 ) << std::setfill( '0' )
- << _val.tab[0] << '|' << std::setw( 4 ) << std::setfill( '0' )
- << _val.tab[1] << std::setfill( ' ' ) << std::dec);
-}
-inline bool operator==(TagKey _self, TagKey _val)
-{
- return _self.tagkey == _val.tagkey;
-}
-inline bool operator<(TagKey _self, TagKey _val)
-{
- // This expression is a tad faster but PrintFile output
- // is more difficult to read
- //return _self.tagkey < _val.tagkey;
-
- // More usal order of dicom tags:
- if( _self.tab[0] == _val.tab[0] )
- return _self.tab[1] < _val.tab[1];
- return _self.tab[0] < _val.tab[0];
-}
-#else
-typedef std::string TagKey;
-#endif
#if defined(_MSC_VER) && (_MSC_VER == 1200)
// Doing everything within gdcm namespace to avoid polluting 3d party software
inline std::ostream& operator<<(std::ostream& _O, std::string _val)
ExplicitVR, // DicomDir is in this case. Except when it's ImplicitVR !...
ImplicitVR,
ACR,
- ACR_LIBIDO
+ ACR_LIBIDO,
+ JPEG
};
/// \brief type of the elements composing a DICOMDIR (for internal use only)
/**
* \brief structure, for internal use only
*/
-struct Element
+struct DicomElement
{
/// DicomGroup number
unsigned short int Group;