# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1466431406 -7200
# Node ID a6e8e22513049f849f74610fdff5dc59f3f6fa4f
# Parent  b4da986c82bb06917f4fc5f630bfbf4842d5f47e# Parent  df9c1738d92ec9e982451b53dc6703c1c8483ef4
merge

diff -r b4da986c82bb -r a6e8e2251304 OrthancServer/ParsedDicomFile.cpp
--- a/OrthancServer/ParsedDicomFile.cpp	Mon Jun 20 16:03:07 2016 +0200
+++ b/OrthancServer/ParsedDicomFile.cpp	Mon Jun 20 16:03:26 2016 +0200
@@ -1267,8 +1267,8 @@
   ParsedDicomFile* ParsedDicomFile::CreateFromJson(const Json::Value& json,
                                                    DicomFromJsonFlags flags)
   {
-    const bool generateIdentifiers = (flags & DicomFromJsonFlags_GenerateIdentifiers);
-    const bool decodeDataUriScheme = (flags & DicomFromJsonFlags_DecodeDataUriScheme);
+	const bool generateIdentifiers = (flags & DicomFromJsonFlags_GenerateIdentifiers) ? true : false;
+	const bool decodeDataUriScheme = (flags & DicomFromJsonFlags_DecodeDataUriScheme) ? true : false;
 
     std::auto_ptr<ParsedDicomFile> result(new ParsedDicomFile(generateIdentifiers));
     result->SetEncoding(FromDcmtkBridge::ExtractEncoding(json, Configuration::GetDefaultEncoding()));
diff -r b4da986c82bb -r a6e8e2251304 OrthancServer/SliceOrdering.h
--- a/OrthancServer/SliceOrdering.h	Mon Jun 20 16:03:07 2016 +0200
+++ b/OrthancServer/SliceOrdering.h	Mon Jun 20 16:03:26 2016 +0200
@@ -42,7 +42,7 @@
     typedef float Vector[3];
 
     struct Instance;
-    struct PositionComparator;
+    class  PositionComparator;
 
     ServerIndex&             index_;
     std::string              seriesId_;
diff -r b4da986c82bb -r a6e8e2251304 Plugins/Engine/OrthancPlugins.cpp
--- a/Plugins/Engine/OrthancPlugins.cpp	Mon Jun 20 16:03:07 2016 +0200
+++ b/Plugins/Engine/OrthancPlugins.cpp	Mon Jun 20 16:03:26 2016 +0200
@@ -1811,7 +1811,7 @@
       client.SetClientCertificate(certificate, key, password);
     }
 
-    client.SetPkcs11Enabled(p.pkcs11);
+	client.SetPkcs11Enabled(p.pkcs11 ? true : false);
 
     for (uint32_t i = 0; i < p.headersCount; i++)
     {
@@ -2463,7 +2463,7 @@
         const _OrthancPluginStorageAreaCreate& p =
           *reinterpret_cast<const _OrthancPluginStorageAreaCreate*>(parameters);
         IStorageArea& storage = *reinterpret_cast<IStorageArea*>(p.storageArea);
-        storage.Create(p.uuid, p.content, p.size, Plugins::Convert(p.type));
+        storage.Create(p.uuid, p.content, static_cast<size_t>(p.size), Plugins::Convert(p.type));
         return true;
       }
 
diff -r b4da986c82bb -r a6e8e2251304 Plugins/Engine/OrthancPlugins.h
--- a/Plugins/Engine/OrthancPlugins.h	Mon Jun 20 16:03:07 2016 +0200
+++ b/Plugins/Engine/OrthancPlugins.h	Mon Jun 20 16:03:26 2016 +0200
@@ -76,7 +76,7 @@
     public IMoveRequestHandlerFactory
   {
   private:
-    struct PImpl;
+    class PImpl;
     boost::shared_ptr<PImpl> pimpl_;
 
     class WorklistHandler;