X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Testing%2FTestUtil.cxx;h=5f45350d5ce86217687f6d82bda08ea6bb0704d2;hb=4fd00ffbd309b3f6377e6a9e9475aa3fee49383f;hp=d72b8c471de31f7f2cdc7d5e99568d13b05fc40f;hpb=cd6b936f711fcbc70918e6b623b4b7b2f65dc69c;p=gdcm.git

diff --git a/Testing/TestUtil.cxx b/Testing/TestUtil.cxx
index d72b8c47..5f45350d 100644
--- a/Testing/TestUtil.cxx
+++ b/Testing/TestUtil.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: TestUtil.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/08/22 15:38:04 $
-  Version:   $Revision: 1.15 $
+  Date:      $Date: 2005/11/30 11:40:26 $
+  Version:   $Revision: 1.19 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -30,12 +30,12 @@ int TestUtil(int , char *[])
    // are implanted in memory
    uint16_t u16 = 0x0102;
    uint32_t u32 = 0x01020304;
-   float flt= 1.0;
+   float flt;
    double dbl=1.0;
 
    std::cout << "This is gdcm version: " << gdcm::Util::GetVersion() << std::endl;
 
-   std::cout << "---------- uint16 : " << std::dec <<u16 << " = 0x" 
+   std::cout << "---------- uint16 : " << std::dec << u16 << " = 0x" 
              << std::hex << u16 << std::endl;
    for (i=0;i<sizeof(uint16_t);i++) 
    {
@@ -51,40 +51,52 @@ int TestUtil(int , char *[])
       std::cout << std::hex <<"[" <<(uint32_t)((uint8_t*)&u32)[i] << "] " ;
    }
    std::cout << std::endl;
-
-   std::cout << "---------- float : " <<flt << " = 0x" 
-             << std::hex << flt << std::endl;
-   for (i=0;i<sizeof(float);i++) 
-   {
-      std::cout << std::hex <<"[" <<(uint16_t)((uint8_t*)&flt)[i] << "] " ;
-   }
    std::cout << std::endl;
-
-   flt= 2.0;
-   std::cout << "---------- float : " <<flt << " = 0x" 
-             << std::hex << flt << std::endl;
-   for (i=0;i<sizeof(float);i++) 
-   {
-      std::cout << std::hex <<"[" <<(uint16_t) ((uint8_t*)&flt)[i] << "] " ;
-   }
+   std::cout << "------------------- float -----------------" << std::endl;
    std::cout << std::endl;
-
-   std::cout << "---------- double : " << std::dec <<dbl << " = 0x" 
-             << std::hex << dbl << std::endl;
-   for (i=0;i<sizeof(double);i++) 
+   flt = -5;
+   int k;   
+   for (k=0; k<11;k++)
    {
-      std::cout << std::hex <<"[" <<(uint16_t)((uint8_t*)&dbl)[i] << "] " ;
+      std::cout << "--- " << flt 
+             // << " = 0x" 
+             // << std::hex << (float *)&flt << std::endl;   
+             // << std::hex << (int)(float *)&flt << std::endl;
+             // << std::hex << flt 
+                << std::endl;
+      for (i=0;i<sizeof(float);i++) 
+      {
+         std::cout << std::hex <<"[" <<(uint16_t)((uint8_t*)&flt)[i] << "] " ;
+      }
+      flt += 1.0;
+      std::cout << std::endl;
    }
+
+   std::cout << std::endl;
+   std::cout << std::endl;
+   std::cout << "--------------------- double ----------------" << std::endl;
    std::cout << std::endl;
 
-   dbl=2.0;
-   std::cout << "---------- double : " << std::dec <<dbl << " = 0x" 
-             << std::hex << dbl << std::endl;
-   for (i=0;i<sizeof(double);i++) 
+   dbl = -5.0;
+   for (k=0; k<11; k++)
    {
-      std::cout << std::hex <<"[" <<(uint16_t)((uint8_t*)&dbl)[i] << "] " ;
+      std::cout << "---  " << std::dec << dbl
+                << std::endl;
+      for (i=0;i<sizeof(double);i++) 
+      {
+         std::cout << std::hex <<"[" <<(uint16_t)((uint8_t*)&dbl)[i] << "] " ;
+      }
+      std::cout << std::endl;
+      dbl += 1.0;
    }
-   std::cout << std::endl;
+
+
+   std::cout << "Size of short int  " << sizeof(short int) << std::endl;
+   std::cout << "Size of int  "       << sizeof(int)       << std::endl;
+   std::cout << "Size of int* "       << sizeof(int*)      << std::endl;
+   std::cout << "Size of long "       << sizeof(long)      << std::endl;
+   std::cout << "Size of float"       << sizeof(float)     << std::endl;
+   std::cout << "Size of double"      << sizeof(double)    << std::endl;
 
    // CreateCleanString
    std::string x = "a#@-bc\tdef";
@@ -147,7 +159,7 @@ int TestUtil(int , char *[])
 // ----------------------------------------------------------
 // Let's test gdcm::Debug, now.
     std::cout << "GetDebugFlag : " << gdcm::Debug::GetDebugFlag() <<std::endl;
-    gdcm::Debug::SetDebugFilename ("DummyFileNameToWriteTo.txt");
+    gdcm::Debug::SetOutputFileName ("DummyFileNameToWriteTo.txt");
     std::cout << "We set a Debug file"   <<std::endl;
     if ( !gdcm::Debug::GetDebugFlag() )
     {
@@ -157,7 +169,7 @@ int TestUtil(int , char *[])
     std::cout << "GetDebugFlag : " << gdcm::Debug::GetDebugFlag()<<std::endl;
     gdcm::Debug::SetDebugFlag ( false );
     std::cout << "GetDebugFlag : " << gdcm::Debug::GetDebugFlag()<<std::endl;
-    gdcm::Debug::SetDebugFilename ("DummyFileNameToWriteTo2.txt");    
+    gdcm::Debug::SetOutputFileName ("DummyFileNameToWriteTo2.txt");    
 
    return 0;
 }