# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1481731541 -3600
# Node ID 1099a148f7e5c736453b4385cc6ef76e9a07c0d1
# Parent  22ab2d8566fa7ebefd95f28e1cc76add9bfd9273
sync

diff -r 22ab2d8566fa -r 1099a148f7e5 Resources/Orthanc/Core/Enumerations.cpp
--- a/Resources/Orthanc/Core/Enumerations.cpp	Tue Nov 29 13:28:21 2016 +0100
+++ b/Resources/Orthanc/Core/Enumerations.cpp	Wed Dec 14 17:05:41 2016 +0100
@@ -1083,15 +1083,18 @@
   bool GetDicomEncoding(Encoding& encoding,
                         const char* specificCharacterSet)
   {
-    std::string s = specificCharacterSet;
+    std::string s = Toolbox::StripSpaces(specificCharacterSet);
     Toolbox::ToUpperCase(s);
 
     // http://dicom.nema.org/medical/dicom/current/output/html/part03.html#sect_C.12.1.1.2
     // https://github.com/dcm4che/dcm4che/blob/master/dcm4che-core/src/main/java/org/dcm4che3/data/SpecificCharacterSet.java
     if (s == "ISO_IR 6" ||
-        s == "ISO_IR 192" ||
         s == "ISO 2022 IR 6")
     {
+      encoding = Encoding_Ascii;
+    }
+    else if (s == "ISO_IR 192")
+    {
       encoding = Encoding_Utf8;
     }
     else if (s == "ISO_IR 100" ||
@@ -1238,8 +1241,10 @@
     // http://dicom.nema.org/medical/dicom/current/output/html/part03.html#sect_C.12.1.1.2
     switch (encoding)
     {
+      case Encoding_Ascii:
+        return "ISO_IR 6";
+
       case Encoding_Utf8:
-      case Encoding_Ascii:
         return "ISO_IR 192";
 
       case Encoding_Latin1:
diff -r 22ab2d8566fa -r 1099a148f7e5 Resources/Orthanc/Core/HttpClient.cpp
--- a/Resources/Orthanc/Core/HttpClient.cpp	Tue Nov 29 13:28:21 2016 +0100
+++ b/Resources/Orthanc/Core/HttpClient.cpp	Wed Dec 14 17:05:41 2016 +0100
@@ -318,10 +318,10 @@
     url_ = "";
     method_ = HttpMethod_Get;
     lastStatus_ = HttpStatus_200_Ok;
-    isVerbose_ = false;
+    SetVerbose(false);
     timeout_ = GlobalParameters::GetInstance().GetDefaultTimeout();
     GlobalParameters::GetInstance().GetDefaultProxy(proxy_);
-    GlobalParameters::GetInstance().GetSslConfiguration(verifyPeers_, caCertificates_);
+    GlobalParameters::GetInstance().GetSslConfiguration(verifyPeers_, caCertificates_);    
   }
 
 
diff -r 22ab2d8566fa -r 1099a148f7e5 Resources/Orthanc/Core/OrthancException.h
--- a/Resources/Orthanc/Core/OrthancException.h	Tue Nov 29 13:28:21 2016 +0100
+++ b/Resources/Orthanc/Core/OrthancException.h	Wed Dec 14 17:05:41 2016 +0100
@@ -45,7 +45,7 @@
     HttpStatus httpStatus_;
 
   public:
-    OrthancException(ErrorCode errorCode) : 
+    explicit OrthancException(ErrorCode errorCode) : 
       errorCode_(errorCode),
       httpStatus_(ConvertErrorCodeToHttpStatus(errorCode))
     {