# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1447945355 -3600
# Node ID bdfae6e17d2342a9ee9987b42291f2fa4397f225
# Parent  b769623c806cc601e5b13674896bd36add048fce# Parent  9a3a77d1d2a20fe28d82156099c70f4722a39dee
integration mainline->worklists

diff -r b769623c806c -r bdfae6e17d23 OrthancServer/DicomInstanceToStore.cpp
diff -r b769623c806c -r bdfae6e17d23 OrthancServer/ServerEnumerations.h
--- 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)
   };