Mercurial > hg > orthanc
annotate Core/DicomParsing/MemoryBufferTranscoder.cpp @ 3929:7dc5e7e0045d transcoding
simplifying MemoryBufferTranscoder::Transcode() interface
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Thu, 14 May 2020 14:40:13 +0200 |
parents | 1f71c2f20e16 |
children | b99acc213937 |
rev | line source |
---|---|
3893 | 1 /** |
2 * Orthanc - A Lightweight, RESTful DICOM Store | |
3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics | |
4 * Department, University Hospital of Liege, Belgium | |
5 * Copyright (C) 2017-2020 Osimis S.A., Belgium | |
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. | |
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. | |
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 | |
34 #include "../PrecompiledHeaders.h" | |
35 #include "MemoryBufferTranscoder.h" | |
36 | |
37 #include "../OrthancException.h" | |
38 #include "FromDcmtkBridge.h" | |
39 | |
3929
7dc5e7e0045d
simplifying MemoryBufferTranscoder::Transcode() interface
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3910
diff
changeset
|
40 #if !defined(NDEBUG) // For debugging |
7dc5e7e0045d
simplifying MemoryBufferTranscoder::Transcode() interface
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3910
diff
changeset
|
41 # include "ParsedDicomFile.h" |
7dc5e7e0045d
simplifying MemoryBufferTranscoder::Transcode() interface
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3910
diff
changeset
|
42 #endif |
7dc5e7e0045d
simplifying MemoryBufferTranscoder::Transcode() interface
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3910
diff
changeset
|
43 |
3893 | 44 namespace Orthanc |
45 { | |
3894
8f7ad4989fec
transcoding to uncompressed transfer syntaxes over DICOM protocol is implemented
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3893
diff
changeset
|
46 MemoryBufferTranscoder::MemoryBufferTranscoder() |
8f7ad4989fec
transcoding to uncompressed transfer syntaxes over DICOM protocol is implemented
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3893
diff
changeset
|
47 { |
8f7ad4989fec
transcoding to uncompressed transfer syntaxes over DICOM protocol is implemented
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3893
diff
changeset
|
48 #if ORTHANC_ENABLE_DCMTK_TRANSCODING == 1 |
8f7ad4989fec
transcoding to uncompressed transfer syntaxes over DICOM protocol is implemented
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3893
diff
changeset
|
49 useDcmtk_ = true; |
8f7ad4989fec
transcoding to uncompressed transfer syntaxes over DICOM protocol is implemented
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3893
diff
changeset
|
50 #else |
8f7ad4989fec
transcoding to uncompressed transfer syntaxes over DICOM protocol is implemented
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3893
diff
changeset
|
51 useDcmtk_ = false; |
8f7ad4989fec
transcoding to uncompressed transfer syntaxes over DICOM protocol is implemented
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3893
diff
changeset
|
52 #endif |
8f7ad4989fec
transcoding to uncompressed transfer syntaxes over DICOM protocol is implemented
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3893
diff
changeset
|
53 } |
8f7ad4989fec
transcoding to uncompressed transfer syntaxes over DICOM protocol is implemented
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3893
diff
changeset
|
54 |
8f7ad4989fec
transcoding to uncompressed transfer syntaxes over DICOM protocol is implemented
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3893
diff
changeset
|
55 |
8f7ad4989fec
transcoding to uncompressed transfer syntaxes over DICOM protocol is implemented
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3893
diff
changeset
|
56 void MemoryBufferTranscoder::SetDcmtkUsed(bool used) |
3893 | 57 { |
58 #if ORTHANC_ENABLE_DCMTK_TRANSCODING != 1 | |
3894
8f7ad4989fec
transcoding to uncompressed transfer syntaxes over DICOM protocol is implemented
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3893
diff
changeset
|
59 if (useDcmtk) |
3893 | 60 { |
61 throw OrthancException(ErrorCode_NotImplemented, | |
62 "Orthanc was built without support for DMCTK transcoding"); | |
63 } | |
64 #endif | |
3894
8f7ad4989fec
transcoding to uncompressed transfer syntaxes over DICOM protocol is implemented
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3893
diff
changeset
|
65 |
8f7ad4989fec
transcoding to uncompressed transfer syntaxes over DICOM protocol is implemented
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3893
diff
changeset
|
66 useDcmtk_ = used; |
3893 | 67 } |
68 | |
3894
8f7ad4989fec
transcoding to uncompressed transfer syntaxes over DICOM protocol is implemented
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3893
diff
changeset
|
69 |
3929
7dc5e7e0045d
simplifying MemoryBufferTranscoder::Transcode() interface
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3910
diff
changeset
|
70 static void CheckTargetSyntax(const std::string& transcoded, |
7dc5e7e0045d
simplifying MemoryBufferTranscoder::Transcode() interface
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3910
diff
changeset
|
71 const std::set<DicomTransferSyntax>& allowedSyntaxes) |
7dc5e7e0045d
simplifying MemoryBufferTranscoder::Transcode() interface
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3910
diff
changeset
|
72 { |
7dc5e7e0045d
simplifying MemoryBufferTranscoder::Transcode() interface
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3910
diff
changeset
|
73 #if !defined(NDEBUG) |
7dc5e7e0045d
simplifying MemoryBufferTranscoder::Transcode() interface
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3910
diff
changeset
|
74 // Debug mode |
7dc5e7e0045d
simplifying MemoryBufferTranscoder::Transcode() interface
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3910
diff
changeset
|
75 ParsedDicomFile parsed(transcoded); |
7dc5e7e0045d
simplifying MemoryBufferTranscoder::Transcode() interface
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3910
diff
changeset
|
76 |
7dc5e7e0045d
simplifying MemoryBufferTranscoder::Transcode() interface
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3910
diff
changeset
|
77 std::string s; |
7dc5e7e0045d
simplifying MemoryBufferTranscoder::Transcode() interface
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3910
diff
changeset
|
78 DicomTransferSyntax a, b; |
7dc5e7e0045d
simplifying MemoryBufferTranscoder::Transcode() interface
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3910
diff
changeset
|
79 if (!parsed.LookupTransferSyntax(s) || |
7dc5e7e0045d
simplifying MemoryBufferTranscoder::Transcode() interface
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3910
diff
changeset
|
80 !FromDcmtkBridge::LookupOrthancTransferSyntax(a, parsed.GetDcmtkObject()) || |
7dc5e7e0045d
simplifying MemoryBufferTranscoder::Transcode() interface
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3910
diff
changeset
|
81 !LookupTransferSyntax(b, s) || |
7dc5e7e0045d
simplifying MemoryBufferTranscoder::Transcode() interface
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3910
diff
changeset
|
82 a != b || |
7dc5e7e0045d
simplifying MemoryBufferTranscoder::Transcode() interface
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3910
diff
changeset
|
83 allowedSyntaxes.find(a) == allowedSyntaxes.end()) |
7dc5e7e0045d
simplifying MemoryBufferTranscoder::Transcode() interface
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3910
diff
changeset
|
84 { |
7dc5e7e0045d
simplifying MemoryBufferTranscoder::Transcode() interface
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3910
diff
changeset
|
85 throw OrthancException( |
7dc5e7e0045d
simplifying MemoryBufferTranscoder::Transcode() interface
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3910
diff
changeset
|
86 ErrorCode_Plugin, |
7dc5e7e0045d
simplifying MemoryBufferTranscoder::Transcode() interface
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3910
diff
changeset
|
87 "DEBUG - The transcoding plugin has not written to one of the allowed transfer syntaxes"); |
7dc5e7e0045d
simplifying MemoryBufferTranscoder::Transcode() interface
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3910
diff
changeset
|
88 } |
7dc5e7e0045d
simplifying MemoryBufferTranscoder::Transcode() interface
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3910
diff
changeset
|
89 #endif |
7dc5e7e0045d
simplifying MemoryBufferTranscoder::Transcode() interface
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3910
diff
changeset
|
90 } |
7dc5e7e0045d
simplifying MemoryBufferTranscoder::Transcode() interface
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3910
diff
changeset
|
91 |
7dc5e7e0045d
simplifying MemoryBufferTranscoder::Transcode() interface
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3910
diff
changeset
|
92 |
3906
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3905
diff
changeset
|
93 bool MemoryBufferTranscoder::TranscodeParsedToBuffer( |
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3905
diff
changeset
|
94 std::string& target /* out */, |
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3905
diff
changeset
|
95 bool& hasSopInstanceUidChanged /* out */, |
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3905
diff
changeset
|
96 DcmFileFormat& dicom /* in, possibly modified */, |
3910 | 97 DicomTransferSyntax targetSyntax, |
3906
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3905
diff
changeset
|
98 bool allowNewSopInstanceUid) |
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3905
diff
changeset
|
99 { |
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3905
diff
changeset
|
100 if (dicom.getDataset() == NULL) |
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3905
diff
changeset
|
101 { |
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3905
diff
changeset
|
102 throw OrthancException(ErrorCode_InternalError); |
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3905
diff
changeset
|
103 } |
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3905
diff
changeset
|
104 |
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3905
diff
changeset
|
105 std::string source; |
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3905
diff
changeset
|
106 FromDcmtkBridge::SaveToMemoryBuffer(source, *dicom.getDataset()); |
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3905
diff
changeset
|
107 |
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3905
diff
changeset
|
108 const void* data = source.empty() ? NULL : source.c_str(); |
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3905
diff
changeset
|
109 |
3929
7dc5e7e0045d
simplifying MemoryBufferTranscoder::Transcode() interface
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3910
diff
changeset
|
110 std::set<DicomTransferSyntax> allowedSyntaxes; |
7dc5e7e0045d
simplifying MemoryBufferTranscoder::Transcode() interface
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3910
diff
changeset
|
111 allowedSyntaxes.insert(targetSyntax); |
3906
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3905
diff
changeset
|
112 |
3929
7dc5e7e0045d
simplifying MemoryBufferTranscoder::Transcode() interface
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3910
diff
changeset
|
113 bool success = Transcode(target, hasSopInstanceUidChanged, |
7dc5e7e0045d
simplifying MemoryBufferTranscoder::Transcode() interface
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3910
diff
changeset
|
114 data, source.size(), allowedSyntaxes, allowNewSopInstanceUid); |
7dc5e7e0045d
simplifying MemoryBufferTranscoder::Transcode() interface
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3910
diff
changeset
|
115 |
3906
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3905
diff
changeset
|
116 #if ORTHANC_ENABLE_DCMTK_TRANSCODING == 1 |
3910 | 117 if (!success && |
118 useDcmtk_ && | |
3906
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3905
diff
changeset
|
119 dcmtk_.TranscodeParsedToBuffer( |
3929
7dc5e7e0045d
simplifying MemoryBufferTranscoder::Transcode() interface
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3910
diff
changeset
|
120 target, hasSopInstanceUidChanged, dicom, targetSyntax, allowNewSopInstanceUid)) |
3906
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3905
diff
changeset
|
121 { |
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3905
diff
changeset
|
122 success = true; |
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3905
diff
changeset
|
123 } |
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3905
diff
changeset
|
124 #endif |
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3905
diff
changeset
|
125 |
3929
7dc5e7e0045d
simplifying MemoryBufferTranscoder::Transcode() interface
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3910
diff
changeset
|
126 CheckTargetSyntax(target, allowedSyntaxes); |
3906
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3905
diff
changeset
|
127 return success; |
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3905
diff
changeset
|
128 } |
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3905
diff
changeset
|
129 |
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3905
diff
changeset
|
130 |
3907
1555feda39e2
substituting IDicomTranscoder::TranscodeToParsed() by refactored implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3906
diff
changeset
|
131 IDicomTranscoder::TranscodedDicom* MemoryBufferTranscoder::TranscodeToParsed( |
3906
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3905
diff
changeset
|
132 DcmFileFormat& dicom /* in, possibly modified */, |
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3905
diff
changeset
|
133 const void* buffer /* in, same DICOM file as "dicom" */, |
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3905
diff
changeset
|
134 size_t size, |
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3905
diff
changeset
|
135 const std::set<DicomTransferSyntax>& allowedSyntaxes, |
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3905
diff
changeset
|
136 bool allowNewSopInstanceUid) |
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3905
diff
changeset
|
137 { |
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3905
diff
changeset
|
138 bool hasSopInstanceUidChanged; |
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3905
diff
changeset
|
139 |
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3905
diff
changeset
|
140 std::string target; |
3929
7dc5e7e0045d
simplifying MemoryBufferTranscoder::Transcode() interface
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3910
diff
changeset
|
141 if (Transcode(target, hasSopInstanceUidChanged, |
3906
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3905
diff
changeset
|
142 buffer, size, allowedSyntaxes, allowNewSopInstanceUid)) |
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3905
diff
changeset
|
143 { |
3929
7dc5e7e0045d
simplifying MemoryBufferTranscoder::Transcode() interface
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3910
diff
changeset
|
144 CheckTargetSyntax(target, allowedSyntaxes); |
7dc5e7e0045d
simplifying MemoryBufferTranscoder::Transcode() interface
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3910
diff
changeset
|
145 |
3906
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3905
diff
changeset
|
146 const void* data = target.empty() ? NULL : target.c_str(); |
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3905
diff
changeset
|
147 return IDicomTranscoder::TranscodedDicom::CreateFromInternal( |
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3905
diff
changeset
|
148 FromDcmtkBridge::LoadFromMemoryBuffer(data, target.size()), hasSopInstanceUidChanged); |
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3905
diff
changeset
|
149 } |
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3905
diff
changeset
|
150 #if ORTHANC_ENABLE_DCMTK_TRANSCODING == 1 |
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3905
diff
changeset
|
151 else if (useDcmtk_) |
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3905
diff
changeset
|
152 { |
3907
1555feda39e2
substituting IDicomTranscoder::TranscodeToParsed() by refactored implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3906
diff
changeset
|
153 return dcmtk_.TranscodeToParsed(dicom, buffer, size, allowedSyntaxes, allowNewSopInstanceUid); |
3906
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3905
diff
changeset
|
154 } |
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3905
diff
changeset
|
155 #endif |
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3905
diff
changeset
|
156 else |
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3905
diff
changeset
|
157 { |
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3905
diff
changeset
|
158 return NULL; |
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3905
diff
changeset
|
159 } |
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3905
diff
changeset
|
160 } |
3893 | 161 } |