Program: gdcm
Module: $RCSfile: gdcmPixelReadConvert.cxx,v $
Language: C++
- Date: $Date: 2005/10/27 09:51:28 $
- Version: $Revision: 1.94 $
+ Date: $Date: 2005/11/09 10:18:44 $
+ Version: $Revision: 1.98 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
namespace gdcm
{
-//bool ReadMPEGFile (std::ifstream *fp, void *image_buffer, size_t lenght);
+bool ReadMPEGFile (std::ifstream *fp, char *inputdata, size_t lenght);
bool gdcm_read_JPEG2000_file (void* raw,
char *inputdata, size_t inputlength);
//-----------------------------------------------------------------------------
//gdcmWarningMacro( "Sorry, MPEG not yet taken into account" );
//return false;
// fp has already been seek to start of mpeg
- //ReadMPEGFile(fp, Raw, PixelDataLength);
+ ReadMPEGFile(fp, (char*)Raw, PixelDataLength);
return true;
}
else
// Default case concerns JPEG family
if ( ! ReadAndDecompressJPEGFile( fp ) )
{
- gdcmWarningMacro( "JPEG decompressor failed." );
+ gdcmWarningMacro( "JPEG decompressor ( ReadAndDecompressJPEGFile()"
+ << " method ) failed." );
return false;
}
}
return true;
}
// wow what happen, must be an error
+ gdcmWarningMacro( "gdcm_read_JPEG2000_file() failed ");
return false;
}
else if ( IsJPEGLS )
// 'ImplicitVR BigEndian PrivateGE Transfer Syntax', then GDCM needs to switch
// the byte swapping code when entering the pixel data.
-/* //Let me check something.
- //I wait for the Dashboard !
if ( IsPrivateGETransferSyntax )
{
// PrivateGETransferSyntax only exists for 'true' Dicom images
break;
}
}
-*/
+
if ( BitsAllocated == 16 )
{
uint16_t *im16 = (uint16_t*)Raw;
// - [Planar 1] AND [Photo C] handled with ConvertYcBcRPlanesToRGBPixels()
// - [Planar 2] OR [Photo D] requires LUT intervention.
- gdcmWarningMacro("--> ConvertHandleColor"
+ gdcmDebugMacro("--> ConvertHandleColor "
<< "Planar Configuration " << PlanarConfiguration );
if ( ! IsRawRGB() )
{
// [Planar 2] OR [Photo D]: LUT intervention done outside
- gdcmWarningMacro("--> RawRGB : LUT intervention done outside");
+ gdcmDebugMacro("--> RawRGB : LUT intervention done outside");
return;
}
if ( IsYBRFull )
{
// [Planar 1] AND [Photo C] (remember YBR_FULL_422 acts as RGB)
- gdcmWarningMacro("--> YBRFull");
+ gdcmDebugMacro("--> YBRFull");
ConvertYcBcRPlanesToRGBPixels();
}
else
{
// [Planar 1] AND [Photo C]
- gdcmWarningMacro("--> YBRFull");
+ gdcmDebugMacro("--> YBRFull");
ConvertRGBPlanesToRGBPixels();
}
return;
if (IsRLELossless)
{
- gdcmWarningMacro("--> RLE Lossless");
+ gdcmDebugMacro("--> RLE Lossless");
ConvertRGBPlanesToRGBPixels();
}