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