Mercurial > hg > orthanc-webviewer
comparison Plugin/DecodedImageAdapter.cpp @ 216:47d52db10369
fix
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Fri, 22 Mar 2019 10:34:11 +0100 |
parents | 2f27287c047c |
children | aee499712ac4 |
comparison
equal
deleted
inserted
replaced
215:c2d729329fc7 | 216:47d52db10369 |
---|---|
26 #include <Core/Images/ImageBuffer.h> | 26 #include <Core/Images/ImageBuffer.h> |
27 #include <Core/Images/ImageProcessing.h> | 27 #include <Core/Images/ImageProcessing.h> |
28 #include <Core/OrthancException.h> | 28 #include <Core/OrthancException.h> |
29 #include <Core/Toolbox.h> | 29 #include <Core/Toolbox.h> |
30 #include <Plugins/Samples/GdcmDecoder/OrthancImageWrapper.h> | 30 #include <Plugins/Samples/GdcmDecoder/OrthancImageWrapper.h> |
31 #include <Resources/ThirdParty/base64/base64.h> | |
32 | 31 |
33 #include <boost/lexical_cast.hpp> | 32 #include <boost/lexical_cast.hpp> |
34 #include <boost/algorithm/string/predicate.hpp> | 33 #include <boost/algorithm/string/predicate.hpp> |
35 #include <json/writer.h> | 34 #include <json/writer.h> |
36 #include <boost/regex.hpp> | 35 #include <boost/regex.hpp> |
361 result["Orthanc"]["Compression"] = "Deflate"; | 360 result["Orthanc"]["Compression"] = "Deflate"; |
362 result["sizeInBytes"] = converted.GetSize(); | 361 result["sizeInBytes"] = converted.GetSize(); |
363 | 362 |
364 std::string z; | 363 std::string z; |
365 CompressUsingDeflate(z, image.GetContext(), converted.GetConstBuffer(), converted.GetSize()); | 364 CompressUsingDeflate(z, image.GetContext(), converted.GetConstBuffer(), converted.GetSize()); |
366 | 365 |
367 result["Orthanc"]["PixelData"] = base64_encode(z); | 366 std::string s; |
367 Orthanc::Toolbox::EncodeBase64(s, z); | |
368 result["Orthanc"]["PixelData"] = s; | |
368 | 369 |
369 return true; | 370 return true; |
370 } | 371 } |
371 | 372 |
372 | 373 |
482 result["sizeInBytes"] = converted.GetSize(); | 483 result["sizeInBytes"] = converted.GetSize(); |
483 | 484 |
484 std::string jpeg; | 485 std::string jpeg; |
485 WriteJpegToMemory(jpeg, image.GetContext(), converted, quality); | 486 WriteJpegToMemory(jpeg, image.GetContext(), converted, quality); |
486 | 487 |
487 result["Orthanc"]["PixelData"] = base64_encode(jpeg); | 488 std::string s; |
489 Orthanc::Toolbox::EncodeBase64(s, jpeg); | |
490 result["Orthanc"]["PixelData"] = s; | |
491 | |
488 return true; | 492 return true; |
489 } | 493 } |
490 } | 494 } |