X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=common%2FclitkTimer.cxx;h=329ca13f04272d44104a3f0926e54e3b0e5b0aa8;hb=d55f025b18f68066a52b8f33c2dc6481e82c2580;hp=89297f3088ae88f1511cd231ca2026ac0d856a6b;hpb=2691ab3b136c618dd64f634507133e91e1a9c468;p=clitk.git

diff --git a/common/clitkTimer.cxx b/common/clitkTimer.cxx
index 89297f3..329ca13 100644
--- a/common/clitkTimer.cxx
+++ b/common/clitkTimer.cxx
@@ -1,9 +1,9 @@
 /*=========================================================================
   Program:   vv                     http://www.creatis.insa-lyon.fr/rio/vv
 
-  Authors belong to: 
+  Authors belong to:
   - University of LYON              http://www.universite-lyon.fr/
-  - Léon Bérard cancer center       http://oncora1.lyon.fnclcc.fr
+  - Léon Bérard cancer center       http://www.centreleonberard.fr
   - CREATIS CNRS laboratory         http://www.creatis.insa-lyon.fr
 
   This software is distributed WITHOUT ANY WARRANTY; without even
@@ -14,7 +14,7 @@
 
   - BSD        See included LICENSE.txt file
   - CeCILL-B   http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
-======================================================================-====*/
+===========================================================================**/
 #ifndef CLITKTIMER_CXX
 #define CLITKTIMER_CXX
 /**
@@ -22,10 +22,10 @@
    * @file   clitkTimer.cxx
    * @author David Sarrut <david.sarrut@creatis.insa-lyon.fr>
    * @date   18 Jul 2007 16:27:45
-   * 
-   * @brief  
-   * 
-   * 
+   *
+   * @brief
+   *
+   *
    =================================================*/
 
 // #ifdef UNIX
@@ -33,20 +33,22 @@
 #include "clitkTimer.h"
 
 //====================================================================
-/// Constructs the class 
-clitk::Timer::Timer() { 
-  Reset(); 
-#if defined(WIN32)
+/// Constructs the class
+clitk::Timer::Timer()
+{
+  Reset();
+#if defined(_WIN32)
   QueryPerformanceFrequency((LARGE_INTEGER*)&mFrequency);
 #endif
 }
 //====================================================================
 
 //====================================================================
-void clitk::Timer::Start() {
+void clitk::Timer::Start()
+{
 #if defined(unix) || defined(__APPLE__)
   getrusage(RUSAGE_SELF, &mBegin);
-#elif defined(WIN32)
+#elif defined(_WIN32)
   QueryPerformanceCounter((LARGE_INTEGER*)&mBegin);
 #endif
   mNumberOfCall++;
@@ -54,27 +56,31 @@ void clitk::Timer::Start() {
 //====================================================================
 
 //====================================================================
-void clitk::Timer::Stop(bool accumulate) {
+void clitk::Timer::Stop(bool accumulate)
+{
 #if defined(unix) || defined (__APPLE__)
   getrusage(RUSAGE_SELF, &mEnd);
   if (accumulate) {
     mElapsed += (mEnd.ru_utime.tv_usec - mBegin.ru_utime.tv_usec)+
-      (mEnd.ru_utime.tv_sec - mBegin.ru_utime.tv_sec)*1000000;
+                (mEnd.ru_utime.tv_sec - mBegin.ru_utime.tv_sec)*1000000;
   }
-#elif defined(WIN32)
+  else
+#elif defined(_WIN32)
   QueryPerformanceCounter((LARGE_INTEGER*)&mEnd);
   if (accumulate) {
     mElapsed += ((mEnd-mBegin)*1000000)/(long double)mFrequency;
   }
+  else
 #endif
-  else {
+  {
     mNumberOfCall--;
   }
 }
 //====================================================================
 
 //====================================================================
-void clitk::Timer::Print(std::ostream & os) const {
+void clitk::Timer::Print(std::ostream & os) const
+{
   if (mNumberOfCall != 1) {
     os << "Timer #     = " << mNumberOfCall << std::endl;
     os << "Timer total = " << mElapsed << " usec \t" << mElapsed/1000000.0 << " sec." << mElapsed/1000000.0/60 << " min."
@@ -88,19 +94,21 @@ void clitk::Timer::Print(std::ostream & os) const {
   // os << "\tmBegin.ru_utime.tv_sec = " << mBegin.ru_utime.tv_sec << std::endl;
 //   os << "\tmEnd.ru_utime.tv_sec = " << mEnd.ru_utime.tv_sec << std::endl;
 //   os << "\tmBegin.ru_utime.tv_usec = " << mBegin.ru_utime.tv_usec << std::endl;
-//   os << "\tmEnd.ru_utime.tv_usec = " << mEnd.ru_utime.tv_usec << std::endl;  
+//   os << "\tmEnd.ru_utime.tv_usec = " << mEnd.ru_utime.tv_usec << std::endl;
 }
 //====================================================================
 
 //====================================================================
-void clitk::Timer::Print(std::string text, std::ostream & os) const {
-  os << text;
+void clitk::Timer::Print(std::string text, std::ostream & os) const
+{
+  os << text.c_str();
   Print(os);
-}  
+}
 //====================================================================
 
 //====================================================================
-void clitk::Timer::Reset() {
+void clitk::Timer::Reset()
+{
   mNumberOfCall = 0;
   mElapsed = 0;
 }
@@ -108,4 +116,3 @@ void clitk::Timer::Reset() {
 
 // #endif // If UNIX
 #endif /* end #define CLITKTIMER_CXX */
-