Mercurial > hg > orthanc-stone

changeset 1743:12528a80e3dd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix build
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 12 Feb 2021 09:15:31 +0100
parents 911cd9a11ad3
children 9b69970fbdb5
files Applications/Resources/Colormaps/GenerateColormaps.py Applications/Resources/Colormaps/hot.lut Applications/Resources/Colormaps/jet.lut OrthancStone/Sources/Loaders/SeriesThumbnailsLoader.cpp
diffstat 4 files changed, 7 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- 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()
 
Binary file Applications/Resources/Colormaps/hot.lut has changed
Binary file Applications/Resources/Colormaps/jet.lut has changed
--- 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<const ParseDicomFromWadoCommand&>(message.GetOrigin());
     const ThumbnailInformation& info = dynamic_cast<ThumbnailInformation&>(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(),