First step to sync with v 1.2.2

[gdcm.git] / Example / WriteDicomAsJPEG2000.cxx

diff --git a/Example/WriteDicomAsJPEG2000.cxx b/Example/WriteDicomAsJPEG2000.cxx
index d864ea17202ce43ced18be930c858459919cd298..e60a9b4c92e1e85bbef8797bdac57f88fed6edcf 100644 (file)
--- a/Example/WriteDicomAsJPEG2000.cxx
+++ b/Example/WriteDicomAsJPEG2000.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: WriteDicomAsJPEG2000.cxx,v $
   Language:  C++
-  Date:      $Date: 2007/06/21 15:01:00 $
-  Version:   $Revision: 1.4 $
+  Date:      $Date: 2007/07/13 08:17:20 $
+  Version:   $Revision: 1.5 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -39,15 +39,11 @@ int main(int argc, char *argv[])
    std::cerr << "Using quality: " << quality << std::endl;
 
 // Step 1 : Create the header of the image
-   //GDCM_NAME_SPACE::File *f = new GDCM_NAME_SPACE::File();
-   // gdcm1.3 syntax. Sorry
    GDCM_NAME_SPACE::File *f = GDCM_NAME_SPACE::File::New();
    f->SetLoadMode ( GDCM_NAME_SPACE::LD_ALL ); // Load everything
    f->SetFileName( filename );
    f->Load();
 
-   //GDCM_NAME_SPACE::FileHelper *tested = new GDCM_NAME_SPACE::FileHelper( f );
-   // gdcm1.3 syntax. Sorry   
    GDCM_NAME_SPACE::FileHelper *tested = GDCM_NAME_SPACE::FileHelper::New( f );
    std::string PixelType = tested->GetFile()->GetPixelType();
    int xsize = f->GetXSize();
@@ -61,30 +57,21 @@ int main(int argc, char *argv[])
 
 // Step 1 : Create the header of the image
 
-//   GDCM_NAME_SPACE::File *fileToBuild = new GDCM_NAME_SPACE::File();
-   // gdcm1.3 syntax. Sorry !
    GDCM_NAME_SPACE::File *fileToBuild = GDCM_NAME_SPACE::File::New();
-   
    std::ostringstream str;
 
    // Set the image size
    str.str("");
    str << xsize;
-   //fileToBuild->InsertValEntry(str.str(),0x0028,0x0011); // Columns
-   // gdcm1.3 syntax. Sorry !
    fileToBuild->InsertEntryString(str.str(),0x0028,0x0011, "US"); // Columns
    str.str("");
    str << ysize;
-   //fileToBuild->InsertValEntry(str.str(),0x0028,0x0010); // Rows
-   // gdcm1.3 syntax. Sorry !
    fileToBuild->InsertEntryString(str.str(),0x0028,0x0010, "US"); // Rows
 
    if(zsize>1)
    {
       str.str("");
       str << zsize;
-      //fileToBuild->InsertValEntry(str.str(),0x0028,0x0008); // Number of Frames
-   // gdcm1.3 syntax. Sorry !
       fileToBuild->InsertEntryString(str.str(),0x0028,0x0008, "IS"); // Number of Frames
    }
    int bitsallocated = f->GetBitsAllocated();
@@ -96,39 +83,27 @@ int main(int argc, char *argv[])
    // Set the pixel type
    str.str("");
    str << bitsallocated;
-   //fileToBuild->InsertValEntry(str.str(),0x0028,0x0100); // Bits Allocated
-   // gdcm1.3 syntax. Sorry !
    fileToBuild->InsertEntryString(str.str(),0x0028,0x0100,"US"); // Bits Allocated
-   
+
    str.str("");
-   str << bitsstored;  
-   //fileToBuild->InsertValEntry(str.str(),0x0028,0x0101); // Bits Stored   
-   // gdcm1.3 syntax. Sorry !
+   str << bitsstored;
    fileToBuild->InsertEntryString(str.str(),0x0028,0x0101, "US"); // Bits Stored
+
    str.str("");
    str << highbit;
-   //fileToBuild->InsertValEntry(str.str(),0x0028,0x0102); // High Bit
-   // gdcm1.3 syntax. Sorry !
    fileToBuild->InsertEntryString(str.str(),0x0028,0x0102, "US"); // High Bit
 
    // Set the pixel representation
    str.str("");
    str << sign;
-   //fileToBuild->InsertValEntry(str.str(),0x0028,0x0103); // Pixel Representation
-   // gdcm1.3 syntax. Sorry !
    fileToBuild->InsertEntryString(str.str(),0x0028,0x0103, "US"); // Pixel Representation
 
-
    // Set the samples per pixel
    str.str("");
    str << samplesPerPixel; //img.components;
-   //fileToBuild->InsertValEntry(str.str(),0x0028,0x0002); // Samples per Pixel
-   // gdcm1.3 syntax. Sorry !
    fileToBuild->InsertEntryString(str.str(),0x0028,0x0002, "US"); // Samples per Pixel
 
 // Step 2 : Create the output image
-   //GDCM_NAME_SPACE::FileHelper *fileH = new GDCM_NAME_SPACE::FileHelper(fileToBuild);
-   // gdcm1.3 syntax. Sorry !
    GDCM_NAME_SPACE::FileHelper *fileH = GDCM_NAME_SPACE::FileHelper::New(fileToBuild);
    fileH->SetWriteTypeToJPEG2000(  );
    fileH->SetImageData(testedImageData, testedDataSize);
@@ -137,15 +112,11 @@ int main(int argc, char *argv[])
      std::cerr << "write fails" << std::endl;
      }
 
-   //delete f;
-   // gdcm1.3 syntax. Sorry !   
    f->Delete();
-   //delete tested;
    tested->Delete();
-   //delete fileToBuild;
    fileToBuild->Delete();
-   //delete fileH;
    fileH->Delete();
 
    return 0;
 }
+