X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmFile.cxx;h=acc5acfae523a4f2e110f0972f1f657e1b244aeb;hb=721d134c6e594b9a23bf1ce002ed87bfbc1576a7;hp=ae2ae3caeb5186e8581dcfb9cb55065d082d8cba;hpb=0471af52ad66f0748d4b0d04646c7277ac322d0b;p=gdcm.git diff --git a/src/gdcmFile.cxx b/src/gdcmFile.cxx index ae2ae3ca..acc5acfa 100644 --- a/src/gdcmFile.cxx +++ b/src/gdcmFile.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmFile.cxx,v $ Language: C++ - Date: $Date: 2007/10/03 09:32:10 $ - Version: $Revision: 1.339 $ + Date: $Date: 2007/10/23 15:52:33 $ + Version: $Revision: 1.341 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -1453,6 +1453,13 @@ bool File::IsPaletteColor() { return true; } + + // MONOCHROME + [Enhanced CT Image Storage] actually have Palettes + std::string sopClassUid = GetEntryString( 0x0008, 0x0016 ); + if (Util::DicomStringEqual( sopClassUid, "1.2.840.10008.5.1.4.1.1.2.1")) + { + return true; + } if ( PhotometricInterp == GDCM_UNFOUND ) { gdcmDebugMacro( "Not found : Palette color (0028,0004)"); @@ -1467,7 +1474,7 @@ bool File::IsPaletteColor() */ bool File::IsYBRFull() { - std::string PhotometricInterp = GetEntryString( 0x0028, 0x0004 ); + std::string PhotometricInterp = GetEntryString( 0x0028, 0x0004 ); if ( PhotometricInterp == "YBR_FULL" ) { return true; @@ -2012,7 +2019,7 @@ bool File::Write(std::string fileName, FileType writetype) InsertEntryString(s_lgPix,GrPixel, 0x0000, "UL"); } } - Document::WriteContent(fp, writetype); + Document::WriteContent(fp, writetype,false,false); fp->close(); delete fp;