# HG changeset patch
# User Alain Mazy <am@osimis.io>
# Date 1679993293 -7200
# Node ID 32df369198ac0ec80454f182ecc62484fe07b721
# Parent  0ea402b4d901e911edbc39dfc9842fb3aad62d78
fix /tools/reset crashing when ExtraMainDicomTags were defined

diff -r 0ea402b4d901 -r 32df369198ac NEWS
--- a/NEWS	Sat Mar 25 12:27:21 2023 +0100
+++ b/NEWS	Tue Mar 28 10:48:13 2023 +0200
@@ -10,7 +10,7 @@
 ---------
 
 * Fix issue 214: VOILUTSequence is not returned in Wado-RS
-
+* Fix /tools/reset crashing when ExtraMainDicomTags were defined
 
 version 1.11.3 (2023-02-03)
 ===========================
diff -r 0ea402b4d901 -r 32df369198ac OrthancFramework/Sources/DicomFormat/DicomMap.h
--- a/OrthancFramework/Sources/DicomFormat/DicomMap.h	Sat Mar 25 12:27:21 2023 +0100
+++ b/OrthancFramework/Sources/DicomFormat/DicomMap.h	Tue Mar 28 10:48:13 2023 +0200
@@ -31,10 +31,6 @@
 #include <map>
 #include <json/value.h>
 
-#if ORTHANC_BUILD_UNIT_TESTS == 1
-#  include <gtest/gtest_prod.h>
-#endif
-
 namespace Orthanc
 {
   class ORTHANC_PUBLIC DicomMap : public boost::noncopyable
@@ -48,10 +44,6 @@
     friend class FromDcmtkBridge;
     friend class ParsedDicomFile;
 
-#if ORTHANC_BUILD_UNIT_TESTS == 1
-    friend class DicomMapMainTagsTests;
-#endif
-
     Content content_;
 
     // Warning: This takes the ownership of "value"
@@ -59,12 +51,11 @@
                           uint16_t element, 
                           DicomValue* value);
 
-    // used for unit tests only
-    static void ResetDefaultMainDicomTags();
-
   public:
     ~DicomMap();
 
+    static void ResetDefaultMainDicomTags();
+
     size_t GetSize() const;
     
     DicomMap* Clone() const;
diff -r 0ea402b4d901 -r 32df369198ac OrthancServer/Sources/OrthancInitialization.cpp
--- a/OrthancServer/Sources/OrthancInitialization.cpp	Sat Mar 25 12:27:21 2023 +0100
+++ b/OrthancServer/Sources/OrthancInitialization.cpp	Tue Mar 28 10:48:13 2023 +0200
@@ -204,6 +204,8 @@
   {
     static const char* const EXTRA_MAIN_DICOM_TAGS = "ExtraMainDicomTags";
     
+    DicomMap::ResetDefaultMainDicomTags();
+
     if (configuration.type() != Json::objectValue ||
         !configuration.isMember(EXTRA_MAIN_DICOM_TAGS) ||
         configuration[EXTRA_MAIN_DICOM_TAGS].type() != Json::objectValue)