# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1545319118 -3600
# Node ID 6a2c7e206ebb5c957dc186ec9cfffb3ec9491b4f
# Parent  1c095185074c3dd23d940c6729e8e0488acc0b6a# Parent  8b331be5760655ff2748a3eca00e46c506167a6a
integration mainline->db-changes

diff -r 1c095185074c -r 6a2c7e206ebb OrthancServer/OrthancRestApi/OrthancRestResources.cpp
--- a/OrthancServer/OrthancRestApi/OrthancRestResources.cpp	Thu Dec 20 16:06:38 2018 +0100
+++ b/OrthancServer/OrthancRestApi/OrthancRestResources.cpp	Thu Dec 20 16:18:38 2018 +0100
@@ -39,6 +39,7 @@
 #include "../../Core/DicomParsing/Internals/DicomImageDecoder.h"
 #include "../../Core/HttpServer/HttpContentNegociation.h"
 #include "../../Core/Logging.h"
+#include "../DefaultDicomImageDecoder.h"
 #include "../OrthancConfiguration.h"
 #include "../ServerContext.h"
 #include "../ServerToolbox.h"
diff -r 1c095185074c -r 6a2c7e206ebb OrthancServer/main.cpp
--- a/OrthancServer/main.cpp	Thu Dec 20 16:06:38 2018 +0100
+++ b/OrthancServer/main.cpp	Thu Dec 20 16:18:38 2018 +0100
@@ -356,11 +356,13 @@
                          const IHttpHandler::Arguments& httpHeaders,
                          const IHttpHandler::GetArguments& getArguments)
   {
+#if ORTHANC_ENABLE_PLUGINS == 1
     if (plugins_ != NULL &&
         !plugins_->IsAllowed(method, uri, ip, username, httpHeaders, getArguments))
     {
       return false;
     }
+#endif
 
     static const char* HTTP_FILTER = "IncomingHttpRequestFilter";
 
@@ -1232,8 +1234,12 @@
 
 #elif ORTHANC_ENABLE_PLUGINS == 0
   // The plugins are disabled
-  databasePtr.reset(lock.GetConfiguration().CreateDatabaseWrapper());
-  storage.reset(lock.GetConfiguration().CreateStorageArea());
+
+  databasePtr.reset(CreateDatabaseWrapper());
+  storage.reset(CreateStorageArea());
+
+  assert(databasePtr.get() != NULL);
+  assert(storage.get() != NULL);
 
   return ConfigureDatabase(*databasePtr, *storage, NULL,
                            upgradeDatabase, loadJobsFromDatabase);
diff -r 1c095185074c -r 6a2c7e206ebb UnitTestsSources/FromDcmtkTests.cpp
--- a/UnitTestsSources/FromDcmtkTests.cpp	Thu Dec 20 16:06:38 2018 +0100
+++ b/UnitTestsSources/FromDcmtkTests.cpp	Thu Dec 20 16:18:38 2018 +0100
@@ -320,6 +320,7 @@
 
 TEST(FromDcmtkBridge, ValueRepresentationConversions)
 {
+#if ORTHANC_ENABLE_PLUGINS == 1
   ASSERT_EQ(1, ValueRepresentation_ApplicationEntity);
   ASSERT_EQ(1, OrthancPluginValueRepresentation_AE);
 
@@ -358,6 +359,7 @@
     ValueRepresentation orthanc = Plugins::Convert(plugins);
     ASSERT_EQ(plugins, Plugins::Convert(orthanc));
   }
+#endif
 }