Mercurial > hg > orthanc-stone
comparison Framework/Loaders/OrthancSeriesVolumeProgressiveLoader.cpp @ 913:2b4b6b86520a
Re-enabled gl debug output in GuiAdapter +
REMOVED GZIP ENCODING IN OrthancSeriesVolumeProgressiveLoader +
added ability to use custom windowing in GrayscaleStyleConfigurator
author | Benjamin Golinvaux <bgo@osimis.io> |
---|---|
date | Fri, 19 Jul 2019 10:30:40 +0200 |
parents | a68cd7ae8838 |
children | f75f6cb69c1b |
comparison
equal
deleted
inserted
replaced
910:a6c12fe88bcb | 913:2b4b6b86520a |
---|---|
262 std::auto_ptr<OracleCommandWithPayload> command; | 262 std::auto_ptr<OracleCommandWithPayload> command; |
263 | 263 |
264 if (quality == BEST_QUALITY) | 264 if (quality == BEST_QUALITY) |
265 { | 265 { |
266 std::auto_ptr<GetOrthancImageCommand> tmp(new GetOrthancImageCommand); | 266 std::auto_ptr<GetOrthancImageCommand> tmp(new GetOrthancImageCommand); |
267 tmp->SetHttpHeader("Accept-Encoding", "gzip"); | 267 // TODO: review the following comment. Commented out by bgo on 2019-07-19 |
268 // reason: Alain has seen cases where gzipping the uint16 image took 11 sec | |
269 // to produce 5mb. The unzipped request was much much faster. | |
270 //tmp->SetHttpHeader("Accept-Encoding", "gzip"); | |
268 tmp->SetHttpHeader("Accept", std::string(Orthanc::EnumerationToString(Orthanc::MimeType_Pam))); | 271 tmp->SetHttpHeader("Accept", std::string(Orthanc::EnumerationToString(Orthanc::MimeType_Pam))); |
269 tmp->SetInstanceUri(instance, slice.GetExpectedPixelFormat()); | 272 tmp->SetInstanceUri(instance, slice.GetExpectedPixelFormat()); |
270 tmp->SetExpectedPixelFormat(slice.GetExpectedPixelFormat()); | 273 tmp->SetExpectedPixelFormat(slice.GetExpectedPixelFormat()); |
271 command.reset(tmp.release()); | 274 command.reset(tmp.release()); |
272 } | 275 } |
273 else | 276 else |
274 { | 277 { |
275 std::auto_ptr<GetOrthancWebViewerJpegCommand> tmp(new GetOrthancWebViewerJpegCommand); | 278 std::auto_ptr<GetOrthancWebViewerJpegCommand> tmp(new GetOrthancWebViewerJpegCommand); |
276 tmp->SetHttpHeader("Accept-Encoding", "gzip"); | 279 // TODO: review the following comment. Commented out by bgo on 2019-07-19 |
280 // (gzip for jpeg seems overkill) | |
281 //tmp->SetHttpHeader("Accept-Encoding", "gzip"); | |
277 tmp->SetInstance(instance); | 282 tmp->SetInstance(instance); |
278 tmp->SetQuality((quality == 0 ? 50 : 90)); | 283 tmp->SetQuality((quality == 0 ? 50 : 90)); |
279 tmp->SetExpectedPixelFormat(slice.GetExpectedPixelFormat()); | 284 tmp->SetExpectedPixelFormat(slice.GetExpectedPixelFormat()); |
280 command.reset(tmp.release()); | 285 command.reset(tmp.release()); |
281 } | 286 } |