Mercurial > hg > orthanc-gcp

changeset 25:9e3bda1134a3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
sync
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 31 Jan 2020 17:52:18 +0100
parents 4b5362d154f5
children d9e1b60a9aa6
files Resources/Orthanc/DownloadOrthancFramework.cmake Resources/Orthanc/Sdk-1.0.0/orthanc/OrthancCPlugin.h
diffstat 2 files changed, 5 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/Resources/Orthanc/DownloadOrthancFramework.cmake	Thu Jan 23 19:00:05 2020 +0100
+++ b/Resources/Orthanc/DownloadOrthancFramework.cmake	Fri Jan 31 17:52:18 2020 +0100
@@ -1,7 +1,7 @@
 # Orthanc - A Lightweight, RESTful DICOM Store
 # Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
 # Department, University Hospital of Liege, Belgium
-# Copyright (C) 2017-2019 Osimis S.A., Belgium
+# Copyright (C) 2017-2020 Osimis S.A., Belgium
 #
 # This program is free software: you can redistribute it and/or
 # modify it under the terms of the GNU General Public License as
@@ -110,6 +110,8 @@
         set(ORTHANC_FRAMEWORK_MD5 "3c29de1e289b5472342947168f0105c0")
       elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.5.7")
         set(ORTHANC_FRAMEWORK_MD5 "e1b76f01116d9b5d4ac8cc39980560e3")
+      elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.5.8")
+        set(ORTHANC_FRAMEWORK_MD5 "82323e8c49a667f658a3639ea4dbc336")
       endif()
     endif()
   endif()
--- a/Resources/Orthanc/Sdk-1.0.0/orthanc/OrthancCPlugin.h	Thu Jan 23 19:00:05 2020 +0100
+++ b/Resources/Orthanc/Sdk-1.0.0/orthanc/OrthancCPlugin.h	Fri Jan 31 17:52:18 2020 +0100
@@ -107,13 +107,9 @@
 #include <string.h>
 
 #ifdef WIN32
-#  define ORTHANC_PLUGINS_API __declspec(dllexport)
-#elif __GNUC__ >= 4
-/* This line is a patch wrt. Orthanc 1.0.0. It is necessary to have
- * the plugin symbols defined using holy-build-box. */
-#  define ORTHANC_PLUGINS_API __attribute__ ((visibility ("default")))
+#define ORTHANC_PLUGINS_API __declspec(dllexport)
 #else
-#  define ORTHANC_PLUGINS_API
+#define ORTHANC_PLUGINS_API
 #endif
 
 #define ORTHANC_PLUGINS_MINIMAL_MAJOR_NUMBER     1