comparison OrthancFramework/Sources/Enumerations.cpp @ 5301:f26ed26a7793 am-experimental

merge
author Alain Mazy <am@osimis.io>
date Wed, 24 May 2023 08:56:41 +0200
parents c04230962098 800261398381
children
comparison
equal deleted inserted replaced
5300:7d913ee2f665 5301:f26ed26a7793
29 #include "Logging.h" 29 #include "Logging.h"
30 30
31 #include <boost/thread/mutex.hpp> 31 #include <boost/thread/mutex.hpp>
32 #include <string.h> 32 #include <string.h>
33 #include <cassert> 33 #include <cassert>
34 #include <boost/algorithm/string/replace.hpp>
34 35
35 namespace Orthanc 36 namespace Orthanc
36 { 37 {
37 static const char* const MIME_CSS = "text/css"; 38 static const char* const MIME_CSS = "text/css";
38 static const char* const MIME_DICOM = "application/dicom"; 39 static const char* const MIME_DICOM = "application/dicom";
1938 const char* specificCharacterSet) 1939 const char* specificCharacterSet)
1939 { 1940 {
1940 std::string s = Toolbox::StripSpaces(specificCharacterSet); 1941 std::string s = Toolbox::StripSpaces(specificCharacterSet);
1941 Toolbox::ToUpperCase(s); 1942 Toolbox::ToUpperCase(s);
1942 1943
1944 // handle common spelling mistakes
1945 boost::replace_all(s, "ISO_IR_", "ISO_IR ");
1946 boost::replace_all(s, "ISO_2022_IR_", "ISO 2022 IR ");
1947
1948
1943 // http://dicom.nema.org/medical/dicom/current/output/html/part03.html#sect_C.12.1.1.2 1949 // http://dicom.nema.org/medical/dicom/current/output/html/part03.html#sect_C.12.1.1.2
1944 // https://github.com/dcm4che/dcm4che/blob/master/dcm4che-core/src/main/java/org/dcm4che3/data/SpecificCharacterSet.java 1950 // https://github.com/dcm4che/dcm4che/blob/master/dcm4che-core/src/main/java/org/dcm4che3/data/SpecificCharacterSet.java
1945 if (s == "ISO_IR 6" || 1951 if (s == "ISO_IR 6" ||
1946 s == "ISO 2022 IR 6") 1952 s == "ISO 2022 IR 6")
1947 { 1953 {