File: cache-manager

package info (click to toggle)
orthanc-webviewer 2.10%2Bdfsg-2
  • links: PTS, VCS
  • area: main
  • in suites: forky, sid
  • size: 1,956 kB
  • sloc: javascript: 21,840; cpp: 7,300; python: 345; sh: 93; makefile: 60
file content (26 lines) | stat: -rw-r--r-- 1,222 bytes parent folder | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
Description: Fix FTBFS with liborthancframework-dev >= 1.9.8
Author: Sebastien Jodogne <s.jodogne@orthanc-labs.com>
Forwarded: https://orthanc.uclouvain.be/hg/orthanc-webviewer/rev/d89da90a262b
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
Index: OrthancWebViewer-2.10/Plugin/Cache/CacheManager.cpp
===================================================================
--- OrthancWebViewer-2.10.orig/Plugin/Cache/CacheManager.cpp
+++ OrthancWebViewer-2.10/Plugin/Cache/CacheManager.cpp
@@ -467,8 +467,14 @@ namespace OrthancPlugins
     try
     {
 #if defined(ORTHANC_FRAMEWORK_VERSION_IS_ABOVE) && ORTHANC_FRAMEWORK_VERSION_IS_ABOVE(1, 9, 0) 
-      std::unique_ptr<Orthanc::IMemoryBuffer> buffer(
-        pimpl_->storage_.Read(uuid, Orthanc::FileContentType_Unknown));
+      std::unique_ptr<Orthanc::IMemoryBuffer> buffer;
+
+#  if ORTHANC_FRAMEWORK_VERSION_IS_ABOVE(1, 12, 8)
+      buffer.reset(pimpl_->storage_.ReadWhole(uuid, Orthanc::FileContentType_Unknown));
+#  else
+      buffer.reset(pimpl_->storage_.Read(uuid, Orthanc::FileContentType_Unknown));
+#  endif
+
       buffer->MoveToString(content);
 #else
       pimpl_->storage_.Read(content, uuid, Orthanc::FileContentType_Unknown);