Mercurial > hg > orthanc-wsi
annotate Framework/Inputs/HierarchicalTiff.cpp @ 254:20a730889ae2
upgrade to 2023
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Fri, 07 Jul 2023 17:38:07 +0200 |
parents | 49f647ed1b4c |
children | 559499b80da8 |
rev | line source |
---|---|
0 | 1 /** |
2 * Orthanc - A Lightweight, RESTful DICOM Store | |
3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics | |
4 * Department, University Hospital of Liege, Belgium | |
254 | 5 * Copyright (C) 2017-2023 Osimis S.A., Belgium |
6 * Copyright (C) 2021-2023 Sebastien Jodogne, ICTEAM UCLouvain, Belgium | |
0 | 7 * |
8 * This program is free software: you can redistribute it and/or | |
9 * modify it under the terms of the GNU Affero General Public License | |
10 * as published by the Free Software Foundation, either version 3 of | |
11 * the License, or (at your option) any later version. | |
12 * | |
13 * This program is distributed in the hope that it will be useful, but | |
14 * WITHOUT ANY WARRANTY; without even the implied warranty of | |
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
16 * Affero General Public License for more details. | |
17 * | |
18 * You should have received a copy of the GNU Affero General Public License | |
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. | |
20 **/ | |
21 | |
22 | |
16
7a88c614be04
preparing for precompiled headers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
0
diff
changeset
|
23 #include "../PrecompiledHeadersWSI.h" |
0 | 24 #include "HierarchicalTiff.h" |
25 | |
192 | 26 #include <Logging.h> |
27 #include <OrthancException.h> | |
0 | 28 |
29 #include <iostream> | |
30 #include <algorithm> | |
31 #include <cassert> | |
32 #include <string.h> | |
33 | |
34 namespace OrthancWSI | |
35 { | |
36 HierarchicalTiff::Level::Level(TIFF* tiff, | |
37 tdir_t directory, | |
38 unsigned int width, | |
39 unsigned int height) : | |
40 directory_(directory), | |
41 width_(width), | |
42 height_(height) | |
43 { | |
44 // Read the JPEG headers shared at that level, if any | |
45 uint8_t *tables = NULL; | |
46 uint32_t size; | |
47 if (TIFFGetField(tiff, TIFFTAG_JPEGTABLES, &size, &tables) && | |
48 size > 0 && | |
49 tables != NULL) | |
50 { | |
51 // Look for the EOI (end-of-image) tag == FF D9 | |
52 // https://en.wikipedia.org/wiki/JPEG_File_Interchange_Format | |
53 | |
54 bool found = false; | |
55 | |
56 for (size_t i = 0; i + 1 < size; i++) | |
57 { | |
58 if (tables[i] == 0xff && | |
59 tables[i + 1] == 0xd9) | |
60 { | |
61 headers_.assign(reinterpret_cast<const char*>(tables), i); | |
62 found = true; | |
63 } | |
64 } | |
65 | |
66 if (!found) | |
67 { | |
68 headers_.assign(reinterpret_cast<const char*>(tables), size); | |
69 } | |
70 } | |
71 } | |
72 | |
73 struct HierarchicalTiff::Comparator | |
74 { | |
75 bool operator() (const HierarchicalTiff::Level& a, | |
76 const HierarchicalTiff::Level& b) const | |
77 { | |
78 return a.width_ > b.width_; | |
79 } | |
80 }; | |
81 | |
82 | |
83 void HierarchicalTiff::Finalize() | |
84 { | |
85 if (tiff_) | |
86 { | |
87 TIFFClose(tiff_); | |
88 tiff_ = NULL; | |
89 } | |
90 } | |
91 | |
92 | |
93 void HierarchicalTiff::CheckLevel(unsigned int level) const | |
94 { | |
95 if (level >= levels_.size()) | |
96 { | |
97 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange); | |
98 } | |
99 } | |
100 | |
101 | |
102 bool HierarchicalTiff::GetCurrentCompression(ImageCompression& compression) | |
103 { | |
104 uint16_t c; | |
105 if (!TIFFGetField(tiff_, TIFFTAG_COMPRESSION, &c)) | |
106 { | |
107 return false; | |
108 } | |
109 | |
110 switch (c) | |
111 { | |
112 case COMPRESSION_NONE: | |
113 compression = ImageCompression_None; | |
114 return true; | |
115 | |
116 case COMPRESSION_JPEG: | |
117 compression = ImageCompression_Jpeg; | |
118 return true; | |
119 | |
120 default: | |
121 return false; | |
122 } | |
123 } | |
124 | |
125 | |
126 bool HierarchicalTiff::GetCurrentPixelFormat(Orthanc::PixelFormat& pixelFormat, | |
166
f0dac1e8f736
access to photometric interpretation of source pyramids
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
157
diff
changeset
|
127 Orthanc::PhotometricInterpretation& photometric, |
0 | 128 ImageCompression compression) |
129 { | |
130 // http://www.awaresystems.be/imaging/tiff/tifftags/baseline.html | |
131 | |
166
f0dac1e8f736
access to photometric interpretation of source pyramids
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
157
diff
changeset
|
132 uint16_t channels, photometricTiff, bpp, planar; |
0 | 133 if (!TIFFGetField(tiff_, TIFFTAG_SAMPLESPERPIXEL, &channels) || |
134 channels == 0 || | |
166
f0dac1e8f736
access to photometric interpretation of source pyramids
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
157
diff
changeset
|
135 !TIFFGetField(tiff_, TIFFTAG_PHOTOMETRIC, &photometricTiff) || |
0 | 136 !TIFFGetField(tiff_, TIFFTAG_BITSPERSAMPLE, &bpp) || |
137 !TIFFGetField(tiff_, TIFFTAG_PLANARCONFIG, &planar)) | |
138 { | |
139 return false; | |
140 } | |
141 | |
142 if (compression == ImageCompression_Jpeg && | |
143 channels == 3 && // This is a color image | |
144 bpp == 8 && | |
145 planar == PLANARCONFIG_CONTIG) // This is interleaved RGB | |
146 { | |
147 pixelFormat = Orthanc::PixelFormat_RGB24; | |
166
f0dac1e8f736
access to photometric interpretation of source pyramids
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
157
diff
changeset
|
148 |
f0dac1e8f736
access to photometric interpretation of source pyramids
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
157
diff
changeset
|
149 switch (photometricTiff) |
f0dac1e8f736
access to photometric interpretation of source pyramids
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
157
diff
changeset
|
150 { |
f0dac1e8f736
access to photometric interpretation of source pyramids
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
157
diff
changeset
|
151 case PHOTOMETRIC_YCBCR: |
f0dac1e8f736
access to photometric interpretation of source pyramids
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
157
diff
changeset
|
152 photometric = Orthanc::PhotometricInterpretation_YBRFull422; |
f0dac1e8f736
access to photometric interpretation of source pyramids
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
157
diff
changeset
|
153 return true; |
f0dac1e8f736
access to photometric interpretation of source pyramids
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
157
diff
changeset
|
154 |
f0dac1e8f736
access to photometric interpretation of source pyramids
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
157
diff
changeset
|
155 case PHOTOMETRIC_RGB: |
f0dac1e8f736
access to photometric interpretation of source pyramids
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
157
diff
changeset
|
156 photometric = Orthanc::PhotometricInterpretation_RGB; |
f0dac1e8f736
access to photometric interpretation of source pyramids
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
157
diff
changeset
|
157 return true; |
f0dac1e8f736
access to photometric interpretation of source pyramids
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
157
diff
changeset
|
158 |
f0dac1e8f736
access to photometric interpretation of source pyramids
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
157
diff
changeset
|
159 default: |
f0dac1e8f736
access to photometric interpretation of source pyramids
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
157
diff
changeset
|
160 LOG(ERROR) << "Unknown photometric interpretation in TIFF: " << photometricTiff; |
f0dac1e8f736
access to photometric interpretation of source pyramids
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
157
diff
changeset
|
161 return false; |
f0dac1e8f736
access to photometric interpretation of source pyramids
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
157
diff
changeset
|
162 } |
0 | 163 } |
172
11413cc2b9d6
importing grayscale tiff
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
166
diff
changeset
|
164 else if (compression == ImageCompression_Jpeg && |
11413cc2b9d6
importing grayscale tiff
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
166
diff
changeset
|
165 channels == 1 && // This is a grayscale image |
11413cc2b9d6
importing grayscale tiff
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
166
diff
changeset
|
166 bpp == 8) |
11413cc2b9d6
importing grayscale tiff
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
166
diff
changeset
|
167 { |
11413cc2b9d6
importing grayscale tiff
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
166
diff
changeset
|
168 pixelFormat = Orthanc::PixelFormat_Grayscale8; |
11413cc2b9d6
importing grayscale tiff
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
166
diff
changeset
|
169 photometric = Orthanc::PhotometricInterpretation_Monochrome2; |
11413cc2b9d6
importing grayscale tiff
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
166
diff
changeset
|
170 } |
0 | 171 else |
172 { | |
173 return false; | |
174 } | |
175 | |
176 return true; | |
177 } | |
178 | |
179 | |
180 bool HierarchicalTiff::Initialize() | |
181 { | |
182 bool first = true; | |
183 tdir_t pos = 0; | |
184 | |
185 do | |
186 { | |
187 uint32_t w, h, tw, th; | |
188 ImageCompression compression; | |
189 Orthanc::PixelFormat pixelFormat; | |
166
f0dac1e8f736
access to photometric interpretation of source pyramids
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
157
diff
changeset
|
190 Orthanc::PhotometricInterpretation photometric; |
0 | 191 |
192 if (TIFFSetDirectory(tiff_, pos) && | |
193 TIFFGetField(tiff_, TIFFTAG_IMAGEWIDTH, &w) && | |
194 TIFFGetField(tiff_, TIFFTAG_IMAGELENGTH, &h) && | |
195 TIFFGetField(tiff_, TIFFTAG_TILEWIDTH, &tw) && | |
196 TIFFGetField(tiff_, TIFFTAG_TILELENGTH, &th) && | |
197 w > 0 && | |
198 h > 0 && | |
199 tw > 0 && | |
200 th > 0 && | |
201 GetCurrentCompression(compression) && | |
166
f0dac1e8f736
access to photometric interpretation of source pyramids
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
157
diff
changeset
|
202 GetCurrentPixelFormat(pixelFormat, photometric, compression)) |
0 | 203 { |
204 if (first) | |
205 { | |
206 tileWidth_ = tw; | |
207 tileHeight_ = th; | |
208 compression_ = compression; | |
209 pixelFormat_ = pixelFormat; | |
166
f0dac1e8f736
access to photometric interpretation of source pyramids
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
157
diff
changeset
|
210 photometric_ = photometric; |
0 | 211 first = false; |
212 } | |
213 else if (tw != tileWidth_ || | |
214 th != tileHeight_ || | |
215 compression_ != compression || | |
166
f0dac1e8f736
access to photometric interpretation of source pyramids
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
157
diff
changeset
|
216 pixelFormat_ != pixelFormat || |
f0dac1e8f736
access to photometric interpretation of source pyramids
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
157
diff
changeset
|
217 photometric_ != photometric) |
0 | 218 { |
219 LOG(ERROR) << "The tile size or compression of the TIFF file varies along levels, this is not supported"; | |
220 return false; | |
221 } | |
222 | |
223 levels_.push_back(Level(tiff_, pos, w, h)); | |
224 } | |
225 | |
226 pos++; | |
227 } | |
228 while (TIFFReadDirectory(tiff_)); | |
229 | |
230 if (levels_.size() == 0) | |
231 { | |
232 LOG(ERROR) << "This is not a tiled TIFF image"; | |
233 return false; | |
234 } | |
235 | |
236 std::sort(levels_.begin(), levels_.end(), Comparator()); | |
237 return true; | |
238 } | |
239 | |
240 | |
241 HierarchicalTiff::HierarchicalTiff(const std::string& path) : | |
242 tileWidth_(0), | |
243 tileHeight_(0) | |
244 { | |
245 tiff_ = TIFFOpen(path.c_str(), "r"); | |
246 if (tiff_ == NULL) | |
247 { | |
248 LOG(ERROR) << "libtiff cannot open: " << path; | |
249 throw Orthanc::OrthancException(Orthanc::ErrorCode_InexistentFile); | |
250 } | |
251 | |
252 if (!Initialize()) | |
253 { | |
254 Finalize(); | |
255 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat); | |
256 } | |
257 } | |
258 | |
259 | |
260 unsigned int HierarchicalTiff::GetLevelWidth(unsigned int level) const | |
261 { | |
262 CheckLevel(level); | |
263 return levels_[level].width_; | |
264 } | |
265 | |
266 | |
267 unsigned int HierarchicalTiff::GetLevelHeight(unsigned int level) const | |
268 { | |
269 CheckLevel(level); | |
270 return levels_[level].height_; | |
271 } | |
272 | |
273 | |
274 bool HierarchicalTiff::ReadRawTile(std::string& tile, | |
57
91fc9583b2de
big refactoring to support sparse tiling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
16
diff
changeset
|
275 ImageCompression& compression, |
0 | 276 unsigned int level, |
277 unsigned int tileX, | |
278 unsigned int tileY) | |
279 { | |
280 boost::mutex::scoped_lock lock(mutex_); | |
281 | |
282 CheckLevel(level); | |
283 | |
57
91fc9583b2de
big refactoring to support sparse tiling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
16
diff
changeset
|
284 compression = compression_; |
91fc9583b2de
big refactoring to support sparse tiling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
16
diff
changeset
|
285 |
0 | 286 // Make the TIFF context point to the level of interest |
287 if (!TIFFSetDirectory(tiff_, levels_[level].directory_)) | |
288 { | |
289 throw Orthanc::OrthancException(Orthanc::ErrorCode_CorruptedFile); | |
290 } | |
291 | |
292 // Get the index of the tile | |
293 ttile_t index = TIFFComputeTile(tiff_, tileX * tileWidth_, tileY * tileHeight_, 0 /*z*/, 0 /*sample*/); | |
294 | |
295 // Read the raw tile | |
296 toff_t *sizes; | |
297 if (!TIFFGetField(tiff_, TIFFTAG_TILEBYTECOUNTS, &sizes)) | |
298 { | |
299 throw Orthanc::OrthancException(Orthanc::ErrorCode_CorruptedFile); | |
300 } | |
301 | |
302 std::string raw; | |
303 raw.resize(sizes[index]); | |
304 | |
305 tsize_t read = TIFFReadRawTile(tiff_, index, &raw[0], raw.size()); | |
306 if (read != static_cast<tsize_t>(sizes[index])) | |
307 { | |
308 throw Orthanc::OrthancException(Orthanc::ErrorCode_CorruptedFile); | |
309 } | |
310 | |
311 const std::string& headers = levels_[level].headers_; | |
312 | |
313 // Possibly prepend the raw tile with the shared JPEG headers | |
314 if (headers.empty() || | |
315 compression_ != ImageCompression_Jpeg) | |
316 { | |
317 tile.swap(raw); // Same as "tile.assign(raw)", but optimizes memory | |
318 } | |
319 else | |
320 { | |
321 assert(compression_ == ImageCompression_Jpeg); | |
322 | |
323 // Check that the raw JPEG tile starts with the SOI (start-of-image) tag == FF D8 | |
324 if (raw.size() < 2 || | |
325 static_cast<uint8_t>(raw[0]) != 0xff || | |
326 static_cast<uint8_t>(raw[1]) != 0xd8) | |
327 { | |
328 throw Orthanc::OrthancException(Orthanc::ErrorCode_CorruptedFile); | |
329 } | |
330 | |
218
c5a8b46c4cba
Fix colorspace of TIFF containing JPEG with RGB photometric interpretation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
214
diff
changeset
|
331 if (photometric_ == Orthanc::PhotometricInterpretation_RGB && |
c5a8b46c4cba
Fix colorspace of TIFF containing JPEG with RGB photometric interpretation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
214
diff
changeset
|
332 pixelFormat_ == Orthanc::PixelFormat_RGB24) |
c5a8b46c4cba
Fix colorspace of TIFF containing JPEG with RGB photometric interpretation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
214
diff
changeset
|
333 { |
c5a8b46c4cba
Fix colorspace of TIFF containing JPEG with RGB photometric interpretation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
214
diff
changeset
|
334 /** |
c5a8b46c4cba
Fix colorspace of TIFF containing JPEG with RGB photometric interpretation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
214
diff
changeset
|
335 * Insert an Adobe APP14 marker with the "transform" flag set |
c5a8b46c4cba
Fix colorspace of TIFF containing JPEG with RGB photometric interpretation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
214
diff
changeset
|
336 * to value 0, which indicates to the JPEG decoder that |
c5a8b46c4cba
Fix colorspace of TIFF containing JPEG with RGB photometric interpretation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
214
diff
changeset
|
337 * "3-channel images are assumed to be RGB". Section 18 of |
c5a8b46c4cba
Fix colorspace of TIFF containing JPEG with RGB photometric interpretation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
214
diff
changeset
|
338 * "Supporting the DCT Filters in PostScript Level 2 - |
c5a8b46c4cba
Fix colorspace of TIFF containing JPEG with RGB photometric interpretation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
214
diff
changeset
|
339 * Technical Note #5116": |
c5a8b46c4cba
Fix colorspace of TIFF containing JPEG with RGB photometric interpretation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
214
diff
changeset
|
340 * https://stackoverflow.com/a/9658206/881731 |
c5a8b46c4cba
Fix colorspace of TIFF containing JPEG with RGB photometric interpretation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
214
diff
changeset
|
341 * https://docs.oracle.com/javase/6/docs/api/javax/imageio/metadata/doc-files/jpeg_metadata.html |
c5a8b46c4cba
Fix colorspace of TIFF containing JPEG with RGB photometric interpretation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
214
diff
changeset
|
342 * https://www.pdfa.org/wp-content/uploads/2020/07/5116.DCT_Filter.pdf |
c5a8b46c4cba
Fix colorspace of TIFF containing JPEG with RGB photometric interpretation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
214
diff
changeset
|
343 **/ |
c5a8b46c4cba
Fix colorspace of TIFF containing JPEG with RGB photometric interpretation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
214
diff
changeset
|
344 static const uint8_t APP14[] = { |
c5a8b46c4cba
Fix colorspace of TIFF containing JPEG with RGB photometric interpretation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
214
diff
changeset
|
345 0xff, 0xee, /* JPEG Marker for Adobe segment: http://www.ozhiker.com/electronics/pjmt/jpeg_info/app_segments.html */ |
c5a8b46c4cba
Fix colorspace of TIFF containing JPEG with RGB photometric interpretation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
214
diff
changeset
|
346 0x00, 0x0e, /* Length (without the JPEG marker) == 0x0e == 14 bytes */ |
c5a8b46c4cba
Fix colorspace of TIFF containing JPEG with RGB photometric interpretation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
214
diff
changeset
|
347 0x41, 0x64, 0x6f, 0x62, 0x65, /* "Adobe" string in ASCII */ |
c5a8b46c4cba
Fix colorspace of TIFF containing JPEG with RGB photometric interpretation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
214
diff
changeset
|
348 0x00, 0x64, /* Version == Two-byte DCTEncode/DCTDecode version number == 0x64 */ |
c5a8b46c4cba
Fix colorspace of TIFF containing JPEG with RGB photometric interpretation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
214
diff
changeset
|
349 0x80, 0x00, /* Two-byte "flags0" 0x8000 bit: Encoder used Blend=1 downsampling */ |
c5a8b46c4cba
Fix colorspace of TIFF containing JPEG with RGB photometric interpretation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
214
diff
changeset
|
350 0x00, 0x00, /* Two-byte "flags1": Set to zero */ |
c5a8b46c4cba
Fix colorspace of TIFF containing JPEG with RGB photometric interpretation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
214
diff
changeset
|
351 0x00 /* One-byte color transform code == 0 <== This is the important one */ |
c5a8b46c4cba
Fix colorspace of TIFF containing JPEG with RGB photometric interpretation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
214
diff
changeset
|
352 }; |
c5a8b46c4cba
Fix colorspace of TIFF containing JPEG with RGB photometric interpretation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
214
diff
changeset
|
353 assert(sizeof(APP14) == 16); |
c5a8b46c4cba
Fix colorspace of TIFF containing JPEG with RGB photometric interpretation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
214
diff
changeset
|
354 |
c5a8b46c4cba
Fix colorspace of TIFF containing JPEG with RGB photometric interpretation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
214
diff
changeset
|
355 tile.resize(headers.size() + sizeof(APP14) + raw.size() - 2); |
c5a8b46c4cba
Fix colorspace of TIFF containing JPEG with RGB photometric interpretation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
214
diff
changeset
|
356 memcpy(&tile[0], &headers[0], headers.size()); |
c5a8b46c4cba
Fix colorspace of TIFF containing JPEG with RGB photometric interpretation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
214
diff
changeset
|
357 memcpy(&tile[0] + headers.size(), APP14, sizeof(APP14)); |
c5a8b46c4cba
Fix colorspace of TIFF containing JPEG with RGB photometric interpretation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
214
diff
changeset
|
358 memcpy(&tile[0] + headers.size() + sizeof(APP14), &raw[2], raw.size() - 2); |
c5a8b46c4cba
Fix colorspace of TIFF containing JPEG with RGB photometric interpretation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
214
diff
changeset
|
359 } |
c5a8b46c4cba
Fix colorspace of TIFF containing JPEG with RGB photometric interpretation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
214
diff
changeset
|
360 else |
c5a8b46c4cba
Fix colorspace of TIFF containing JPEG with RGB photometric interpretation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
214
diff
changeset
|
361 { |
c5a8b46c4cba
Fix colorspace of TIFF containing JPEG with RGB photometric interpretation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
214
diff
changeset
|
362 tile.resize(headers.size() + raw.size() - 2); |
c5a8b46c4cba
Fix colorspace of TIFF containing JPEG with RGB photometric interpretation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
214
diff
changeset
|
363 memcpy(&tile[0], &headers[0], headers.size()); |
c5a8b46c4cba
Fix colorspace of TIFF containing JPEG with RGB photometric interpretation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
214
diff
changeset
|
364 memcpy(&tile[0] + headers.size(), &raw[2], raw.size() - 2); |
c5a8b46c4cba
Fix colorspace of TIFF containing JPEG with RGB photometric interpretation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
214
diff
changeset
|
365 } |
0 | 366 } |
218
c5a8b46c4cba
Fix colorspace of TIFF containing JPEG with RGB photometric interpretation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
214
diff
changeset
|
367 |
0 | 368 return true; |
369 } | |
370 } |