comparison Core/HttpServer/FilesystemHttpSender.cpp @ 277:58f969933720

merge with Orthanc-0.3.1
author Sebastien Jodogne <s.jodogne@gmail.com>
date Sun, 09 Dec 2012 15:03:17 +0100
parents 098661837a96
children bdd72233b105
comparison
equal deleted inserted replaced
276:8af8754a7a8e 277:58f969933720
38 namespace Orthanc 38 namespace Orthanc
39 { 39 {
40 void FilesystemHttpSender::Setup() 40 void FilesystemHttpSender::Setup()
41 { 41 {
42 //SetDownloadFilename(path_.filename().string()); 42 //SetDownloadFilename(path_.filename().string());
43
44 #if BOOST_HAS_FILESYSTEM_V3 == 1
43 SetContentType(Toolbox::AutodetectMimeType(path_.filename().string())); 45 SetContentType(Toolbox::AutodetectMimeType(path_.filename().string()));
46 #else
47 SetContentType(Toolbox::AutodetectMimeType(path_.filename()));
48 #endif
44 } 49 }
45 50
46 uint64_t FilesystemHttpSender::GetFileSize() 51 uint64_t FilesystemHttpSender::GetFileSize()
47 { 52 {
48 return Toolbox::GetFileSize(path_.string()); 53 return Toolbox::GetFileSize(path_.string());