Mercurial > hg > orthanc

changeset 2029:df9c1738d92e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author sjodogne
date Mon, 20 Jun 2016 14:07:48 +0200
parents d108412411e5 (diff) 8c9426d0a3e2 (current diff)
children a6e8e2251304
files
diffstat 4 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/OrthancServer/ParsedDicomFile.cpp	Mon Jun 20 13:50:26 2016 +0200
+++ b/OrthancServer/ParsedDicomFile.cpp	Mon Jun 20 14:07:48 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()));
--- a/OrthancServer/SliceOrdering.h	Mon Jun 20 13:50:26 2016 +0200
+++ b/OrthancServer/SliceOrdering.h	Mon Jun 20 14:07:48 2016 +0200
@@ -42,7 +42,7 @@
     typedef float Vector[3];
 
     struct Instance;
-    struct PositionComparator;
+    class  PositionComparator;
 
     ServerIndex&             index_;
     std::string              seriesId_;
--- a/Plugins/Engine/OrthancPlugins.cpp	Mon Jun 20 13:50:26 2016 +0200
+++ b/Plugins/Engine/OrthancPlugins.cpp	Mon Jun 20 14:07:48 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;
       }
 
--- a/Plugins/Engine/OrthancPlugins.h	Mon Jun 20 13:50:26 2016 +0200
+++ b/Plugins/Engine/OrthancPlugins.h	Mon Jun 20 14:07:48 2016 +0200
@@ -76,7 +76,7 @@
     public IMoveRequestHandlerFactory
   {
   private:
-    struct PImpl;
+    class PImpl;
     boost::shared_ptr<PImpl> pimpl_;
 
     class WorklistHandler;