# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1444405107 -7200
# Node ID 56a016ae8090522a0bbf764b8db35f049b95988c
# Parent  3b7bab1e9ea2918db1c4fc20c01a0e9df0fff530
sync

diff -r 3b7bab1e9ea2 -r 56a016ae8090 Orthanc/Core/Enumerations.cpp
--- a/Orthanc/Core/Enumerations.cpp	Fri Sep 25 12:46:25 2015 +0200
+++ b/Orthanc/Core/Enumerations.cpp	Fri Oct 09 17:38:27 2015 +0200
@@ -44,6 +44,11 @@
   // "Resources/GenerateErrorCodes.py"
   const char* EnumerationToString(ErrorCode error)
   {
+    if (error >= ErrorCode_START_PLUGINS)
+    {
+      return "Error encountered within some plugin";
+    }
+
     switch (error)
     {
       case ErrorCode_InternalError:
diff -r 3b7bab1e9ea2 -r 56a016ae8090 Orthanc/Core/Toolbox.cpp
--- a/Orthanc/Core/Toolbox.cpp	Fri Sep 25 12:46:25 2015 +0200
+++ b/Orthanc/Core/Toolbox.cpp	Fri Oct 09 17:38:27 2015 +0200
@@ -468,9 +468,13 @@
     assert(value < 16);
 
     if (value < 10)
+    {
       return value + '0';
+    }
     else
+    {
       return (value - 10) + 'a';
+    }
   }
 
 
@@ -508,8 +512,8 @@
     result.resize(32);
     for (unsigned int i = 0; i < 16; i++)
     {
-      result[2 * i] = GetHexadecimalCharacter(actualHash[i] / 16);
-      result[2 * i + 1] = GetHexadecimalCharacter(actualHash[i] % 16);
+      result[2 * i] = GetHexadecimalCharacter(static_cast<uint8_t>(actualHash[i] / 16));
+      result[2 * i + 1] = GetHexadecimalCharacter(static_cast<uint8_t>(actualHash[i] % 16));
     }
   }
 #endif