Mercurial > hg > orthanc

comparison Core/DicomParsing/FromDcmtkBridge_TransferSyntaxes.impl.h @ 3769:eb044cc49d51

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
compatibility with DCMTK 3.6.0
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 17 Mar 2020 16:36:14 +0100
parents 33c19a6643e1
children
comparison
equal deleted inserted replaced
3768:6110a4995ace 3769:eb044cc49d51
54 case DicomTransferSyntax_BigEndianExplicit: 54 case DicomTransferSyntax_BigEndianExplicit:
55 target = EXS_BigEndianExplicit; 55 target = EXS_BigEndianExplicit;
56 return true; 56 return true;
57 57
58 case DicomTransferSyntax_JPEGProcess1: 58 case DicomTransferSyntax_JPEGProcess1:
59 # if DCMTK_VERSION_NUMBER <= 360
60 target = EXS_JPEGProcess1TransferSyntax;
61 # else
59 target = EXS_JPEGProcess1; 62 target = EXS_JPEGProcess1;
63 # endif
60 return true; 64 return true;
61 65
62 case DicomTransferSyntax_JPEGProcess2_4: 66 case DicomTransferSyntax_JPEGProcess2_4:
67 # if DCMTK_VERSION_NUMBER <= 360
68 target = EXS_JPEGProcess2_4TransferSyntax;
69 # else
63 target = EXS_JPEGProcess2_4; 70 target = EXS_JPEGProcess2_4;
71 # endif
64 return true; 72 return true;
65 73
66 case DicomTransferSyntax_JPEGProcess3_5: 74 case DicomTransferSyntax_JPEGProcess3_5:
75 # if DCMTK_VERSION_NUMBER <= 360
76 target = EXS_JPEGProcess3_5TransferSyntax;
77 # else
67 target = EXS_JPEGProcess3_5; 78 target = EXS_JPEGProcess3_5;
79 # endif
68 return true; 80 return true;
69 81
70 case DicomTransferSyntax_JPEGProcess6_8: 82 case DicomTransferSyntax_JPEGProcess6_8:
83 # if DCMTK_VERSION_NUMBER <= 360
84 target = EXS_JPEGProcess6_8TransferSyntax;
85 # else
71 target = EXS_JPEGProcess6_8; 86 target = EXS_JPEGProcess6_8;
87 # endif
72 return true; 88 return true;
73 89
74 case DicomTransferSyntax_JPEGProcess7_9: 90 case DicomTransferSyntax_JPEGProcess7_9:
91 # if DCMTK_VERSION_NUMBER <= 360
92 target = EXS_JPEGProcess7_9TransferSyntax;
93 # else
75 target = EXS_JPEGProcess7_9; 94 target = EXS_JPEGProcess7_9;
95 # endif
76 return true; 96 return true;
77 97
78 case DicomTransferSyntax_JPEGProcess10_12: 98 case DicomTransferSyntax_JPEGProcess10_12:
99 # if DCMTK_VERSION_NUMBER <= 360
100 target = EXS_JPEGProcess10_12TransferSyntax;
101 # else
79 target = EXS_JPEGProcess10_12; 102 target = EXS_JPEGProcess10_12;
103 # endif
80 return true; 104 return true;
81 105
82 case DicomTransferSyntax_JPEGProcess11_13: 106 case DicomTransferSyntax_JPEGProcess11_13:
107 # if DCMTK_VERSION_NUMBER <= 360
108 target = EXS_JPEGProcess11_13TransferSyntax;
109 # else
83 target = EXS_JPEGProcess11_13; 110 target = EXS_JPEGProcess11_13;
111 # endif
84 return true; 112 return true;
85 113
86 case DicomTransferSyntax_JPEGProcess14: 114 case DicomTransferSyntax_JPEGProcess14:
115 # if DCMTK_VERSION_NUMBER <= 360
116 target = EXS_JPEGProcess14TransferSyntax;
117 # else
87 target = EXS_JPEGProcess14; 118 target = EXS_JPEGProcess14;
119 # endif
88 return true; 120 return true;
89 121
90 case DicomTransferSyntax_JPEGProcess15: 122 case DicomTransferSyntax_JPEGProcess15:
123 # if DCMTK_VERSION_NUMBER <= 360
124 target = EXS_JPEGProcess15TransferSyntax;
125 # else
91 target = EXS_JPEGProcess15; 126 target = EXS_JPEGProcess15;
127 # endif
92 return true; 128 return true;
93 129
94 case DicomTransferSyntax_JPEGProcess16_18: 130 case DicomTransferSyntax_JPEGProcess16_18:
131 # if DCMTK_VERSION_NUMBER <= 360
132 target = EXS_JPEGProcess16_18TransferSyntax;
133 # else
95 target = EXS_JPEGProcess16_18; 134 target = EXS_JPEGProcess16_18;
135 # endif
96 return true; 136 return true;
97 137
98 case DicomTransferSyntax_JPEGProcess17_19: 138 case DicomTransferSyntax_JPEGProcess17_19:
139 # if DCMTK_VERSION_NUMBER <= 360
140 target = EXS_JPEGProcess17_19TransferSyntax;
141 # else
99 target = EXS_JPEGProcess17_19; 142 target = EXS_JPEGProcess17_19;
143 # endif
100 return true; 144 return true;
101 145
102 case DicomTransferSyntax_JPEGProcess20_22: 146 case DicomTransferSyntax_JPEGProcess20_22:
147 # if DCMTK_VERSION_NUMBER <= 360
148 target = EXS_JPEGProcess20_22TransferSyntax;
149 # else
103 target = EXS_JPEGProcess20_22; 150 target = EXS_JPEGProcess20_22;
151 # endif
104 return true; 152 return true;
105 153
106 case DicomTransferSyntax_JPEGProcess21_23: 154 case DicomTransferSyntax_JPEGProcess21_23:
155 # if DCMTK_VERSION_NUMBER <= 360
156 target = EXS_JPEGProcess21_23TransferSyntax;
157 # else
107 target = EXS_JPEGProcess21_23; 158 target = EXS_JPEGProcess21_23;
159 # endif
108 return true; 160 return true;
109 161
110 case DicomTransferSyntax_JPEGProcess24_26: 162 case DicomTransferSyntax_JPEGProcess24_26:
163 # if DCMTK_VERSION_NUMBER <= 360
164 target = EXS_JPEGProcess24_26TransferSyntax;
165 # else
111 target = EXS_JPEGProcess24_26; 166 target = EXS_JPEGProcess24_26;
167 # endif
112 return true; 168 return true;
113 169
114 case DicomTransferSyntax_JPEGProcess25_27: 170 case DicomTransferSyntax_JPEGProcess25_27:
171 # if DCMTK_VERSION_NUMBER <= 360
172 target = EXS_JPEGProcess25_27TransferSyntax;
173 # else
115 target = EXS_JPEGProcess25_27; 174 target = EXS_JPEGProcess25_27;
175 # endif
116 return true; 176 return true;
117 177
118 case DicomTransferSyntax_JPEGProcess28: 178 case DicomTransferSyntax_JPEGProcess28:
179 # if DCMTK_VERSION_NUMBER <= 360
180 target = EXS_JPEGProcess28TransferSyntax;
181 # else
119 target = EXS_JPEGProcess28; 182 target = EXS_JPEGProcess28;
183 # endif
120 return true; 184 return true;
121 185
122 case DicomTransferSyntax_JPEGProcess29: 186 case DicomTransferSyntax_JPEGProcess29:
187 # if DCMTK_VERSION_NUMBER <= 360
188 target = EXS_JPEGProcess29TransferSyntax;
189 # else
123 target = EXS_JPEGProcess29; 190 target = EXS_JPEGProcess29;
191 # endif
124 return true; 192 return true;
125 193
126 case DicomTransferSyntax_JPEGProcess14SV1: 194 case DicomTransferSyntax_JPEGProcess14SV1:
195 # if DCMTK_VERSION_NUMBER <= 360
196 target = EXS_JPEGProcess14SV1TransferSyntax;
197 # else
127 target = EXS_JPEGProcess14SV1; 198 target = EXS_JPEGProcess14SV1;
199 # endif
128 return true; 200 return true;
129 201
130 case DicomTransferSyntax_JPEGLSLossless: 202 case DicomTransferSyntax_JPEGLSLossless:
131 target = EXS_JPEGLSLossless; 203 target = EXS_JPEGLSLossless;
132 return true; 204 return true;
165 237
166 case DicomTransferSyntax_MPEG2MainProfileAtHighLevel: 238 case DicomTransferSyntax_MPEG2MainProfileAtHighLevel:
167 target = EXS_MPEG2MainProfileAtHighLevel; 239 target = EXS_MPEG2MainProfileAtHighLevel;
168 return true; 240 return true;
169 241
242 #if DCMTK_VERSION_NUMBER >= 361
170 case DicomTransferSyntax_MPEG4HighProfileLevel4_1: 243 case DicomTransferSyntax_MPEG4HighProfileLevel4_1:
171 target = EXS_MPEG4HighProfileLevel4_1; 244 target = EXS_MPEG4HighProfileLevel4_1;
172 return true; 245 return true;
173 246 #endif
247
248 #if DCMTK_VERSION_NUMBER >= 361
174 case DicomTransferSyntax_MPEG4BDcompatibleHighProfileLevel4_1: 249 case DicomTransferSyntax_MPEG4BDcompatibleHighProfileLevel4_1:
175 target = EXS_MPEG4BDcompatibleHighProfileLevel4_1; 250 target = EXS_MPEG4BDcompatibleHighProfileLevel4_1;
176 return true; 251 return true;
177 252 #endif
253
254 #if DCMTK_VERSION_NUMBER >= 361
178 case DicomTransferSyntax_MPEG4HighProfileLevel4_2_For2DVideo: 255 case DicomTransferSyntax_MPEG4HighProfileLevel4_2_For2DVideo:
179 target = EXS_MPEG4HighProfileLevel4_2_For2DVideo; 256 target = EXS_MPEG4HighProfileLevel4_2_For2DVideo;
180 return true; 257 return true;
181 258 #endif
259
260 #if DCMTK_VERSION_NUMBER >= 361
182 case DicomTransferSyntax_MPEG4HighProfileLevel4_2_For3DVideo: 261 case DicomTransferSyntax_MPEG4HighProfileLevel4_2_For3DVideo:
183 target = EXS_MPEG4HighProfileLevel4_2_For3DVideo; 262 target = EXS_MPEG4HighProfileLevel4_2_For3DVideo;
184 return true; 263 return true;
185 264 #endif
265
266 #if DCMTK_VERSION_NUMBER >= 361
186 case DicomTransferSyntax_MPEG4StereoHighProfileLevel4_2: 267 case DicomTransferSyntax_MPEG4StereoHighProfileLevel4_2:
187 target = EXS_MPEG4StereoHighProfileLevel4_2; 268 target = EXS_MPEG4StereoHighProfileLevel4_2;
188 return true; 269 return true;
270 #endif
189 271
190 #if DCMTK_VERSION_NUMBER >= 362 272 #if DCMTK_VERSION_NUMBER >= 362
191 case DicomTransferSyntax_HEVCMainProfileLevel5_1: 273 case DicomTransferSyntax_HEVCMainProfileLevel5_1:
192 target = EXS_HEVCMainProfileLevel5_1; 274 target = EXS_HEVCMainProfileLevel5_1;
193 return true; 275 return true;
228 310
229 case EXS_BigEndianExplicit: 311 case EXS_BigEndianExplicit:
230 target = DicomTransferSyntax_BigEndianExplicit; 312 target = DicomTransferSyntax_BigEndianExplicit;
231 return true; 313 return true;
232 314
315 # if DCMTK_VERSION_NUMBER <= 360
316 case EXS_JPEGProcess1TransferSyntax:
317 # else
233 case EXS_JPEGProcess1: 318 case EXS_JPEGProcess1:
319 # endif
234 target = DicomTransferSyntax_JPEGProcess1; 320 target = DicomTransferSyntax_JPEGProcess1;
235 return true; 321 return true;
236 322
323 # if DCMTK_VERSION_NUMBER <= 360
324 case EXS_JPEGProcess2_4TransferSyntax:
325 # else
237 case EXS_JPEGProcess2_4: 326 case EXS_JPEGProcess2_4:
327 # endif
238 target = DicomTransferSyntax_JPEGProcess2_4; 328 target = DicomTransferSyntax_JPEGProcess2_4;
239 return true; 329 return true;
240 330
331 # if DCMTK_VERSION_NUMBER <= 360
332 case EXS_JPEGProcess3_5TransferSyntax:
333 # else
241 case EXS_JPEGProcess3_5: 334 case EXS_JPEGProcess3_5:
335 # endif
242 target = DicomTransferSyntax_JPEGProcess3_5; 336 target = DicomTransferSyntax_JPEGProcess3_5;
243 return true; 337 return true;
244 338
339 # if DCMTK_VERSION_NUMBER <= 360
340 case EXS_JPEGProcess6_8TransferSyntax:
341 # else
245 case EXS_JPEGProcess6_8: 342 case EXS_JPEGProcess6_8:
343 # endif
246 target = DicomTransferSyntax_JPEGProcess6_8; 344 target = DicomTransferSyntax_JPEGProcess6_8;
247 return true; 345 return true;
248 346
347 # if DCMTK_VERSION_NUMBER <= 360
348 case EXS_JPEGProcess7_9TransferSyntax:
349 # else
249 case EXS_JPEGProcess7_9: 350 case EXS_JPEGProcess7_9:
351 # endif
250 target = DicomTransferSyntax_JPEGProcess7_9; 352 target = DicomTransferSyntax_JPEGProcess7_9;
251 return true; 353 return true;
252 354
355 # if DCMTK_VERSION_NUMBER <= 360
356 case EXS_JPEGProcess10_12TransferSyntax:
357 # else
253 case EXS_JPEGProcess10_12: 358 case EXS_JPEGProcess10_12:
359 # endif
254 target = DicomTransferSyntax_JPEGProcess10_12; 360 target = DicomTransferSyntax_JPEGProcess10_12;
255 return true; 361 return true;
256 362
363 # if DCMTK_VERSION_NUMBER <= 360
364 case EXS_JPEGProcess11_13TransferSyntax:
365 # else
257 case EXS_JPEGProcess11_13: 366 case EXS_JPEGProcess11_13:
367 # endif
258 target = DicomTransferSyntax_JPEGProcess11_13; 368 target = DicomTransferSyntax_JPEGProcess11_13;
259 return true; 369 return true;
260 370
371 # if DCMTK_VERSION_NUMBER <= 360
372 case EXS_JPEGProcess14TransferSyntax:
373 # else
261 case EXS_JPEGProcess14: 374 case EXS_JPEGProcess14:
375 # endif
262 target = DicomTransferSyntax_JPEGProcess14; 376 target = DicomTransferSyntax_JPEGProcess14;
263 return true; 377 return true;
264 378
379 # if DCMTK_VERSION_NUMBER <= 360
380 case EXS_JPEGProcess15TransferSyntax:
381 # else
265 case EXS_JPEGProcess15: 382 case EXS_JPEGProcess15:
383 # endif
266 target = DicomTransferSyntax_JPEGProcess15; 384 target = DicomTransferSyntax_JPEGProcess15;
267 return true; 385 return true;
268 386
387 # if DCMTK_VERSION_NUMBER <= 360
388 case EXS_JPEGProcess16_18TransferSyntax:
389 # else
269 case EXS_JPEGProcess16_18: 390 case EXS_JPEGProcess16_18:
391 # endif
270 target = DicomTransferSyntax_JPEGProcess16_18; 392 target = DicomTransferSyntax_JPEGProcess16_18;
271 return true; 393 return true;
272 394
395 # if DCMTK_VERSION_NUMBER <= 360
396 case EXS_JPEGProcess17_19TransferSyntax:
397 # else
273 case EXS_JPEGProcess17_19: 398 case EXS_JPEGProcess17_19:
399 # endif
274 target = DicomTransferSyntax_JPEGProcess17_19; 400 target = DicomTransferSyntax_JPEGProcess17_19;
275 return true; 401 return true;
276 402
403 # if DCMTK_VERSION_NUMBER <= 360
404 case EXS_JPEGProcess20_22TransferSyntax:
405 # else
277 case EXS_JPEGProcess20_22: 406 case EXS_JPEGProcess20_22:
407 # endif
278 target = DicomTransferSyntax_JPEGProcess20_22; 408 target = DicomTransferSyntax_JPEGProcess20_22;
279 return true; 409 return true;
280 410
411 # if DCMTK_VERSION_NUMBER <= 360
412 case EXS_JPEGProcess21_23TransferSyntax:
413 # else
281 case EXS_JPEGProcess21_23: 414 case EXS_JPEGProcess21_23:
415 # endif
282 target = DicomTransferSyntax_JPEGProcess21_23; 416 target = DicomTransferSyntax_JPEGProcess21_23;
283 return true; 417 return true;
284 418
419 # if DCMTK_VERSION_NUMBER <= 360
420 case EXS_JPEGProcess24_26TransferSyntax:
421 # else
285 case EXS_JPEGProcess24_26: 422 case EXS_JPEGProcess24_26:
423 # endif
286 target = DicomTransferSyntax_JPEGProcess24_26; 424 target = DicomTransferSyntax_JPEGProcess24_26;
287 return true; 425 return true;
288 426
427 # if DCMTK_VERSION_NUMBER <= 360
428 case EXS_JPEGProcess25_27TransferSyntax:
429 # else
289 case EXS_JPEGProcess25_27: 430 case EXS_JPEGProcess25_27:
431 # endif
290 target = DicomTransferSyntax_JPEGProcess25_27; 432 target = DicomTransferSyntax_JPEGProcess25_27;
291 return true; 433 return true;
292 434
435 # if DCMTK_VERSION_NUMBER <= 360
436 case EXS_JPEGProcess28TransferSyntax:
437 # else
293 case EXS_JPEGProcess28: 438 case EXS_JPEGProcess28:
439 # endif
294 target = DicomTransferSyntax_JPEGProcess28; 440 target = DicomTransferSyntax_JPEGProcess28;
295 return true; 441 return true;
296 442
443 # if DCMTK_VERSION_NUMBER <= 360
444 case EXS_JPEGProcess29TransferSyntax:
445 # else
297 case EXS_JPEGProcess29: 446 case EXS_JPEGProcess29:
447 # endif
298 target = DicomTransferSyntax_JPEGProcess29; 448 target = DicomTransferSyntax_JPEGProcess29;
299 return true; 449 return true;
300 450
451 # if DCMTK_VERSION_NUMBER <= 360
452 case EXS_JPEGProcess14SV1TransferSyntax:
453 # else
301 case EXS_JPEGProcess14SV1: 454 case EXS_JPEGProcess14SV1:
455 # endif
302 target = DicomTransferSyntax_JPEGProcess14SV1; 456 target = DicomTransferSyntax_JPEGProcess14SV1;
303 return true; 457 return true;
304 458
305 case EXS_JPEGLSLossless: 459 case EXS_JPEGLSLossless:
306 target = DicomTransferSyntax_JPEGLSLossless; 460 target = DicomTransferSyntax_JPEGLSLossless;
340 494
341 case EXS_MPEG2MainProfileAtHighLevel: 495 case EXS_MPEG2MainProfileAtHighLevel:
342 target = DicomTransferSyntax_MPEG2MainProfileAtHighLevel; 496 target = DicomTransferSyntax_MPEG2MainProfileAtHighLevel;
343 return true; 497 return true;
344 498
499 #if DCMTK_VERSION_NUMBER >= 361
345 case EXS_MPEG4HighProfileLevel4_1: 500 case EXS_MPEG4HighProfileLevel4_1:
346 target = DicomTransferSyntax_MPEG4HighProfileLevel4_1; 501 target = DicomTransferSyntax_MPEG4HighProfileLevel4_1;
347 return true; 502 return true;
348 503 #endif
504
505 #if DCMTK_VERSION_NUMBER >= 361
349 case EXS_MPEG4BDcompatibleHighProfileLevel4_1: 506 case EXS_MPEG4BDcompatibleHighProfileLevel4_1:
350 target = DicomTransferSyntax_MPEG4BDcompatibleHighProfileLevel4_1; 507 target = DicomTransferSyntax_MPEG4BDcompatibleHighProfileLevel4_1;
351 return true; 508 return true;
352 509 #endif
510
511 #if DCMTK_VERSION_NUMBER >= 361
353 case EXS_MPEG4HighProfileLevel4_2_For2DVideo: 512 case EXS_MPEG4HighProfileLevel4_2_For2DVideo:
354 target = DicomTransferSyntax_MPEG4HighProfileLevel4_2_For2DVideo; 513 target = DicomTransferSyntax_MPEG4HighProfileLevel4_2_For2DVideo;
355 return true; 514 return true;
356 515 #endif
516
517 #if DCMTK_VERSION_NUMBER >= 361
357 case EXS_MPEG4HighProfileLevel4_2_For3DVideo: 518 case EXS_MPEG4HighProfileLevel4_2_For3DVideo:
358 target = DicomTransferSyntax_MPEG4HighProfileLevel4_2_For3DVideo; 519 target = DicomTransferSyntax_MPEG4HighProfileLevel4_2_For3DVideo;
359 return true; 520 return true;
360 521 #endif
522
523 #if DCMTK_VERSION_NUMBER >= 361
361 case EXS_MPEG4StereoHighProfileLevel4_2: 524 case EXS_MPEG4StereoHighProfileLevel4_2:
362 target = DicomTransferSyntax_MPEG4StereoHighProfileLevel4_2; 525 target = DicomTransferSyntax_MPEG4StereoHighProfileLevel4_2;
363 return true; 526 return true;
527 #endif
364 528
365 #if DCMTK_VERSION_NUMBER >= 362 529 #if DCMTK_VERSION_NUMBER >= 362
366 case EXS_HEVCMainProfileLevel5_1: 530 case EXS_HEVCMainProfileLevel5_1:
367 target = DicomTransferSyntax_HEVCMainProfileLevel5_1; 531 target = DicomTransferSyntax_HEVCMainProfileLevel5_1;
368 return true; 532 return true;