diff Framework/Orthanc/Core/Toolbox.h @ 12:9220cf4a63d5

sync
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 09 Nov 2016 14:14:34 +0100
parents 2dbe613f6c93
children 0b9034112fde
line wrap: on
line diff
--- a/Framework/Orthanc/Core/Toolbox.h	Wed Oct 26 12:14:03 2016 +0200
+++ b/Framework/Orthanc/Core/Toolbox.h	Wed Nov 09 14:14:34 2016 +0100
@@ -163,6 +163,9 @@
     std::string ConvertFromUtf8(const std::string& source,
                                 Encoding targetEncoding);
 
+    bool IsAsciiString(const void* data,
+                       size_t size);
+
     std::string ConvertToAscii(const std::string& source);
 
     std::string StripSpaces(const std::string& source);
@@ -195,7 +198,7 @@
     bool IsExistingFile(const std::string& path);
 #endif
 
-#if ORTHANC_PUGIXML_ENABLED == 1
+#if ORTHANC_ENABLE_PUGIXML == 1
     void JsonToXml(std::string& target,
                    const Json::Value& source,
                    const std::string& rootElement = "root",