X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src%2FgdcmFile.cxx;h=b016e992e73844f3288e61104e8c91904706f456;hb=f163238b46fdd5a54c1b6b70549ab9466c101d14;hp=c4672b6e9d3f9a021fa9817936a9e575aec2de40;hpb=4c8c80589b3770976ea27fc03b290b97db5da3e6;p=gdcm.git

diff --git a/src/gdcmFile.cxx b/src/gdcmFile.cxx
index c4672b6e..b016e992 100644
--- a/src/gdcmFile.cxx
+++ b/src/gdcmFile.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmFile.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/07/30 11:40:13 $
-  Version:   $Revision: 1.117 $
+  Date:      $Date: 2004/08/02 16:42:14 $
+  Version:   $Revision: 1.120 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -62,17 +62,10 @@ gdcmFile::gdcmFile(gdcmHeader *header)
  *        one sets an a posteriori shadow dictionary (efficiency can be
  *        seen as a side effect).   
  * @param filename file to be opened for parsing
- * @param   exception_on_error whether we throw an exception or not
- * @param   ignore_shadow to allow skipping the shadow elements, 
- *          to save memory space.
  */
-gdcmFile::gdcmFile(std::string const & filename, 
-                   bool exception_on_error,
-                   bool ignore_shadow)
+gdcmFile::gdcmFile(std::string const & filename )
 {
-   Header = new gdcmHeader( filename,
-                            exception_on_error,
-                            ignore_shadow );
+   Header = new gdcmHeader( filename );
    SelfHeader = true;
    PixelRead  = -1; // no ImageData read yet.
 
@@ -160,7 +153,7 @@ void gdcmFile::SetPixelDataSizeFromHeader()
    std::string str_PhotometricInterpretation = 
                              Header->GetEntryByNumber(0x0028,0x0004);
     
-   /*if ( str_PhotometricInterpretation == "PALETTE COLOR " )*/
+   // if ( str_PhotometricInterpretation == "PALETTE COLOR " )
    // pb when undealt Segmented Palette Color
    
    if ( Header->HasLUT() )
@@ -837,7 +830,7 @@ void gdcmFile::SwapZone(void *im, int swap, int lgr, int nb)
          case 4321:
             for(i=0; i < lgr/2; i++)
             {
-            im16[i]= (im16[i] >> 8) | (im16[i] << 8 );
+               im16[i]= (im16[i] >> 8) | (im16[i] << 8 );
             }
             break;
          default:
@@ -1046,7 +1039,7 @@ bool gdcmFile::ReadPixelData(void *destination)
       if ( jpg2000 )
       {
       // JPEG 2000 :    call to ???
-      res = (bool)gdcm_read_JPEG2000_file (fp,destination);  // Not Yet written 
+      res = gdcm_read_JPEG2000_file (fp,destination);  // Not Yet written 
       // ------------------------------------- endif (JPEG2000)
       }
       else if (jpgLossless)
@@ -1064,12 +1057,12 @@ bool gdcmFile::ReadPixelData(void *destination)
          if ( Header->GetBitsStored() == 8)
          {
             // Reading Fragment pixels
-            res = (bool)gdcm_read_JPEG_file (fp,destination);
+            res = gdcm_read_JPEG_file (fp,destination);
          }
          else
          {
             // Reading Fragment pixels
-            res = (bool)gdcm_read_JPEG_file12 (fp,destination);
+            res = gdcm_read_JPEG_file12 (fp,destination);
          }
          // ------------------------------------- endif (JPEGLossy)
       }