From: jpr <jpr>
Date: Wed, 30 Aug 2006 13:31:05 +0000 (+0000)
Subject: My previous patch hanged on images with Bits Allocated = 12.
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=3d7110251c7aef27b2a4bef93130ab53594c7e51;p=gdcm.git

My previous patch hanged on images with Bits Allocated = 12.
(Not so common, but not a bug)
This one should be the final one (hope so !)
---

diff --git a/src/gdcmPixelReadConvert.cxx b/src/gdcmPixelReadConvert.cxx
index a80e759c..858894d6 100644
--- a/src/gdcmPixelReadConvert.cxx
+++ b/src/gdcmPixelReadConvert.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmPixelReadConvert.cxx,v $
   Language:  C++
-  Date:      $Date: 2006/08/29 15:17:51 $
-  Version:   $Revision: 1.113 $
+  Date:      $Date: 2006/08/30 13:31:05 $
+  Version:   $Revision: 1.114 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -97,11 +97,11 @@ void PixelReadConvert::GrabInformationsFromFile( File *file,
    {
       BitsAllocated = 16;
    }
-   else if (BitsAllocated > 8 && BitsAllocated < 16)
+
+   else if (BitsAllocated > 8 && BitsAllocated < 16 && BitsAllocated != 12)
    {
       BitsAllocated = 16;
    }   
-
    // Number of "Bits Stored", defaulted to number of "Bits Allocated"
    // when absent from the file.
    BitsStored = file->GetBitsStored();
@@ -170,7 +170,7 @@ void PixelReadConvert::GrabInformationsFromFile( File *file,
             if( IsJPEG2000      = Global::GetTS()->IsJPEG2000(ts) )     break;
             if( IsMPEG          = Global::GetTS()->IsMPEG(ts) )         break;
             if( IsJPEGLS        = Global::GetTS()->IsJPEGLS(ts) )       break;
-            // DeflatedExplicitVRLittleEndian is considered as 'Unexpected' (we don't know yet haow to process !)
+            // DeflatedExplicitVRLittleEndian is considered as 'Unexpected' (we don't know yet how to process !)
             gdcmWarningMacro("Unexpected Transfer Syntax :[" << ts << "]");
             break;
          }