-
-#include <stdio.h>
-#include <ctype.h> // For isspace
-#include <string.h>
-
-// Library globals.
-gdcmDebug dbg;
-
-gdcmDebug::gdcmDebug(int level) {
- DebugLevel = level;
-}
-
-void gdcmDebug::Verbose(int Level, const char * Msg1, const char * Msg2) {
- if (Level > DebugLevel)
- return ;
- std::cerr << Msg1 << ' ' << Msg2 << std::endl;
-}
-
-void gdcmDebug::Assert(int Level, bool Test,
- const char * Msg1, const char * Msg2) {
- if (Level > DebugLevel)
- return ;
- if (!Test)
- std::cerr << Msg1 << ' ' << Msg2 << std::endl;
-}
-
-void gdcmDebug::Error( bool Test, const char * Msg1, const char * Msg2) {
- if (!Test)
- return;
- std::cerr << Msg1 << ' ' << Msg2 << std::endl;
- Exit(1);
-}
-
-void gdcmDebug::Error(const char* Msg1, const char* Msg2,
- const char* Msg3) {
- std::cerr << Msg1 << ' ' << Msg2 << ' ' << Msg3 << std::endl;
- Exit(1);
-}
-
-void gdcmDebug::Exit(int a) {
-#ifdef __GNUC__
- std::exit(a);
-#endif
-#ifdef _MSC_VER
- exit(a); // Found in #include <stdlib.h>
-#endif
-}
-
-///////////////////////////////////////////////////////////////////////////
-gdcmVR * gdcmGlobal::VR = (gdcmVR*)0;
-gdcmTS * gdcmGlobal::TS = (gdcmTS*)0;
-gdcmDictSet * gdcmGlobal::Dicts = (gdcmDictSet*)0;
-gdcmGlobal gdcmGlob;
-
-gdcmGlobal::gdcmGlobal(void) {
- if (VR || TS || Dicts)
- dbg.Verbose(0, "gdcmGlobal::gdcmGlobal : VR or TS or Dicts already allocated");
- VR = new gdcmVR();
- TS = new gdcmTS();
- Dicts = new gdcmDictSet();
-}
-
-gdcmGlobal::~gdcmGlobal() {
- delete VR;
- delete TS;
- delete Dicts;
-}
-
-gdcmVR * gdcmGlobal::GetVR(void) {
- return VR;
-}
-
-gdcmTS * gdcmGlobal::GetTS(void) {
- return TS;
-}
-gdcmDictSet * gdcmGlobal::GetDicts(void) {
- return Dicts;
-}
-
-///////////////////////////////////////////////////////////////////////////
-// Because is not yet available in g++2.96
-std::istream& eatwhite(std::istream& is) {
- char c;
- while (is.get(c)) {
- if (!isspace(c)) {
- is.putback(c);
- break;
- }
- }
- return is;
-}
-
-///////////////////////////////////////////////////////////////////////////
-// Because is not available in C++ (?)
-
-void Tokenize (const std::string& str,
+#include "gdcmDebug.h"
+
+#include <stdarg.h> //only included in implementation file
+#include <stdio.h> //only included in implementation file
+
+namespace gdcm
+{
+
+/**
+ * \ingroup Globals
+ * \brief Provide a better 'c++' approach for sprintf
+ * For example c code is:
+ * sprintf(trash, "%04x|%04x", group , element);
+ *
+ * c++ is
+ * std::ostringstream buf;
+ * buf << std::right << std::setw(4) << std::setfill('0') << std::hex
+ * << group << "|" << std::right << std::setw(4) << std::setfill('0')
+ * << std::hex << element;
+ * buf.str();
+ */
+
+std::string Util::Format(const char* format, ...)
+{
+ char buffer[2048];
+ va_list args;
+ va_start(args, format);
+ vsprintf(buffer, format, args); //might be a security flaw
+ return buffer;
+}
+
+
+/**
+ * \ingroup Globals
+ * \brief Because not available in C++ (?)
+ */
+void Util::Tokenize (const std::string& str,