Mercurial > hg > orthanc
comparison Core/HttpServer/EmbeddedResourceHttpHandler.cpp @ 2906:2a504fef4ed7
AutodetectMimeType() now using boost::filesystem
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Tue, 30 Oct 2018 12:29:55 +0100 |
parents | 878b59270859 |
children | 9d277f8ad698 |
comparison
equal
deleted
inserted
replaced
2905:ae20fccdd867 | 2906:2a504fef4ed7 |
---|---|
34 #include "../PrecompiledHeaders.h" | 34 #include "../PrecompiledHeaders.h" |
35 #include "EmbeddedResourceHttpHandler.h" | 35 #include "EmbeddedResourceHttpHandler.h" |
36 | 36 |
37 #include "../Logging.h" | 37 #include "../Logging.h" |
38 #include "../OrthancException.h" | 38 #include "../OrthancException.h" |
39 #include "../SystemToolbox.h" | |
39 #include "HttpOutput.h" | 40 #include "HttpOutput.h" |
40 | 41 |
41 #include <stdio.h> | 42 #include <stdio.h> |
42 | 43 |
43 | 44 |
75 output.SendMethodNotAllowed("GET"); | 76 output.SendMethodNotAllowed("GET"); |
76 return true; | 77 return true; |
77 } | 78 } |
78 | 79 |
79 std::string resourcePath = Toolbox::FlattenUri(uri, baseUri_.size()); | 80 std::string resourcePath = Toolbox::FlattenUri(uri, baseUri_.size()); |
80 std::string contentType = Toolbox::AutodetectMimeType(resourcePath); | 81 std::string contentType = SystemToolbox::AutodetectMimeType(resourcePath); |
81 | 82 |
82 try | 83 try |
83 { | 84 { |
84 const void* buffer = EmbeddedResources::GetDirectoryResourceBuffer(resourceId_, resourcePath.c_str()); | 85 const void* buffer = EmbeddedResources::GetDirectoryResourceBuffer(resourceId_, resourcePath.c_str()); |
85 size_t size = EmbeddedResources::GetDirectoryResourceSize(resourceId_, resourcePath.c_str()); | 86 size_t size = EmbeddedResources::GetDirectoryResourceSize(resourceId_, resourcePath.c_str()); |