Program: gdcm
Module: $RCSfile: gdcmFile.cxx,v $
Language: C++
- Date: $Date: 2005/10/25 14:36:30 $
- Version: $Revision: 1.294 $
+ Date: $Date: 2005/10/26 06:23:37 $
+ Version: $Revision: 1.297 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
if( entry->GetValueCount() == 3 )
{
- gdcmErrorMacro( entry->IsValueCountValid() );
+ if (!entry->IsValueCountValid() )
+ {
+ gdcmErrorMacro( "Invalid Value Count" );
+ }
return (float)entry->GetValue(0);
}
return 0.0f;
if( entry->GetValueCount() == 3 )
{
- gdcmErrorMacro( entry->IsValueCountValid() );
+ if (!entry->IsValueCountValid() )
+ {
+ gdcmErrorMacro( "Invalid Value Count" );
+ }
return (float)entry->GetValue(1);
}
return 0.0f;
{
if( entry->GetValueCount() == 3 )
{
- gdcmErrorMacro( entry->IsValueCountValid() );
+ if (!entry->IsValueCountValid() )
+ {
+ gdcmErrorMacro( "Invalid Value Count" );
+ }
return (float)entry->GetValue(2);
}
gdcmWarningMacro( "Wrong Image Position Patient (0020,0032)");
{
if( entry->GetValueCount() == 3 )
{
- gdcmErrorMacro( entry->IsValueCountValid() );
+ if (!entry->IsValueCountValid() )
+ {
+ gdcmErrorMacro( "Invalid Value Count" );
+ }
return (float)entry->GetValue(2);
}
gdcmWarningMacro( "Wrong Image Position (RET) (0020,0030)");
{
if( entry->GetValueCount() == 1 )
{
- gdcmErrorMacro( entry->IsValueCountValid() );
+ if (!entry->IsValueCountValid() )
+ {
+ gdcmErrorMacro( "Invalid Value Count" );
+ }
return (float)entry->GetValue(0); // VM=1 !
}
gdcmWarningMacro( "Wrong Slice Location (0020,1041)");
{
if( entry->GetValueCount() == 1 )
{
- gdcmErrorMacro( entry->IsValueCountValid() );
+ if (!entry->IsValueCountValid() )
+ {
+ gdcmErrorMacro( "Invalid Value Count" );
+ }
return (float)entry->GetValue(0);
}
gdcmWarningMacro( "Wrong Location (0020,0050)");
// Derma?.dcm does not have it...let's remove it FIXME FIXME
if( writetype != JPEG )
- {
+ {
int i_lgPix = GetEntryLength(GrPixel, NumPixel);
if (i_lgPix != -2)
- {
+ {
// no (GrPixel, NumPixel) element
std::string s_lgPix = Util::Format("%d", i_lgPix+12);
s_lgPix = Util::DicomString( s_lgPix.c_str() );
// These are the deprecated method that one day should be removed (after the next release)
#ifndef GDCM_LEGACY_REMOVE
-/*
- * brief Constructor (DEPRECATED : temporaryly kept not to break the API)
- * param filename name of the file whose header we want to analyze
- * deprecated do not use any longer
- */
-File::File( std::string const &filename )
- :Document( )
-{
- RLEInfo = new RLEFramesInfo;
- JPEGInfo = new JPEGFragmentsInfo;
-
- SetFileName( filename );
- Load( ); // gdcm::Document is first Loaded, then the 'File part'
-}
-
/*
* \ brief Loader. (DEPRECATED : temporaryly kept not to break the API)
* @ param fileName file to be open for parsing