# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1622099710 -7200
# Node ID fa81bb6378fbef532846c9cae00166c4b74a28ff
# Parent  a56bf4c534ef5dd8b22693f18a1f7aa03e4aba58# Parent  d6b83b4cedcd03a3da2621cdb3deb17ce0fa3e70
back to mainline

diff -r a56bf4c534ef -r fa81bb6378fb Applications/StoneWebViewer/NEWS
--- a/Applications/StoneWebViewer/NEWS	Wed May 26 21:07:13 2021 +0200
+++ b/Applications/StoneWebViewer/NEWS	Thu May 27 09:15:10 2021 +0200
@@ -1,6 +1,10 @@
 Pending changes in the mainline
 ===============================
 
+
+Version 2.0 (2021-05-27)
+========================
+
 * New tools for annotations: segment length, circle, angle and eraser
 * Patient birth date is now displayed in the overlays
 * New argument "token" to set HTTP header "Authorization: Bearer <token>"
diff -r a56bf4c534ef -r fa81bb6378fb Applications/StoneWebViewer/Version.cmake
diff -r a56bf4c534ef -r fa81bb6378fb OrthancStone/Sources/Loaders/LoadedDicomResources.h
--- a/OrthancStone/Sources/Loaders/LoadedDicomResources.h	Wed May 26 21:07:13 2021 +0200
+++ b/OrthancStone/Sources/Loaders/LoadedDicomResources.h	Thu May 27 09:15:10 2021 +0200
@@ -41,7 +41,7 @@
       std::unique_ptr<Json::Value>        sourceJson_;
 
     public:
-      Resource(const Orthanc::DicomMap& dicom);
+      explicit Resource(const Orthanc::DicomMap& dicom);
 
       Resource* Clone() const;