X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Testing%2FTestReadWriteJPEGReadCompare.cxx;h=76bce692911a721bc5289b7414733bfd3cfe7ca1;hb=6278320cc85da00d2d56ffbf07806e84966892c3;hp=597b26de8a1f7c0e9cd4273fe6f71ca1e90dfcb4;hpb=50fc3d766c9c3589e4e8eb2aea28cda361aed3d0;p=gdcm.git

diff --git a/Testing/TestReadWriteJPEGReadCompare.cxx b/Testing/TestReadWriteJPEGReadCompare.cxx
index 597b26de..76bce692 100755
--- a/Testing/TestReadWriteJPEGReadCompare.cxx
+++ b/Testing/TestReadWriteJPEGReadCompare.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: TestReadWriteJPEGReadCompare.cxx,v $
   Language:  C++
-  Date:      $Date: 2007/09/04 13:02:45 $
-  Version:   $Revision: 1.8 $
+  Date:      $Date: 2008/04/10 12:15:34 $
+  Version:   $Revision: 1.15 $
 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -22,15 +22,17 @@
 #include "gdcmGlobal.h"
 #include "gdcmTS.h"
 
+#include <stdlib.h>
+
 //Generated file:
 #include "gdcmDataImages.h"
 
 
 const unsigned int MAX_NUMBER_OF_DIFFERENCE = 10;
 
-int nb_of_success___;
-int nb_of_failure___;
-int nb_of_diffPM1___;
+int nb_of_successJPEG___;
+int nb_of_failureJPEG___;
+int nb_of_diffPM1JPEG___;
 static int CompareInternalJPEG(std::string const &filename, std::string const &output)
 {
    std::cout << "----------------------------------------------------------------------" << std::endl
@@ -47,7 +49,7 @@ static int CompareInternalJPEG(std::string const &filename, std::string const &o
                 << "Test::TestReadWriteJPEGReadCompare: Image not gdcm compatible:"
                 << filename << std::endl;
       file->Delete();
-      nb_of_failure___++;
+      nb_of_failureJPEG___++;
       return 1;
    }
    std::cout << "           step 1...";
@@ -61,13 +63,13 @@ static int CompareInternalJPEG(std::string const &filename, std::string const &o
           // (even if we do it by setting a flag, *he* will have to decide)
 
    //filehelper->SetImageData(imageData, dataSize);
- 
-   filehelper->SetContentType(GDCM_NAME_SPACE::UNMODIFIED_PIXELS_IMAGE); // lossless compression : pixels reain unimpared
-   filehelper->SetWriteModeToRaw();  
-   filehelper->SetWriteTypeToJPEG(  ); 
-   
+
+   filehelper->SetContentType(GDCM_NAME_SPACE::UNMODIFIED_PIXELS_IMAGE); // lossless compression : pixels remain unimpared
+   filehelper->SetWriteModeToRaw();
+   filehelper->SetWriteTypeToJPEG(  );
+
    filehelper->SetUserData(imageData,dataSize); // This one ensures the compression
-   filehelper->Write( output ); 
+   filehelper->Write( output );
 
    std::cout << "2...";
 
@@ -84,10 +86,20 @@ static int CompareInternalJPEG(std::string const &filename, std::string const &o
       file->Delete();
       filehelper->Delete();
       fileout->Delete();
-      nb_of_failure___++;
+      nb_of_failureJPEG___++;
       return 1;
    }
 
+   if ( file->GetBitsAllocated()>16 )
+   {
+      std::cout << "=============== 32 bits, not checked...OK." << std::endl ;
+      //////////////// Clean up:
+      file->Delete();
+      filehelper->Delete();
+      fileout->Delete();
+      return 0;
+   }
+   
    GDCM_NAME_SPACE::FileHelper *reread = GDCM_NAME_SPACE::FileHelper::New( fileout );
 
    std::cout << "3...";
@@ -113,7 +125,7 @@ static int CompareInternalJPEG(std::string const &filename, std::string const &o
       filehelper->Delete();
       fileout->Delete();
       reread->Delete();
-      nb_of_failure___++;      
+      nb_of_failureJPEG___++;      
       return 1;
    }
 
@@ -121,7 +133,7 @@ static int CompareInternalJPEG(std::string const &filename, std::string const &o
    // beware of odd length Pixel Element!
    if (dataSize != dataSizeWritten)
       std::cout << std::endl << "dataSize:" << dataSize << " dataSizeWritten:" << dataSizeWritten << std::endl;
-      
+
    int dataSizeFixed = dataSize - dataSize%2;
    int dataSizeWrittenFixed = dataSizeWritten - dataSizeWritten%2;
 
@@ -134,32 +146,27 @@ static int CompareInternalJPEG(std::string const &filename, std::string const &o
       filehelper->Delete();
       fileout->Delete();
       reread->Delete();
-      nb_of_failure___++;      
+      nb_of_failureJPEG___++;      
       return 1;
    }
 
    // Test the data content
-   
-   if ( file->GetBitsAllocated()>16 )
+  // unsigned int j      = 0;
+   unsigned int nbDiff = 0;
+   unsigned int lengthToCompare = file->GetXSize()*file->GetYSize()*file->GetZSize()
+                                  *file->GetPixelSize()*file->GetSamplesPerPixel();
+ 
+   // just to see !
+   if ( lengthToCompare!=dataSizeFixed)
+      std::cout << "lengthToCompare : " << lengthToCompare << " not= dataSizeFixed : " << dataSizeFixed << std::endl;
+  
+   if (memcmp(imageData, imageDataWritten, lengthToCompare) !=0)
    {
-      std::cout << "=============== 32 bits, not checked...OK." << std::endl ;
-      //////////////// Clean up:
-      file->Delete();
-      filehelper->Delete();
-      fileout->Delete();
-      reread->Delete();
-      return 0;   
-   }
-   
-   unsigned int j  =0;
-   unsigned int nbDiff =0;  
-   if (memcmp(imageData, imageDataWritten, dataSizeFixed) !=0)
-   {   
       std::string PixelType = filehelper->GetFile()->GetPixelType();
       std::string ts        = filehelper->GetFile()->GetTransferSyntax();
 
        for(int i1=0; i1<dataSizeFixed; i1++)
-         if (abs ((int)imageData[i1]-(int)imageDataWritten[i1]) > 2) {
+         if (abs ((int)imageData[i1]-(int)imageDataWritten[i1]) > 0) {
             nbDiff++;
            // break; // at debug time, keep line commented out; (uncommenting will save CPU time)
          }
@@ -167,9 +174,9 @@ static int CompareInternalJPEG(std::string const &filename, std::string const &o
        if (nbDiff!=0)
        {
           std::cout << std::endl << filename << " Failed : "
-                    << nbDiff/(file->GetBitsAllocated()/8) << " pixels -amongst "
+                    << nbDiff/(file->GetBitsAllocated()/8) << " Pixels -amongst "
                     << dataSizeFixed/(file->GetBitsAllocated()/8) << "- (" 
-                    << PixelType << " bAlloc " << file->GetBitsAllocated() << " bStored " << file->GetBitsStored()
+                    << PixelType << " bAlloc:" << file->GetBitsAllocated() << " bStored:" << file->GetBitsStored()
                     << ") differ (as expanded in memory)."
                     << std::endl
                     << "        compression : " 
@@ -179,17 +186,17 @@ static int CompareInternalJPEG(std::string const &filename, std::string const &o
                     << " bytes differing (pos : original - written) :"
                     << std::endl;
 
-          for(int i=0, j=0; i<dataSizeFixed && j<MAX_NUMBER_OF_DIFFERENCE; i++)
+          for(unsigned int i=0, j2=0; i<dataSizeFixed && j2<MAX_NUMBER_OF_DIFFERENCE; i++)
           {
              if (abs ((int)imageData[i]-(int)imageDataWritten[i]) > 2)
              {
-                if (j<MAX_NUMBER_OF_DIFFERENCE)
+                if (j2<MAX_NUMBER_OF_DIFFERENCE)
                    std::cout << std::dec << "(" << i << " : "
                      << std::hex
                      << (int)(imageData[i]) << " - "
                      << (int)(imageDataWritten[i]) << ") "
                      << std::dec;
-                ++j;
+                ++j2;
               }
           }
           std::cout << std::endl;
@@ -198,10 +205,10 @@ static int CompareInternalJPEG(std::string const &filename, std::string const &o
           filehelper->Delete();
           fileout->Delete();
           reread->Delete();
-          nb_of_failure___++;
+          nb_of_failureJPEG___++;
   
-          if (nbDiff>1)  // last pixel of (DermaColorLossLess.dcm) is diferent. ?!?
-                 // I don't want it to break the testsuite
+          if (nbDiff/2 > 8 )  // last pixel of (DermaColorLossLess.dcm) is diferent. ?!?
+                              // I don't want it to break the testsuite
              return 1;
           else
              return 0;
@@ -210,7 +217,7 @@ static int CompareInternalJPEG(std::string const &filename, std::string const &o
        {
           std::cout << std::endl << filename << " : some pixels"
                     << "  ("
-                    << PixelType << " bAlloc " << file->GetBitsAllocated() << " bStored " << file->GetBitsStored()
+                    << PixelType << " bAlloc:" << file->GetBitsAllocated() << " bStored:" << file->GetBitsStored()
                     << ") differ +/-1 (as expanded in memory)."
                     << std::endl
                     << "        compression : "
@@ -220,7 +227,7 @@ static int CompareInternalJPEG(std::string const &filename, std::string const &o
                     << " bytes differing (pos : original - written) :"
                     << std::endl;
 
-          for(int i=0, j=0; i<dataSizeFixed && j<MAX_NUMBER_OF_DIFFERENCE; i++)
+          for(unsigned int i=0, j1=0; i<dataSizeFixed && j1<MAX_NUMBER_OF_DIFFERENCE; i++)
           {
              if (imageData[i] != imageDataWritten[i])
              {
@@ -228,16 +235,16 @@ static int CompareInternalJPEG(std::string const &filename, std::string const &o
                          << std::hex << (int)(imageData[i]) << " - "
                          << std::hex << (int)(imageDataWritten[i]) << ") "
                          << std::dec;
-                ++j;
+                ++j1;
               }
           }
           std::cout << std::endl;
-          nb_of_diffPM1___++;
+          nb_of_diffPM1JPEG___++;
        }
    }
    else
    {
-      nb_of_success___ ++;
+      nb_of_successJPEG___ ++;
    }
    std::cout << "=============== 4...OK." << std::endl ;
    //////////////// Clean up:
@@ -254,9 +261,9 @@ static int CompareInternalJPEG(std::string const &filename, std::string const &o
 int TestReadWriteJPEGReadCompare(int argc, char *argv[]) 
 {
    int result = 0;
-   nb_of_success___ = 0;
-   nb_of_failure___ = 0;
-//   nb_of_diffPM1___ = 0;
+   nb_of_successJPEG___ = 0;
+   nb_of_failureJPEG___ = 0;
+   nb_of_diffPM1JPEG___ = 0;
    
    if (argc == 4)
       GDCM_NAME_SPACE::Debug::DebugOn();
@@ -290,17 +297,25 @@ int TestReadWriteJPEGReadCompare(int argc, char *argv[])
                 << "           match (as expanded by gdcm)." << std::endl;
    
       int i = 0;
+      int res =0;
       while( gdcmDataImages[i] != 0 )
       {
          std::string filename = GDCM_DATA_ROOT;
          filename += "/";
-         filename += gdcmDataImages[i++];
-         result += CompareInternalJPEG(filename, "TestReadWriteJPEGReadCompare.dcm");
+         filename += gdcmDataImages[i];
+         res = CompareInternalJPEG(filename, "TestReadWriteJPEGReadCompare.dcm");
+
+         if (res == 1)
+         {
+            std::cout << "=============================== Failure on: " << gdcmDataImages[i] << std::endl;
+            result ++;
+         }
+         i ++;
       }
    }
    std::cout << "==================================" << std::endl;
-   std::cout << "nb of success  " << nb_of_success___ << std::endl;
-   std::cout << "nb of failure  " << nb_of_failure___ << std::endl;
-//   std::cout << "nb of diff+/-1 " << nb_of_diffPM1___ << std::endl;   
+   std::cout << "nb of success  " << nb_of_successJPEG___ << std::endl;
+   std::cout << "nb of failure  " << nb_of_failureJPEG___ << std::endl;
+   std::cout << "nb of diff+/-1 " << nb_of_diffPM1JPEG___ << std::endl;   
    return result;
 }