Mercurial > hg > orthanc

comparison Core/FileStorage/CompressedFileStorageAccessor.cpp @ 1122:1d60316c3618

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
simplifications in FileStorage
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 05 Sep 2014 15:48:43 +0200
parents a811bdf8b8eb
children 6c5a77637b23
comparison
equal deleted inserted replaced
1121:82567bac5e25 1122:1d60316c3618
90 const std::string& uuid) 90 const std::string& uuid)
91 { 91 {
92 switch (compressionType_) 92 switch (compressionType_)
93 { 93 {
94 case CompressionType_None: 94 case CompressionType_None:
95 storage_.ReadFile(content, uuid); 95 storage_.Read(content, uuid);
96 break; 96 break;
97 97
98 case CompressionType_Zlib: 98 case CompressionType_Zlib:
99 { 99 {
100 std::string compressed; 100 std::string compressed;
101 storage_.ReadFile(compressed, uuid); 101 storage_.Read(compressed, uuid);
102 zlib_.Uncompress(content, compressed); 102 zlib_.Uncompress(content, compressed);
103 break; 103 break;
104 } 104 }
105 105
106 default: 106 default:
119 } 119 }
120 120
121 case CompressionType_Zlib: 121 case CompressionType_Zlib:
122 { 122 {
123 std::string compressed; 123 std::string compressed;
124 storage_.ReadFile(compressed, uuid); 124 storage_.Read(compressed, uuid);
125 125
126 std::auto_ptr<BufferHttpSender> sender(new BufferHttpSender); 126 std::auto_ptr<BufferHttpSender> sender(new BufferHttpSender);
127 zlib_.Uncompress(sender->GetBuffer(), compressed); 127 zlib_.Uncompress(sender->GetBuffer(), compressed);
128 128
129 return sender.release(); 129 return sender.release();