Fixes for GCC 4.3.

[ardour.git] / libs / pbd / convert.cc

diff --git a/libs/pbd/convert.cc b/libs/pbd/convert.cc
index 832c54acd84c186eb1cc21b55c01b87ee51cb2f3..fc84bbad5e060fe9a8402595548e5be051ad2c65 100644 (file)
--- a/libs/pbd/convert.cc
+++ b/libs/pbd/convert.cc
@@ -19,6 +19,7 @@
 
 #include <cmath>
 #include <stdint.h>
+#include <stdlib.h>
 #ifndef __STDC_FORMAT_MACROS
 #define __STDC_FORMAT_MACROS
 #endif
@@ -30,6 +31,7 @@
 
 using std::string;
 using std::vector;
+using Glib::ustring;
 
 namespace PBD {
 
@@ -100,13 +102,13 @@ short_version (string orig, string::size_type target_length)
 int
 atoi (const string& s)
 {
-       return std::atoi (s.c_str());
+       return ::atoi (s.c_str());
 }
 
 double
 atof (const string& s)
 {
-       return std::atof (s.c_str());
+       return ::atof (s.c_str());
 }
 
 vector<string>
@@ -194,6 +196,52 @@ url_decode (string& url)
        }
 }
 
+void
+url_decode (ustring& url)
+{
+       ustring::iterator last;
+       ustring::iterator next;
+
+       for (ustring::iterator i = url.begin(); i != url.end(); ++i) {
+               if ((*i) == '+') {
+                       next = i;
+                       ++next;
+                       url.replace (i, next, 1, ' ');
+               }
+       }
+
+       if (url.length() <= 3) {
+               return;
+       }
+
+       last = url.end();
+
+       --last; /* points at last char */
+       --last; /* points at last char - 1 */
+
+       for (ustring::iterator i = url.begin(); i != last; ) {
+
+               if (*i == '%') {
+
+                       next = i;
+
+                       url.erase (i);
+                       
+                       i = next;
+                       ++next;
+                       
+                       if (isxdigit (*i) && isxdigit (*next)) {
+                               /* replace first digit with char */
+                               url.replace (i, next, 1, (gunichar) int_from_hex (*i,*next));
+                               ++i; /* points at 2nd of 2 digits */
+                               url.erase (i);
+                       }
+               } else {
+                       ++i;
+               }
+       }
+}
+
 #if 0
 string
 length2string (const int32_t frames, const float sample_rate)
@@ -233,5 +281,21 @@ length2string (const int64_t frames, const double sample_rate)
        
        return duration_str;
 }
+static bool 
+chars_equal_ignore_case(char x, char y)
+{
+       static std::locale loc;
+       return toupper(x, loc) == toupper(y, loc);
+}
+
+bool 
+strings_equal_ignore_case (const string& a, const string& b)
+{
+       if (a.length() == b.length()) {
+               return std::equal (a.begin(), a.end(), b.begin(), chars_equal_ignore_case);
+       }
+       return false;
+}
+
 
 } // namespace PBD