comparison OrthancServer/Sources/ServerToolbox.cpp @ 4819:70d2a97ca8cb openssl-3.x

integration mainline->openssl-3.x
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 25 Nov 2021 13:12:32 +0100
parents f0038043fb97 434843934307
children 2e71a08eea15
comparison
equal deleted inserted replaced
4785:61da49321754 4819:70d2a97ca8cb
22 #include "PrecompiledHeadersServer.h" 22 #include "PrecompiledHeadersServer.h"
23 #include "ServerToolbox.h" 23 #include "ServerToolbox.h"
24 24
25 #include "../../OrthancFramework/Sources/DicomParsing/ParsedDicomFile.h" 25 #include "../../OrthancFramework/Sources/DicomParsing/ParsedDicomFile.h"
26 #include "../../OrthancFramework/Sources/FileStorage/StorageAccessor.h" 26 #include "../../OrthancFramework/Sources/FileStorage/StorageAccessor.h"
27 #include "../../OrthancFramework/Sources/FileStorage/StorageCache.h"
27 #include "../../OrthancFramework/Sources/Logging.h" 28 #include "../../OrthancFramework/Sources/Logging.h"
28 #include "../../OrthancFramework/Sources/OrthancException.h" 29 #include "../../OrthancFramework/Sources/OrthancException.h"
29 #include "Database/IDatabaseWrapper.h" 30 #include "Database/IDatabaseWrapper.h"
30 #include "Database/ResourcesContent.h" 31 #include "Database/ResourcesContent.h"
31 #include "OrthancConfiguration.h" 32 #include "OrthancConfiguration.h"
162 } 163 }
163 164
164 try 165 try
165 { 166 {
166 // Read and parse the content of the DICOM file 167 // Read and parse the content of the DICOM file
167 StorageAccessor accessor(storageArea); 168 StorageCache cache; // we create a temporary cache for this operation (required by the StorageAccessor)
169 StorageAccessor accessor(storageArea, cache);
168 170
169 std::string content; 171 std::string content;
170 accessor.Read(content, attachment); 172 accessor.Read(content, attachment);
171 173
172 ParsedDicomFile dicom(content); 174 ParsedDicomFile dicom(content);