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