X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Example%2FexColorToRGB.cxx;h=05509fcc5084c05be90b7a9cc9fb23e9e5bae481;hb=d9145e01b1e8f7f5378def524f6ffd5f9491abaf;hp=15263fb0e080a65be20ddc3a0ac3b33eed5dcdd4;hpb=e4071f248493a36a1b8109fffcb924a255152b36;p=gdcm.git

diff --git a/Example/exColorToRGB.cxx b/Example/exColorToRGB.cxx
index 15263fb0..05509fcc 100644
--- a/Example/exColorToRGB.cxx
+++ b/Example/exColorToRGB.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: exColorToRGB.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/02/09 14:39:48 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2005/07/07 17:31:54 $
+  Version:   $Revision: 1.3 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -23,6 +23,7 @@
 #include "gdcmBinEntry.h"
 #include "gdcmSeqEntry.h"
 
+#include <stdlib.h> // for exit
 
 int main(int argc, char *argv[])
 {
@@ -49,13 +50,14 @@ int main(int argc, char *argv[])
 // ============================================================
    // a gdcm::File contains all the Dicom Field but the Pixels Element
 
-   gdcm::File *f1= new gdcm::File( fileName );
-
-
    std::cout << argv[1] << std::endl;
 
-   f1 = new gdcm::File( fileName );
-   if (!f1->IsReadable()) {
+   gdcm::File *f = new gdcm::File();
+   f->SetLoadMode( 0x00000000);
+   f->SetFileName( fileName );
+   bool res = f->Load();        
+
+   if (!res) {
        std::cerr << "Sorry, " << fileName <<"  not a gdcm-readable "
                  << "DICOM / ACR File"
                  <<std::endl;
@@ -64,7 +66,7 @@ int main(int argc, char *argv[])
    std::cout << " ... is readable " << std::endl;
 
 /*
-   if (!f1->IsMonochrome()) {
+   if (!f->IsMonochrome()) {
        std::cerr << "Sorry, " << fileName <<"  not a 'color' File "
                  << " "
                  <<std::endl;
@@ -77,11 +79,11 @@ int main(int argc, char *argv[])
 // ============================================================
 
    // We need a gdcm::FileHelper, since we want to load the pixels        
-   gdcm::FileHelper *fh1 = new gdcm::FileHelper(f1);
+   gdcm::FileHelper *fh = new gdcm::FileHelper(f);
 
    // (unit8_t DOESN'T mean it's mandatory for the image to be a 8 bits one) 
 
-   uint8_t *imageData = fh1->GetImageData();
+   uint8_t *imageData = fh->GetImageData();
 
    if ( imageData == 0 )
    {
@@ -91,15 +93,13 @@ int main(int argc, char *argv[])
    }
  
 
-
-
    // ------ User wants write a new image without shadow groups -------------
    // ------                              without Sequences     -------------
 
  
    gdcm::FileHelper *copy = new gdcm::FileHelper( output );
  
-   gdcm::DocEntry *d = f1->GetFirstEntry();
+   gdcm::DocEntry *d = f->GetFirstEntry();
    while(d)
    {
       // We skip SeqEntries, since user cannot do much with them
@@ -125,19 +125,19 @@ int main(int argc, char *argv[])
           // We skip gdcm::SeqEntries
          }
       }
-      d = f1->GetNextEntry();
+      d = f->GetNextEntry();
    }
  
    // User knows the image is a 'color' one -RGB, YBR, Palette Color-
    // and wants to write it as RGB
-   copy->SetImageData(imageData, fh1->GetImageDataSize());
+   copy->SetImageData(imageData, fh->GetImageDataSize());
    copy->SetWriteModeToRGB();
 
    copy->WriteDcmExplVR( output );
 
 
-   delete f1;
-   delete fh1;
+   delete f;
+   delete fh;
    delete copy;
 
    exit (0);