Mercurial > hg > orthanc-wsi

comparison Framework/Jpeg2000Reader.cpp @ 43:9621fd6f17c9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
sync
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 09 Nov 2016 17:34:20 +0100
parents 7a88c614be04
children 7a3853d51c45
comparison
equal deleted inserted replaced
42:ee25d35663ac 43:9621fd6f17c9
20 20
21 #include "PrecompiledHeadersWSI.h" 21 #include "PrecompiledHeadersWSI.h"
22 #include "Jpeg2000Reader.h" 22 #include "Jpeg2000Reader.h"
23 23
24 #include "Orthanc/Core/OrthancException.h" 24 #include "Orthanc/Core/OrthancException.h"
25 #include "Orthanc/Core/Toolbox.h" 25 #include "Orthanc/Core/SystemToolbox.h"
26 #include "ImageToolbox.h" 26 #include "ImageToolbox.h"
27 27
28 #include <cassert> 28 #include <cassert>
29 #include <string.h> 29 #include <string.h>
30 #include <openjpeg.h> 30 #include <openjpeg.h>
458 void Jpeg2000Reader::ReadFromFile(const std::string& filename) 458 void Jpeg2000Reader::ReadFromFile(const std::string& filename)
459 { 459 {
460 // TODO Use opj_stream_create_file_stream() ? 460 // TODO Use opj_stream_create_file_stream() ?
461 461
462 std::string content; 462 std::string content;
463 Orthanc::Toolbox::ReadFile(content, filename); 463 Orthanc::SystemToolbox::ReadFile(content, filename);
464 } 464 }
465 465
466 466
467 Jpeg2000Format Jpeg2000Reader::DetectFormatFromMemory(const void* buffer, 467 Jpeg2000Format Jpeg2000Reader::DetectFormatFromMemory(const void* buffer,
468 size_t size) 468 size_t size)