When 'Pixel Aspect Ratio' exists, don't add a default 'Pixel Spacing'

[gdcm.git] / src / gdcmOrientation.cxx

diff --git a/src/gdcmOrientation.cxx b/src/gdcmOrientation.cxx
index 40ddc532fd8eeae48a743a9666b46a879f6488a7..5340edeb470852c717b714aa0bdbe76c900860ee 100644 (file)
--- a/src/gdcmOrientation.cxx
+++ b/src/gdcmOrientation.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmOrientation.cxx,v $
   Language:  C++
-  Date:      $Date: 2006/01/18 10:18:30 $
-  Version:   $Revision: 1.22 $
+  Date:      $Date: 2007/05/23 14:18:10 $
+  Version:   $Revision: 1.25 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -21,7 +21,7 @@
 #include "gdcmDebug.h"
 #include <math.h> // for sqrt
 
-namespace gdcm 
+namespace GDCM_NAME_SPACE 
 {
 //--------------------------------------------------------------------
 //  THERALYS Algorithm to determine the most similar basic orientation
@@ -88,7 +88,7 @@ OrientationType Orientation::GetOrientationType( File *f )
    bool succ = f->GetImageOrientationPatient( iop );
    if ( !succ )
    {
-      gdcmErrorMacro( "No Image Orientation (0020,0037)/(0020,0032) found in the file, cannot proceed." )
+      gdcmWarningMacro( "No Image Orientation (0020,0037)/(0020,0032) found in the file, cannot proceed." )
       return NotApplicable;
    }
    vector3D ori1;
@@ -276,6 +276,7 @@ have multiple letters in as described under "refinements" in C.7.6.1.1.1):
 /**
  * \brief Computes the Patient Orientation relative to the image plane
  *          from the 'Image Orientation (Patient)'
+ *          - or from 0020 0035Image Orientation (RET) -
  *          - The first entry is the direction of the rows, given by the 
  *          direction of the last pixel in the first row from the first 
  *          pixel in that row.