+Mon Oct 18 10:27:49 2005 by regrain
+ * Remove useless constructor of gdcm::Document
+ * Remove useless parameter in the constructor of gdcm::ElementSet
+ * Split gdcmCommon to separate the System specifications to the gdcm
+ specifications
+
Mon Oct 18 10:27:49 2005 by regrain
* Minor coding-style clean up
* Replace the ContentEntry and its derived classes (BinEntry and ValEntry)
Program: gdcm
Module: $RCSfile: gdcmCommon.h,v $
Language: C++
- Date: $Date: 2005/10/11 08:24:10 $
- Version: $Revision: 1.93 $
+ Date: $Date: 2005/10/18 09:17:08 $
+ Version: $Revision: 1.94 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#define GDCMCOMMON_H
#include "gdcmConfigure.h"
-
-//-----------------------------------------------------------------------------
-//This is needed when compiling in debug mode
-#ifdef _MSC_VER
-// '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 )
-//'identifier' : decorated name length exceeded, name was truncated
-#pragma warning ( disable : 4503 )
-// C++ exception specification ignored except to indicate a
-// function is not __declspec(nothrow)
-#pragma warning ( disable : 4290 )
-// signed/unsigned mismatch
-#pragma warning ( disable : 4018 )
-// return type for 'identifier' is '' (ie; not a UDT or reference to UDT. Will
-// produce errors if applied using infix notation
-#pragma warning ( disable : 4284 )
-// 'type' : forcing value to bool 'true' or 'false' (performance warning)
-// //#pragma warning ( disable : 4800 )
-#endif //_MSC_VER
-
-//-----------------------------------------------------------------------------
-#ifdef CMAKE_HAVE_STDINT_H
- #include <stdint.h>
-#else
-#ifdef CMAKE_HAVE_INTTYPES_H
- // Old system only have this
- #include <inttypes.h> // 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(_MSC_VER) || 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;
-#else
-#error "Sorry your plateform is not supported"
-#endif // defined(_MSC_VER) || defined(__BORLANDC__) && (__BORLANDC__ < 0x0560) || defined(__MINGW32__)
-#endif // CMAKE_HAVE_INTTYPES_H
-#endif // CMAKE_HAVE_STDINT_H
-
-// Basically for VS6 and bcc 5.5.1:
-#ifndef UINT32_MAX
-#define UINT32_MAX (4294967295U)
-#endif
-
-#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
-
-#include <string>
-#define FASTTAGKEY 0
-
-// 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>
-#endif
-
+#include "gdcmSystem.h"
//-----------------------------------------------------------------------------
/// \brief namespace for Grass root DiCoM
Program: gdcm
Module: $RCSfile: gdcmDocument.cxx,v $
Language: C++
- Date: $Date: 2005/10/18 08:35:49 $
- Version: $Revision: 1.289 $
+ Date: $Date: 2005/10/18 09:17:08 $
+ Version: $Revision: 1.290 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
*
*/
Document::Document()
- :ElementSet(-1)
+ :ElementSet()
{
Fp = 0;
SetFileName("");
}
-/**
- * \brief Constructor (DEPRECATED : not to break the API)
- * @param fileName 'Document' (File or DicomDir) to be open for parsing
- */
-Document::Document( std::string const &fileName )
- :ElementSet(-1)
-{
- Fp = 0;
-
- SetMaxSizeLoadEntry(MAX_SIZE_LOAD_ELEMENT_VALUE);
- Initialize();
- SwapCode = 1234;
- Filetype = ExplicitVR;
- Group0002Parsed = false;
- LoadMode = LD_ALL; // Load everything, later
-
- // Load will set it to true if sucessfull
- IsDocumentAlreadyLoaded = false;
- IsDocumentModified = true;
-
- SetFileName(fileName);
- Load( );
-}
/**
* \brief Canonical destructor.
*/
Program: gdcm
Module: $RCSfile: gdcmDocument.h,v $
Language: C++
- Date: $Date: 2005/10/18 08:35:50 $
- Version: $Revision: 1.123 $
+ Date: $Date: 2005/10/18 09:17:08 $
+ Version: $Revision: 1.124 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
// to instanciate from this class Document (only gdcm::File and
// gdcm::DicomDir are meaningfull).
Document();
- Document( std::string const &filename );
virtual ~Document();
uint16_t ReadInt16() throw ( FormatError );
Program: gdcm
Module: $RCSfile: gdcmElementSet.cxx,v $
Language: C++
- Date: $Date: 2005/10/18 08:35:50 $
- Version: $Revision: 1.65 $
+ Date: $Date: 2005/10/18 09:17:08 $
+ Version: $Revision: 1.66 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
/**
* \brief Constructor for a given ElementSet
*/
-//BOZ depthLevel is not usefull anymore
-ElementSet::ElementSet(int depthLevel)
+ElementSet::ElementSet()
: DocEntrySet()
{
- (void)depthLevel;
}
/**
Program: gdcm
Module: $RCSfile: gdcmElementSet.h,v $
Language: C++
- Date: $Date: 2005/10/18 08:35:50 $
- Version: $Revision: 1.46 $
+ Date: $Date: 2005/10/18 09:17:08 $
+ Version: $Revision: 1.47 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
class GDCM_EXPORT ElementSet : public DocEntrySet
{
public:
- ElementSet(int);
+ ElementSet();
~ElementSet();
virtual void Print(std::ostream &os = std::cout,
--- /dev/null
+/*=========================================================================
+
+ Program: gdcm
+ Module: $RCSfile: gdcmSystem.h,v $
+ Language: C++
+ Date: $Date: 2005/10/18 09:17:08 $
+ Version: $Revision: 1.1 $
+
+ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
+ l'Image). All rights reserved. See Doc/License.txt or
+ http://www.creatis.insa-lyon.fr/Public/Gdcm/License.html for details.
+
+ This software is distributed WITHOUT ANY WARRANTY; without even
+ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE. See the above copyright notices for more information.
+
+=========================================================================*/
+
+#ifndef GDCMSYSTEM_H
+#define GDCMSYSTEM_H
+
+#include "gdcmConfigure.h"
+
+//-----------------------------------------------------------------------------
+//This is needed when compiling in debug mode
+#ifdef _MSC_VER
+// '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 )
+//'identifier' : decorated name length exceeded, name was truncated
+#pragma warning ( disable : 4503 )
+// C++ exception specification ignored except to indicate a
+// function is not __declspec(nothrow)
+#pragma warning ( disable : 4290 )
+// signed/unsigned mismatch
+#pragma warning ( disable : 4018 )
+// return type for 'identifier' is '' (ie; not a UDT or reference to UDT. Will
+// produce errors if applied using infix notation
+#pragma warning ( disable : 4284 )
+// 'type' : forcing value to bool 'true' or 'false' (performance warning)
+// //#pragma warning ( disable : 4800 )
+#endif //_MSC_VER
+
+//-----------------------------------------------------------------------------
+#ifdef CMAKE_HAVE_STDINT_H
+ #include <stdint.h>
+#else
+#ifdef CMAKE_HAVE_INTTYPES_H
+ // Old system only have this
+ #include <inttypes.h> // 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(_MSC_VER) || 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;
+#else
+#error "Sorry your plateform is not supported"
+#endif // defined(_MSC_VER) || defined(__BORLANDC__) && (__BORLANDC__ < 0x0560) || defined(__MINGW32__)
+#endif // CMAKE_HAVE_INTTYPES_H
+#endif // CMAKE_HAVE_STDINT_H
+
+// Basically for VS6 and bcc 5.5.1:
+#ifndef UINT32_MAX
+#define UINT32_MAX (4294967295U)
+#endif
+
+#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
+
+#include <string>
+#define FASTTAGKEY 0
+
+// 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>
+#endif
+
+//-----------------------------------------------------------------------------
+#endif
git://git.creatis.insa-lyon.fr / gdcm.git / commitdiff