X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Testing%2FTestWriteSimple.cxx;h=4b8685d150d0b919b8b791467396d1ccc0e92bb6;hb=4fd00ffbd309b3f6377e6a9e9475aa3fee49383f;hp=116525891bf50388ce698615c391c063f7cc657b;hpb=ca7638110ded9d3f5283be33b6be6442b397a38f;p=gdcm.git diff --git a/Testing/TestWriteSimple.cxx b/Testing/TestWriteSimple.cxx index 11652589..4b8685d1 100644 --- a/Testing/TestWriteSimple.cxx +++ b/Testing/TestWriteSimple.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: TestWriteSimple.cxx,v $ Language: C++ - Date: $Date: 2006/04/07 10:58:51 $ - Version: $Revision: 1.47 $ + Date: $Date: 2006/04/11 16:05:03 $ + Version: $Revision: 1.49 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -127,16 +127,16 @@ int WriteSimple(Image &img) // Set the image size str.str(""); str << img.sizeX; - fileToBuild->InsertEntryString(str.str(),0x0028,0x0011); // Columns + fileToBuild->InsertEntryString(str.str(),0x0028,0x0011,"US"); // Columns str.str(""); str << img.sizeY; - fileToBuild->InsertEntryString(str.str(),0x0028,0x0010); // Rows + fileToBuild->InsertEntryString(str.str(),0x0028,0x0010,"US"); // Rows if(img.sizeZ>1) { str.str(""); str << img.sizeZ; - fileToBuild->InsertEntryString(str.str(),0x0028,0x0008); // Number of Frames + fileToBuild->InsertEntryString(str.str(),0x0028,0x0008, "IS"); // Number of Frames } fileName << "-" << img.sizeX << "-" << img.sizeY << "-" << img.sizeZ; @@ -144,20 +144,20 @@ int WriteSimple(Image &img) // Set the pixel type str.str(""); str << img.componentSize; - fileToBuild->InsertEntryString(str.str(),0x0028,0x0100); // Bits Allocated + fileToBuild->InsertEntryString(str.str(),0x0028,0x0100,"US"); // Bits Allocated str.str(""); str << img.componentUse; - fileToBuild->InsertEntryString(str.str(),0x0028,0x0101); // Bits Stored + fileToBuild->InsertEntryString(str.str(),0x0028,0x0101,"US"); // Bits Stored str.str(""); str << ( img.componentSize - 1 ); - fileToBuild->InsertEntryString(str.str(),0x0028,0x0102); // High Bit + fileToBuild->InsertEntryString(str.str(),0x0028,0x0102,"US"); // High Bit // Set the pixel representation str.str(""); str << img.sign; - fileToBuild->InsertEntryString(str.str(),0x0028,0x0103); // Pixel Representation + fileToBuild->InsertEntryString(str.str(),0x0028,0x0103, "US"); // Pixel Representation fileName << "-" << img.componentSize; if(img.sign == 0) @@ -179,7 +179,7 @@ int WriteSimple(Image &img) // Set the samples per pixel str.str(""); str << img.components; - fileToBuild->InsertEntryString(str.str(),0x0028,0x0002); // Samples per Pixel + fileToBuild->InsertEntryString(str.str(),0x0028,0x0002, "US"); // Samples per Pixel // Step 2 : Create the output image std::cout << "2..."; @@ -394,7 +394,7 @@ int TestWriteSimple(int argc, char *argv[]) } // gdcm::Debug::DebugOn(); - char c; + int ret=0; int i=0; while( Images[i].sizeX>0 && Images[i].sizeY>0 )