changeset 1794:bdfae6e17d23 worklists

integration mainline->worklists
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 19 Nov 2015 16:02:35 +0100
parents b769623c806c (current diff) 9a3a77d1d2a2 (diff)
children af6840eb23ee
files OrthancServer/DicomInstanceToStore.cpp OrthancServer/ServerEnumerations.h
diffstat 1 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/OrthancServer/ServerEnumerations.h	Thu Nov 19 11:15:43 2015 +0100
+++ b/OrthancServer/ServerEnumerations.h	Thu Nov 19 16:02:35 2015 +0100
@@ -120,9 +120,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)
   };