Mercurial > hg > orthanc

changeset 1793:9a3a77d1d2a2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
backward compatibility with Orthanc 0.9.4
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 19 Nov 2015 11:57:32 +0100
parents 2dbf25006f88
children bdfae6e17d23 bdef349f742c
files OrthancServer/DicomInstanceToStore.cpp OrthancServer/ServerEnumerations.h
diffstat 2 files changed, 5 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/OrthancServer/DicomInstanceToStore.cpp	Wed Nov 18 09:56:34 2015 +0100
+++ b/OrthancServer/DicomInstanceToStore.cpp	Thu Nov 19 11:57:32 2015 +0100
@@ -109,7 +109,8 @@
     if (!json_.HasContent())
     {
       json_.Allocate();
-      FromDcmtkBridge::ToJson(json_.GetContent(), GetDataset(parsed_.GetContent()), 
+      FromDcmtkBridge::ToJson(json_.GetContent(),
+                              GetDataset(parsed_.GetContent()), 
                               DicomToJsonFormat_Full, 
                               DicomToJsonFlags_Default,
                               256 /* max string length */);
--- a/OrthancServer/ServerEnumerations.h	Wed Nov 18 09:56:34 2015 +0100
+++ b/OrthancServer/ServerEnumerations.h	Thu Nov 19 11:57:32 2015 +0100
@@ -119,9 +119,10 @@
 
     // Some predefined combinations
     DicomToJsonFlags_None     = 0,
-    DicomToJsonFlags_Default  = (DicomToJsonFlags_IncludePrivateTags | 
+    DicomToJsonFlags_Default  = (DicomToJsonFlags_IncludeBinary |
+                                 DicomToJsonFlags_IncludePixelData | 
+                                 DicomToJsonFlags_IncludePrivateTags | 
                                  DicomToJsonFlags_IncludeUnknownTags | 
-                                 DicomToJsonFlags_IncludePixelData | 
                                  DicomToJsonFlags_ConvertBinaryToNull)
   };