Mercurial > hg > orthanc
annotate Core/Compression/ZlibCompressor.cpp @ 2253:441352e7a9d1
fix
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Wed, 25 Jan 2017 14:16:46 +0100 |
| parents | a3a65de1840f |
| children | 878b59270859 |
| rev | line source |
|---|---|
| 0 | 1 /** |
| 59 | 2 * Orthanc - A Lightweight, RESTful DICOM Store |
| 1900 | 3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics |
|
1288
6e7e5ed91c2d
upgrade to year 2015
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
824
diff
changeset
|
4 * Department, University Hospital of Liege, Belgium |
|
2244
a3a65de1840f
shared copyright with osimis
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1900
diff
changeset
|
5 * Copyright (C) 2017 Osimis, Belgium |
| 0 | 6 * |
| 7 * This program is free software: you can redistribute it and/or | |
| 8 * modify it under the terms of the GNU General Public License as | |
| 9 * published by the Free Software Foundation, either version 3 of the | |
| 10 * License, or (at your option) any later version. | |
| 136 | 11 * |
| 12 * In addition, as a special exception, the copyright holders of this | |
| 13 * program give permission to link the code of its release with the | |
| 14 * OpenSSL project's "OpenSSL" library (or with modified versions of it | |
| 15 * that use the same license as the "OpenSSL" library), and distribute | |
| 16 * the linked executables. You must obey the GNU General Public License | |
| 17 * in all respects for all of the code used other than "OpenSSL". If you | |
| 18 * modify file(s) with this exception, you may extend this exception to | |
| 19 * your version of the file(s), but you are not obligated to do so. If | |
| 20 * you do not wish to do so, delete this exception statement from your | |
| 21 * version. If you delete this exception statement from all source files | |
| 22 * in the program, then also delete it here. | |
| 0 | 23 * |
| 24 * This program is distributed in the hope that it will be useful, but | |
| 25 * WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 26 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 27 * General Public License for more details. | |
| 28 * | |
| 29 * You should have received a copy of the GNU General Public License | |
| 30 * along with this program. If not, see <http://www.gnu.org/licenses/>. | |
| 31 **/ | |
| 32 | |
| 33 | |
|
824
a811bdf8b8eb
precompiled headers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
689
diff
changeset
|
34 #include "../PrecompiledHeaders.h" |
| 0 | 35 #include "ZlibCompressor.h" |
| 36 | |
| 1513 | 37 #include "../OrthancException.h" |
| 38 #include "../Logging.h" | |
| 39 | |
| 0 | 40 #include <stdio.h> |
| 41 #include <string.h> | |
| 42 #include <zlib.h> | |
| 43 | |
| 59 | 44 namespace Orthanc |
| 0 | 45 { |
| 46 void ZlibCompressor::Compress(std::string& compressed, | |
| 47 const void* uncompressed, | |
| 48 size_t uncompressedSize) | |
| 49 { | |
| 50 if (uncompressedSize == 0) | |
| 51 { | |
| 52 compressed.clear(); | |
| 53 return; | |
| 54 } | |
| 55 | |
|
1511
7962563129c9
starting support of deflate/gzip content types
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
56 uLongf compressedSize = compressBound(uncompressedSize) + 1024 /* security margin */; |
|
7962563129c9
starting support of deflate/gzip content types
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
57 if (compressedSize == 0) |
|
7962563129c9
starting support of deflate/gzip content types
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
58 { |
|
7962563129c9
starting support of deflate/gzip content types
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
59 compressedSize = 1; |
|
7962563129c9
starting support of deflate/gzip content types
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
60 } |
| 0 | 61 |
|
1511
7962563129c9
starting support of deflate/gzip content types
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
62 uint8_t* target; |
| 1512 | 63 if (HasPrefixWithUncompressedSize()) |
| 0 | 64 { |
|
1511
7962563129c9
starting support of deflate/gzip content types
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
65 compressed.resize(compressedSize + sizeof(uint64_t)); |
|
7962563129c9
starting support of deflate/gzip content types
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
66 target = reinterpret_cast<uint8_t*>(&compressed[0]) + sizeof(uint64_t); |
| 0 | 67 } |
| 68 else | |
| 69 { | |
|
1511
7962563129c9
starting support of deflate/gzip content types
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
70 compressed.resize(compressedSize); |
|
7962563129c9
starting support of deflate/gzip content types
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
71 target = reinterpret_cast<uint8_t*>(&compressed[0]); |
|
7962563129c9
starting support of deflate/gzip content types
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
72 } |
|
7962563129c9
starting support of deflate/gzip content types
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
73 |
|
7962563129c9
starting support of deflate/gzip content types
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
74 int error = compress2(target, |
|
7962563129c9
starting support of deflate/gzip content types
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
75 &compressedSize, |
|
7962563129c9
starting support of deflate/gzip content types
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
76 const_cast<Bytef *>(static_cast<const Bytef *>(uncompressed)), |
|
7962563129c9
starting support of deflate/gzip content types
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
77 uncompressedSize, |
| 1512 | 78 GetCompressionLevel()); |
|
1511
7962563129c9
starting support of deflate/gzip content types
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
79 |
|
7962563129c9
starting support of deflate/gzip content types
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
80 if (error != Z_OK) |
|
7962563129c9
starting support of deflate/gzip content types
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
81 { |
| 0 | 82 compressed.clear(); |
| 83 | |
| 84 switch (error) | |
| 85 { | |
| 86 case Z_MEM_ERROR: | |
| 59 | 87 throw OrthancException(ErrorCode_NotEnoughMemory); |
| 0 | 88 |
| 89 default: | |
| 59 | 90 throw OrthancException(ErrorCode_InternalError); |
| 0 | 91 } |
| 92 } | |
|
1511
7962563129c9
starting support of deflate/gzip content types
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
93 |
|
7962563129c9
starting support of deflate/gzip content types
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
94 // The compression was successful |
| 1512 | 95 if (HasPrefixWithUncompressedSize()) |
|
1511
7962563129c9
starting support of deflate/gzip content types
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
96 { |
|
7962563129c9
starting support of deflate/gzip content types
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
97 uint64_t s = static_cast<uint64_t>(uncompressedSize); |
|
7962563129c9
starting support of deflate/gzip content types
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
98 memcpy(&compressed[0], &s, sizeof(uint64_t)); |
|
7962563129c9
starting support of deflate/gzip content types
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
99 compressed.resize(compressedSize + sizeof(uint64_t)); |
|
7962563129c9
starting support of deflate/gzip content types
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
100 } |
|
7962563129c9
starting support of deflate/gzip content types
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
101 else |
|
7962563129c9
starting support of deflate/gzip content types
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
102 { |
|
7962563129c9
starting support of deflate/gzip content types
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
103 compressed.resize(compressedSize); |
|
7962563129c9
starting support of deflate/gzip content types
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
104 } |
| 0 | 105 } |
| 106 | |
| 107 | |
| 108 void ZlibCompressor::Uncompress(std::string& uncompressed, | |
| 109 const void* compressed, | |
| 110 size_t compressedSize) | |
| 111 { | |
| 112 if (compressedSize == 0) | |
| 113 { | |
| 114 uncompressed.clear(); | |
| 115 return; | |
| 116 } | |
| 117 | |
| 1513 | 118 if (!HasPrefixWithUncompressedSize()) |
| 0 | 119 { |
| 1513 | 120 LOG(ERROR) << "Cannot guess the uncompressed size of a zlib-encoded buffer"; |
| 121 throw OrthancException(ErrorCode_InternalError); | |
| 0 | 122 } |
| 123 | |
| 1513 | 124 uint64_t uncompressedSize = ReadUncompressedSizePrefix(compressed, compressedSize); |
|
221
e7432706b354
accessors to storage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
125 |
|
e7432706b354
accessors to storage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
126 try |
|
e7432706b354
accessors to storage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
127 { |
| 1545 | 128 uncompressed.resize(static_cast<size_t>(uncompressedSize)); |
|
221
e7432706b354
accessors to storage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
129 } |
|
e7432706b354
accessors to storage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
130 catch (...) |
|
e7432706b354
accessors to storage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
131 { |
| 1513 | 132 throw OrthancException(ErrorCode_NotEnoughMemory); |
|
221
e7432706b354
accessors to storage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
133 } |
| 0 | 134 |
| 1545 | 135 uLongf tmp = static_cast<uLongf>(uncompressedSize); |
| 0 | 136 int error = uncompress |
| 137 (reinterpret_cast<uint8_t*>(&uncompressed[0]), | |
| 138 &tmp, | |
|
1511
7962563129c9
starting support of deflate/gzip content types
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
139 reinterpret_cast<const uint8_t*>(compressed) + sizeof(uint64_t), |
|
7962563129c9
starting support of deflate/gzip content types
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
140 compressedSize - sizeof(uint64_t)); |
| 0 | 141 |
| 142 if (error != Z_OK) | |
| 143 { | |
| 144 uncompressed.clear(); | |
| 145 | |
| 146 switch (error) | |
| 147 { | |
| 148 case Z_DATA_ERROR: | |
|
1582
bd1889029cbb
encoding of exceptions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1545
diff
changeset
|
149 throw OrthancException(ErrorCode_CorruptedFile); |
| 0 | 150 |
| 151 case Z_MEM_ERROR: | |
| 59 | 152 throw OrthancException(ErrorCode_NotEnoughMemory); |
| 0 | 153 |
| 154 default: | |
| 59 | 155 throw OrthancException(ErrorCode_InternalError); |
| 0 | 156 } |
| 157 } | |
| 158 } | |
| 159 } |