X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmPixelReadConvert.cxx;h=9b97cbb171e525e98fc0ea176a36a55d2e208ddc;hb=4bc73d5b45864c259a914619b2fc9d08ca167763;hp=d6e46f31044b072d95094da076c52cad1b90a742;hpb=4ce945c12230fa2e77f056352b99ad071148924f;p=gdcm.git diff --git a/src/gdcmPixelReadConvert.cxx b/src/gdcmPixelReadConvert.cxx index d6e46f31..9b97cbb1 100644 --- a/src/gdcmPixelReadConvert.cxx +++ b/src/gdcmPixelReadConvert.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmPixelReadConvert.cxx,v $ Language: C++ - Date: $Date: 2005/06/23 09:18:37 $ - Version: $Revision: 1.72 $ + Date: $Date: 2005/07/01 11:25:51 $ + Version: $Revision: 1.74 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -50,6 +50,8 @@ PixelReadConvert::PixelReadConvert() LutRedData = 0; LutGreenData = 0; LutBlueData = 0; + RLEInfo = 0; + JPEGInfo = 0; } /// Canonical Destructor @@ -940,7 +942,7 @@ bool PixelReadConvert::ConvertReArrangeBits() throw ( FormatError ) uint16_t smask = 0x0001; smask = smask << ( 16 - (BitsAllocated - BitsStored + 1) ); // nmask : to propagate sign bit on negative values - int16_t nmask = 0x8000; + int16_t nmask = (int16_t)0x8000; nmask = nmask >> ( BitsAllocated - BitsStored - 1 ); /* std::cout << "BitsStored " << BitsStored