STYLE: Please stop using cout, you have a much more enhance version: gdcmDebug/Verbos...

diff --git a/src/gdcmFile.cxx b/src/gdcmFile.cxx
index f36f89e28cff32f98a858bc06722b5457d4bd730..ac3b4707f4d64010806a3bbd19ba81e912bbcd6d 100644 (file)
--- a/src/gdcmFile.cxx
+++ b/src/gdcmFile.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmFile.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/02/04 13:15:41 $
-  Version:   $Revision: 1.210 $
+  Date:      $Date: 2005/02/05 01:31:36 $
+  Version:   $Revision: 1.211 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -1102,11 +1102,8 @@ size_t File::GetPixelOffset()
    }
    else
    {
-#ifdef GDCM_DEBUG
-      std::cout << "Big trouble : Pixel Element ("
-                << std::hex << GrPixel<<","<< NumPixel<< ") NOT found"
-                << std::endl;  
-#endif //GDCM_DEBUG
+      gdcmDebugMacro( "Big trouble : Pixel Element ("
+                      << std::hex << GrPixel<<","<< NumPixel<< ") NOT found" );
       return 0;
    }
 }
@@ -1127,11 +1124,8 @@ size_t File::GetPixelAreaLength()
    }
    else
    {
-#ifdef GDCM_DEBUG
-      std::cout << "Big trouble : Pixel Element ("
-                << std::hex << GrPixel<<","<< NumPixel<< ") NOT found"
-                << std::endl;
-#endif //GDCM_DEBUG
+      gdcmDebugMacro( "Big trouble : Pixel Element ("
+                      << std::hex << GrPixel<<","<< NumPixel<< ") NOT found" );
       return 0;
    }
 }

diff --git a/src/gdcmJpeg2000.cxx b/src/gdcmJpeg2000.cxx
index 4ab11d6ee14a4d56781da8e4ed904bb1e36d5a12..9c28c17c1e2804343b66cb956e870fda21b2f2f3 100644 (file)
--- a/src/gdcmJpeg2000.cxx
+++ b/src/gdcmJpeg2000.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmJpeg2000.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/02/01 10:29:55 $
-  Version:   $Revision: 1.17 $
+  Date:      $Date: 2005/02/05 01:31:36 $
+  Version:   $Revision: 1.18 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
                                                                                 
 =========================================================================*/
-//-----------------------------------------------------------------------------
 #include "gdcmFileHelper.h"
+#include "gdcmDebug.h"
 
 #include <iostream>
 #include <fstream>
@@ -33,10 +33,9 @@ namespace gdcm
  * @warning : not yet made
  */
 
-bool gdcm_read_JPEG2000_file (std::ifstream* fp,void* image_buffer) {
-   (void)fp;                  //FIXME
-   (void)image_buffer;        //FIXME
-   std::cout << "Sorry JPEG 2000 File not yet taken into account" << std::endl;
+bool gdcm_read_JPEG2000_file (std::ifstream* , void* )
+{
+   gdcmVerboseMacro( "Sorry JPEG 2000 File not yet taken into account" );
    return false;
 }
 

diff --git a/src/gdcmJpegLS.cxx b/src/gdcmJpegLS.cxx
index e0094b2ab84a50ac4a2f1f31776c94e761c6ead9..e8726d5e1151c546e90394b3f8e50fcc739dd991 100644 (file)
--- a/src/gdcmJpegLS.cxx
+++ b/src/gdcmJpegLS.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmJpegLS.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/01/24 16:03:58 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2005/02/05 01:31:36 $
+  Version:   $Revision: 1.2 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
                                                                                 
 =========================================================================*/
-//-----------------------------------------------------------------------------
 #include "gdcmFileHelper.h"
+#include "gdcmDebug.h"
 
 #include <iostream>
 #include <fstream>
@@ -34,10 +34,9 @@ namespace gdcm
  * @warning : not yet made
  */
 
-bool gdcm_read_JPEGLS_file (std::ifstream* fp,void* image_buffer) {
-   (void)fp;                  //FIXME
-   (void)image_buffer;        //FIXME
-   std::cout << "Sorry JPEG-LS File not yet taken into account" << std::endl;
+bool gdcm_read_JPEGLS_file (std::ifstream* , void* )
+{
+   gdcmVerboseMacro( "Sorry JPEG-LS File not yet taken into account" );
    return false;
 }
 } // end namespace gdcm