# HG changeset patch # User Sebastien Jodogne # Date 1613117731 -3600 # Node ID 12528a80e3dd610eeb8de6d43d930abb866d5059 # Parent 911cd9a11ad3279c5619c8b2fe3ed4b30e4cc45f fix build diff -r 911cd9a11ad3 -r 12528a80e3dd Applications/Resources/Colormaps/GenerateColormaps.py --- a/Applications/Resources/Colormaps/GenerateColormaps.py Sat Jan 30 12:30:09 2021 +0100 +++ b/Applications/Resources/Colormaps/GenerateColormaps.py Fri Feb 12 09:15:31 2021 +0100 @@ -37,9 +37,9 @@ colormap += map(lambda k: int(round(color[k] * 255)), range(3)) - colormap[0] = 0 - colormap[1] = 0 - colormap[2] = 0 + #colormap[0] = 0 + #colormap[1] = 0 + #colormap[2] = 0 return array.array('B', colormap).tostring() diff -r 911cd9a11ad3 -r 12528a80e3dd Applications/Resources/Colormaps/hot.lut Binary file Applications/Resources/Colormaps/hot.lut has changed diff -r 911cd9a11ad3 -r 12528a80e3dd Applications/Resources/Colormaps/jet.lut Binary file Applications/Resources/Colormaps/jet.lut has changed diff -r 911cd9a11ad3 -r 12528a80e3dd OrthancStone/Sources/Loaders/SeriesThumbnailsLoader.cpp --- a/OrthancStone/Sources/Loaders/SeriesThumbnailsLoader.cpp Sat Jan 30 12:30:09 2021 +0100 +++ b/OrthancStone/Sources/Loaders/SeriesThumbnailsLoader.cpp Fri Feb 12 09:15:31 2021 +0100 @@ -508,19 +508,16 @@ dynamic_cast(message.GetOrigin()); const ThumbnailInformation& info = dynamic_cast(origin.GetPayload()); - std::string tmp; Orthanc::DicomTransferSyntax transferSyntax; - if (!message.GetDicom().LookupTransferSyntax(tmp)) - { - + if (!message.GetDicom().LookupTransferSyntax(transferSyntax)) + { throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat, "DICOM instance without a transfer syntax: " + origin.GetSopInstanceUid()); } - else if (!Orthanc::LookupTransferSyntax(transferSyntax, tmp) || - !ImageToolbox::IsDecodingSupported(transferSyntax)) + else if (!ImageToolbox::IsDecodingSupported(transferSyntax)) { LOG(INFO) << "Asking the DICOMweb server to transcode, " - << "as I don't support this transfer syntax: " << tmp; + << "as I don't support this transfer syntax: " << Orthanc::GetTransferSyntaxUid(transferSyntax); Schedule(ParseDicomFromWadoCommand::Create( origin.GetSource(), info.GetStudyInstanceUid(), info.GetSeriesInstanceUid(),