From: jpr Date: Wed, 6 Jul 2005 11:01:08 +0000 (+0000) Subject: Now gdcmFile::Load() returns false if file is not gdcm parsable X-Git-Tag: Version1.2.bp~356 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=8c9be1e8673a87a752ad6335482ae775cd708a30;p=gdcm.git Now gdcmFile::Load() returns false if file is not gdcm parsable Only gdcmDocument::Load() did it, before. Thx to Benoit for reporting bug --- diff --git a/src/gdcmFile.cxx b/src/gdcmFile.cxx index b33765ad..16b7796e 100644 --- a/src/gdcmFile.cxx +++ b/src/gdcmFile.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmFile.cxx,v $ Language: C++ - Date: $Date: 2005/07/02 18:09:36 $ - Version: $Revision: 1.246 $ + Date: $Date: 2005/07/06 11:01:08 $ + Version: $Revision: 1.247 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -95,7 +95,8 @@ File::~File () */ bool File::Load( std::string const &fileName ) { - this->Document::Load( fileName ); + if ( ! this->Document::Load( fileName ) ) + return false; // for some ACR-NEMA images GrPixel, NumPixel is *not* 7fe0,0010 // We may encounter the 'RETired' (0x0028, 0x0200) tag