ENH: Second pass at removing name of function from hardcoded string from gdcmErrorMacro.

diff --git a/src/gdcmDictEntry.cxx b/src/gdcmDictEntry.cxx
index f208f3e9512a966af158d5636f0cc42596c1478c..b74c9fdb5db21639ef0e1384038a69202f6e1d46 100644 (file)
--- a/src/gdcmDictEntry.cxx
+++ b/src/gdcmDictEntry.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDictEntry.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/01/07 19:20:38 $
-  Version:   $Revision: 1.36 $
+  Date:      $Date: 2005/01/07 22:06:47 $
+  Version:   $Revision: 1.37 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -78,8 +78,7 @@ void DictEntry::SetVR(TagName const &vr)
    }
    else 
    {
-      gdcmErrorMacro("DictEntry::SetVR"
-                "Overwriting VR might compromise a dictionary");
+      gdcmErrorMacro( "Overwriting VR might compromise a dictionary");
    }
 }
 
@@ -97,8 +96,7 @@ void DictEntry::SetVM(TagName const &vm)
    }
    else 
    {
-      gdcmErrorMacro( "DictEntry::SetVM"
-                 "Overwriting VM might compromise a dictionary");
+      gdcmErrorMacro( "Overwriting VM might compromise a dictionary");
    }
 }
 //-----------------------------------------------------------------------------

diff --git a/src/gdcmDocument.cxx b/src/gdcmDocument.cxx
index c6e9131090ff9376715bb18cb2d7690a5d1ad6bb..13a92fe2c726a533e89ddb222692e94536b8e579 100644 (file)
--- a/src/gdcmDocument.cxx
+++ b/src/gdcmDocument.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDocument.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/01/07 22:03:30 $
-  Version:   $Revision: 1.166 $
+  Date:      $Date: 2005/01/07 22:06:47 $
+  Version:   $Revision: 1.167 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -1110,7 +1110,7 @@ uint32_t Document::SwapLong(uint32_t a)
          break;
       default :
          //std::cout << "swapCode= " << SwapCode << std::endl;
-         gdcmErrorMacro(" Document::SwapLong : unset swap code");
+         gdcmErrorMacro( "Unset swap code");
          a = 0;
    }
    return a;
@@ -1571,8 +1571,7 @@ void Document::LoadDocEntry(DocEntry *entry)
    }
    else
    {
-      gdcmErrorMacro("Document::LoadDocEntry"
-                      "Should have a ValEntry, here !");
+      gdcmErrorMacro( "Should have a ValEntry, here !");
    }
 }
 

diff --git a/src/gdcmPixelReadConvert.cxx b/src/gdcmPixelReadConvert.cxx
index b1d7335a1f07110970c52999aafe3e94a18340eb..2dc0ab078cfef94976f3928d9bd9679ad9285614 100644 (file)
--- a/src/gdcmPixelReadConvert.cxx
+++ b/src/gdcmPixelReadConvert.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmPixelReadConvert.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/01/07 22:03:30 $
-  Version:   $Revision: 1.17 $
+  Date:      $Date: 2005/01/07 22:06:47 $
+  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
@@ -457,8 +457,7 @@ bool PixelReadConvert::ReadAndDecompressJPEGFramesFromFile( std::ifstream *fp )
       else
       {
          // other JPEG lossy not supported
-         gdcmErrorMacro("PixelReadConvert::ReadAndDecompressJPEGFile: unknown "
-                   "jpeg lossy compression ");
+         gdcmErrorMacro( "Unknown jpeg lossy compression ");
          return false;
       }
 
@@ -517,9 +516,7 @@ ReadAndDecompressJPEGSingleFrameFragmentsFromFile( std::ifstream *fp )
       if ( ! gdcm_read_JPEG_memory8( buffer, totalLength, Raw,
                                      &howManyRead, &howManyWritten ) ) 
       {
-         gdcmErrorMacro(
-            "PixelConvert::ReadAndDecompressJPEGFile: failed to read jpeg8 "
-            );
+         gdcmErrorMacro( "Failed to read jpeg8 ");
          delete [] buffer;
          return false;
       }
@@ -529,9 +526,7 @@ ReadAndDecompressJPEGSingleFrameFragmentsFromFile( std::ifstream *fp )
       if ( ! gdcm_read_JPEG_memory12( buffer, totalLength, Raw,
                                       &howManyRead, &howManyWritten ) ) 
       {
-         gdcmErrorMacro(
-            "PixelConvert::ReadAndDecompressJPEGFile: failed to read jpeg12 "
-            );
+         gdcmErrorMacro( "Failed to read jpeg12 ");
             delete [] buffer;
             return false;
       }
@@ -542,9 +537,7 @@ ReadAndDecompressJPEGSingleFrameFragmentsFromFile( std::ifstream *fp )
       if ( ! gdcm_read_JPEG_memory16( buffer, totalLength, Raw,
                                       &howManyRead, &howManyWritten ) ) 
       {
-         gdcmErrorMacro(
-            "PixelConvert::ReadAndDecompressJPEGFile: failed to read jpeg16 "
-            );
+         gdcmErrorMacro( "Failed to read jpeg16 ");
          delete [] buffer;
          return false;
       }
@@ -552,8 +545,7 @@ ReadAndDecompressJPEGSingleFrameFragmentsFromFile( std::ifstream *fp )
    else
    {
       // other JPEG lossy not supported
-      gdcmErrorMacro("PixelConvert::ReadAndDecompressJPEGFile: unknown "
-                "jpeg lossy compression ");
+      gdcmErrorMacro( "Unknown jpeg lossy compression ");
       delete [] buffer;
       return false;
    }      
@@ -619,7 +611,7 @@ ReadAndDecompressJPEGFragmentedFramesFromFile( std::ifstream *fp )
                                      Raw+howManyWritten,
                                      &howManyRead, &howManyWritten ) ) 
           {
-            gdcmErrorMacro("PixelConvert::ReadAndDecompressJPEGFile: failed to read jpeg8 ");
+            gdcmErrorMacro( "Failed to read jpeg8");
             delete [] buffer;
             return false;
           }
@@ -631,7 +623,7 @@ ReadAndDecompressJPEGFragmentedFramesFromFile( std::ifstream *fp )
                                       Raw+howManyWritten,
                                       &howManyRead, &howManyWritten ) ) 
           {
-            gdcmErrorMacro("PixelConvert::ReadAndDecompressJPEGFile: failed to read jpeg12 ");
+            gdcmErrorMacro( "Failed to read jpeg12");
             delete [] buffer;
             return false;
          }
@@ -643,7 +635,7 @@ ReadAndDecompressJPEGFragmentedFramesFromFile( std::ifstream *fp )
                                       Raw+howManyWritten,
                                       &howManyRead, &howManyWritten ) ) 
           {
-            gdcmErrorMacro("PixelConvert::ReadAndDecompressJPEGFile: failed to read jpeg16 ");
+            gdcmErrorMacro( "Failed to read jpeg16 ");
             delete [] buffer;
             return false;
           }
@@ -651,8 +643,7 @@ ReadAndDecompressJPEGFragmentedFramesFromFile( std::ifstream *fp )
       else
       {
          // other JPEG lossy not supported
-         gdcmErrorMacro("PixelConvert::ReadAndDecompressJPEGFile: unknown "
-                   "jpeg lossy compression ");
+         gdcmErrorMacro( "Unknown jpeg lossy compression ");
          delete [] buffer;
          return false;
       }