# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1447930652 -3600
# Node ID 9a3a77d1d2a20fe28d82156099c70f4722a39dee
# Parent  2dbf25006f888768e5026e4d717f4f4be65f5189
backward compatibility with Orthanc 0.9.4

diff -r 2dbf25006f88 -r 9a3a77d1d2a2 OrthancServer/DicomInstanceToStore.cpp
--- 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 */);
diff -r 2dbf25006f88 -r 9a3a77d1d2a2 OrthancServer/ServerEnumerations.h
--- 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)
   };