Program: gdcm
Module: $RCSfile: gdcmCommon.h,v $
Language: C++
- Date: $Date: 2006/04/12 10:55:49 $
- Version: $Revision: 1.110 $
+ Date: $Date: 2007/08/22 16:14:03 $
+ Version: $Revision: 1.116 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
=========================================================================*/
-#ifndef GDCMCOMMON_H
-#define GDCMCOMMON_H
+#ifndef _GDCMCOMMON_H_
+#define _GDCMCOMMON_H_
#include "gdcmConfigure.h"
#include "gdcmSystem.h"
#define GDCM_EXPORT
#endif
+#ifdef __BORLANDC__
+#include <mem.h>
+#endif
+
//-----------------------------------------------------------------------------
/// \brief namespace for Grass root DiCoM
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
// Centralize information about the gdcm dictionary in only one file:
+//
+// ==>
+// ==> Don't forget gdcm/gdcmPython/gdcm.i
+// ==>
+//
+
#ifndef PUB_DICT_PATH
# define PUB_DICT_PATH "../Dicts/"
#endif
#define PUB_DICT_NAME "dicomV3Dict"
+
// dicomV3.dic replaced by the generated gdcm.dic/
// if gdcm.dic not found, method FillDefaultDataDict() is invoked
//#define PUB_DICT_FILENAME "dicomV3.dic"
GDCM_EXPORT extern const std::string GDCM_NOTASCII;
GDCM_EXPORT extern const std::string GDCM_PIXELDATA;
-GDCM_EXPORT extern const std::string GDCM_VRUNKNOWN;
+GDCM_EXPORT extern const char GDCM_VRUNKNOWN[2];
GDCM_EXPORT extern const char GDCM_FILESEPARATOR;
ACR_LIBIDO,
/// \todo FIXME : an encapsulated JPEG file may be
/// either ExplicitVR or ImplicitVR, right?
- JPEG
+ JPEG,
+ JPEG2000
};
/// \brief type of the elements composing a DICOMDIR (for internal use only)