comparison src/vamp-hostsdk/Files.cpp @ 421:35fa4733bc5d

Fix compiler warnings, and fix potential mangling of utf8 when downcasing (this is still a nasty and incomplete way to do it though)

 Files::listLibraryFilesMatching(string libraryName)
 {
     vector<string> path = Vamp::PluginHostAdapter::getPluginPath();
     vector<string> libraryFiles;
 
-    // we match case-insensitively
+    // we match case-insensitively, but only with ascii range
+    // characters (this string is expected to be utf-8)
     for (size_t i = 0; i < libraryName.length(); ++i) {
-	libraryName[i] = tolower(libraryName[i]);
+        if (!(libraryName[i] & 0x80)) {
+            libraryName[i] = char(tolower(libraryName[i]));
+        }
     }
 
     for (size_t i = 0; i < path.size(); ++i) {
         
         vector<string> files = listFiles(path[i], PLUGIN_SUFFIX);
 
         for (vector<string>::iterator fi = files.begin();
              fi != files.end(); ++fi) {
             
             if (libraryName != "") {
-		// we match case-insensitively
+		// we match case-insensitively, but only with ascii
+		// range characters (this string is expected to be
+		// utf-8)
                 string temp = *fi;
                 for (size_t i = 0; i < temp.length(); ++i) {
-                    temp[i] = tolower(temp[i]);
+                    if (!(temp[i] & 0x80)) {
+                        temp[i] = char(tolower(temp[i]));
+                    }
                 }
                 // libraryName should be lacking an extension, as it
                 // is supposed to have come from the plugin key
                 string::size_type pi = temp.find('.');
                 if (pi == string::npos) {

 #endif
 
     li = basename.find('.');
     if (li != string::npos) basename = basename.substr(0, li);
 
+    // case-insensitive, but only with ascii range characters (this
+    // string is expected to be utf-8)
     for (size_t i = 0; i < basename.length(); ++i) {
-        basename[i] = tolower(basename[i]);
+        if (!(basename[i] & 0x80)) {
+            basename[i] = char(tolower(basename[i]));
+        }
     }
 
     return basename;
 }