X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmFile.cxx;h=b016e992e73844f3288e61104e8c91904706f456;hb=7815fe9dc3532b716dc478ca0f255263f99d296f;hp=248fc34daeaac29a9aa2f3d0579b166f88af0199;hpb=220ad8c527f2b2edf1ba19af8897aca8f4a49cf7;p=gdcm.git diff --git a/src/gdcmFile.cxx b/src/gdcmFile.cxx index 248fc34d..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 16:09:27 $ - Version: $Revision: 1.118 $ + 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,12 +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 */ -gdcmFile::gdcmFile(std::string const & filename, - bool exception_on_error ) +gdcmFile::gdcmFile(std::string const & filename ) { - Header = new gdcmHeader( filename, exception_on_error ); + Header = new gdcmHeader( filename ); SelfHeader = true; PixelRead = -1; // no ImageData read yet. @@ -155,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() ) @@ -832,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: @@ -1041,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) @@ -1059,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) }