BUG: Sorry I patched too quickly...

[gdcm.git] / Testing / TestWriteSimple.cxx

diff --git a/Testing/TestWriteSimple.cxx b/Testing/TestWriteSimple.cxx
index 8dc6b5a423fb3a9ad27d27f39256af5ebb178c5d..19b216bc1e901c5a116bcfcd7584bb821cda2da5 100644 (file)
--- a/Testing/TestWriteSimple.cxx
+++ b/Testing/TestWriteSimple.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: TestWriteSimple.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/02/09 16:28:41 $
-  Version:   $Revision: 1.23 $
+  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
@@ -70,6 +70,32 @@ Image Images [] = {
    {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
 };
 
@@ -155,7 +181,7 @@ int WriteSimple(Image &img)
                {
                   *(tmp+1) = j/256;
                }
-               tmp += img.components/8;
+               tmp += img.componentSize/8;
             }
          }
       }
@@ -260,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;