X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmUtil.cxx;h=ec86bb6ea74d7ef3ca874d6b254db6cb6118f6ab;hb=06e5584ba82b9878b3e544a53c9575cf363fdb8c;hp=bc1d3bdae546ce772c25bf53f3d867116920dceb;hpb=10aa56aa534bae643e3833474a49309330235196;p=gdcm.git

diff --git a/src/gdcmUtil.cxx b/src/gdcmUtil.cxx
index bc1d3bda..ec86bb6e 100644
--- a/src/gdcmUtil.cxx
+++ b/src/gdcmUtil.cxx
@@ -1,4 +1,14 @@
-// $Header: /cvs/public/gdcm/src/gdcmUtil.cxx,v 1.12 2003/06/17 17:44:48 jpr Exp $
+// $Header: /cvs/public/gdcm/src/gdcmUtil.cxx,v 1.17 2003/09/19 15:36:05 malaterre Exp $
+
+//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 )
+// 'identifier' : identifier was truncated to 'number' characters in the
+// debug information
+#pragma warning ( disable : 4786 )
+#endif //_MSC_VER
 
 #include <stdio.h>
 #include <ctype.h>   // For isspace
@@ -16,23 +26,15 @@ gdcmDebug::gdcmDebug(int level) {
 void gdcmDebug::Verbose(int Level, const char * Msg1, const char * Msg2) {
    if (Level > DebugLevel)
       return ;
-   cerr << Msg1 << ' ' << Msg2 << '\n';
-}
-
-/*
-void gdcmDebug::Verbose(int Level, char * Msg1, char * Msg2) {
-   if (Level > DebugLevel)
-      return ;
-   cerr << Msg1 << ' ' << Msg2 << '\n';
+   std::cerr << Msg1 << ' ' << Msg2 << '\n';
 }
-*/
 
 void gdcmDebug::Assert(int Level, bool Test,
                  const char * Msg1, const char * Msg2) {
    if (Level > DebugLevel)
       return ;
    if (!Test)
-      cerr << Msg1 << ' ' << Msg2 << '\n';
+      std::cerr << Msg1 << ' ' << Msg2 << '\n';
 }
 
 void gdcmDebug::Error( bool Test, const char * Msg1, const char * Msg2) {
@@ -65,7 +67,7 @@ gdcmGlobal gdcmGlob;
 
 gdcmGlobal::gdcmGlobal(void) {
    if (VR || TS || Dicts)
-      dbg.Verbose(0, "gdcmGlobal::gdcmGlobal : VR or TS or Dicts allready allocated");
+      dbg.Verbose(0, "gdcmGlobal::gdcmGlobal : VR or TS or Dicts already allocated");
    VR = new gdcmVR();
    TS = new gdcmTS();
    Dicts = new gdcmDictSet();
@@ -137,7 +139,7 @@ char * _cleanString(char *v) {
 ///////////////////////////////////////////////////////////////////////////
 // to prevent a flashing screen when non-printable character
 
-char * _CreateCleanString(string s) {
+/*char * _CreateCleanString(string s) {
    char *d, *di, *v;
    int i, l;
    v=(char*)s.c_str();
@@ -150,5 +152,22 @@ char * _CreateCleanString(string s) {
          *di = '.';
       }	
    return d;
+}*/
+
+///////////////////////////////////////////////////////////////////////////
+//
+// because it may not be associated to a dictionary ...
+
+std::string TranslateToKey(guint16 group, guint16 element) {
+	char trash[10];
+	string key;
+	// CLEAN ME: better call the iostream<< with the hex manipulator on.
+	// This requires some reading of the stdlibC++ sources to make the
+	// proper call (or copy).
+	sprintf(trash, "%04x|%04x", group , element);
+	key = trash;  // Convertion through assignement
+	return key;
 }
 
+
+