X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Testing%2FTestWriteSimple.cxx;h=19b216bc1e901c5a116bcfcd7584bb821cda2da5;hb=e51bf0565bbe4c0e269dd941cb4071ebde6012e4;hp=60b31813c7b245bdb59b4a442f4f49ceb6417016;hpb=d1249e8bb14c38b82b4f5591c34203b23b0b48e8;p=gdcm.git

diff --git a/Testing/TestWriteSimple.cxx b/Testing/TestWriteSimple.cxx
index 60b31813..19b216bc 100644
--- a/Testing/TestWriteSimple.cxx
+++ b/Testing/TestWriteSimple.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: TestWriteSimple.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/01/26 16:43:10 $
-  Version:   $Revision: 1.17 $
+  Date:      $Date: 2005/02/10 14:23:18 $
+  Version:   $Revision: 1.25 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -63,7 +63,40 @@ Image Images [] = {
    {256, 512, 1, 1, 16, 16, 0, 'a'},
    {256, 512, 1, 1, 16, 16, 0, 'e'},
    {256, 512, 1, 1, 16, 16, 0, 'i'},
-   {0,   0,   1, 1, 8,  8,  0, 'i'} // to find the end
+
+   {512, 256, 10, 1, 8, 8,  0, 'a'},
+   {512, 256, 10, 1, 8, 8,  0, 'e'},
+   {512, 256, 10, 1, 8, 8,  0, 'i'},
+   {512, 256, 10, 3, 8, 8,  0, 'a'},
+   {512, 256, 10, 3, 8, 8,  0, 'e'},
+   {512, 256, 10, 3, 8, 8,  0, 'i'},
+
+   {256, 256, 1, 1, 8,  8,  1, 'a'},
+   {256, 256, 1, 1, 8,  8,  1, 'e'},
+   {256, 256, 1, 1, 8,  8,  1, 'i'},
+
+   {512, 256, 1, 1, 8,  8,  1, 'a'},
+   {512, 256, 1, 1, 8,  8,  1, 'e'},
+   {512, 256, 1, 1, 8,  8,  1, 'i'},
+
+   {256, 512, 1, 1, 8,  8,  1, 'a'},
+   {256, 512, 1, 1, 8,  8,  1, 'e'},
+   {256, 512, 1, 1, 8,  8,  1, 'i'},
+
+   {256, 512, 1, 1, 16, 16, 1, 'a'},
+   {256, 512, 1, 1, 16, 16, 1, 'e'},
+   {256, 512, 1, 1, 16, 16, 1, 'i'},
+   {256, 512, 1, 1, 16, 16, 1, 'a'},
+   {256, 512, 1, 1, 16, 16, 1, 'e'},
+   {256, 512, 1, 1, 16, 16, 1, 'i'},
+
+   {512, 256, 10, 1, 8, 8,  1, 'a'},
+   {512, 256, 10, 1, 8, 8,  1, 'e'},
+   {512, 256, 10, 1, 8, 8,  1, 'i'},
+   {512, 256, 10, 3, 8, 8,  1, 'a'},
+   {512, 256, 10, 3, 8, 8,  1, 'e'},
+   {512, 256, 10, 3, 8, 8,  1, 'i'},
+   {0,   0,   1,  1, 8, 8,  0, 'i'} // to find the end
 };
 
 int WriteSimple(Image &img)
@@ -133,7 +166,7 @@ int WriteSimple(Image &img)
                * img.components * img.componentSize / 8;
    unsigned char *imageData = new unsigned char[size];
 
-   // FIXME : find a best heuristic to create the image
+   // FIXME : find a better heuristic to create the image
    unsigned char *tmp = imageData;
    for(int k=0;k<img.sizeZ;k++)
    {
@@ -148,7 +181,7 @@ int WriteSimple(Image &img)
                {
                   *(tmp+1) = j/256;
                }
-               tmp += img.componentSize * img.components/8;
+               tmp += img.componentSize/8;
             }
          }
       }
@@ -200,22 +233,22 @@ int WriteSimple(Image &img)
 
 // Step 5 : Read the written image
    std::cout << "5...";
-   gdcm::FileHelper* reread = new gdcm::FileHelper( fileName );
+   gdcm::FileHelper *reread = new gdcm::FileHelper( fileName );
    if( !reread->GetFile()->IsReadable() )
    {
-     std::cerr << "Failed" << std::endl
-               << "Test::TestReadWriteReadCompare: Could not reread image "
-               << "written:" << fileName << std::endl;
-     delete fileToBuild;
-     delete file;
-     delete reread;
-     return 1;
+      std::cerr << "Failed" << std::endl
+                << "Could not reread image written: " << fileName << std::endl;
+      delete fileToBuild;
+      delete file;
+      delete reread;
+      delete[] imageData;
+      return 1;
    }
 
 // Step 6 : Compare to the written image
    std::cout << "6...";
    size_t dataSizeWritten = reread->GetImageDataSize();
-   uint8_t* imageDataWritten = reread->GetImageData();
+   uint8_t *imageDataWritten = reread->GetImageData();
 
    // Test the image size
    if (fileToBuild->GetXSize() != reread->GetFile()->GetXSize() ||
@@ -253,9 +286,8 @@ int WriteSimple(Image &img)
    }
 
    // Test the data's content
-   if (int res = memcmp(imageData, imageDataWritten, size) !=0)
+   if ( memcmp(imageData, imageDataWritten, size) !=0 )
    {
-      (void)res;
       std::cout << "Failed" << std::endl
                 << "        Pixel differ (as expanded in memory)." << std::endl;
       delete fileToBuild;
@@ -276,7 +308,7 @@ int WriteSimple(Image &img)
    return 0;
 }
 
-int TestWriteSimple(int argc, char* argv[])
+int TestWriteSimple(int argc, char *argv[])
 {
    if (argc < 1) 
    {