Changeset 11110

Timestamp:

02/24/10 11:52:51 (3 years ago)

Author:

mplatings

Message:

 

Files:

• OpenSceneGraph/trunk/src/osgPlugins/fbx/ReaderWriterFBX.cpp (modified) (3 diffs)

OpenSceneGraph/trunk/src/osgPlugins/fbx/ReaderWriterFBX.cpp

@@ -27 +27 @@
 #include "WriterNodeVisitor.h"
 
+#if defined(WIN32) && !defined(__CYGWIN__)
+#define WIN32_LEAN_AND_MEAN
+//For MultiByteToWideChar
+#include <Windows.h>
+#endif
+
+// This function belongs in osgDB. Delete this function and use the osgDB
+// version once Robert accepts the submission.
+std::string convertStringFromCurrentCodePageToUTF8(const std::string& str)
+{
+#if defined(WIN32) && !defined(__CYGWIN__)
+        if (str.length() == 0)
+        {
+                return std::string();
+        }
+
+        int utf16Length = MultiByteToWideChar(CP_ACP, 0, str.c_str(), str.length(), 0, 0);
+        if (utf16Length <= 0)
+        {
+                osg::notify(osg::WARN) << "Cannot convert multi-byte string to UTF-8." << std::endl;
+                return std::string();
+        }
+
+        std::wstring sUTF16(utf16Length, L'\0');
+        utf16Length = MultiByteToWideChar(CP_ACP, 0, str.c_str(), str.length(), &sUTF16[0], utf16Length);
+        if (utf16Length <= 0)
+        {
+                osg::notify(osg::WARN) << "Cannot convert multi-byte string to UTF-8." << std::endl;
+                return std::string();
+        }
+
+        return osgDB::convertUTF16toUTF8(sUTF16);
+#else
+        return str;
+#endif
+}
 
 /// Returns true if the given node is a basic root group with no special information.
@@ -145 +181 @@
         const std::string& utf8filename(filename);
 #else
-        std::string utf8filename(osgDB::convertStringFromCurrentCodePageToUTF8(filename));
+        std::string utf8filename(convertStringFromCurrentCodePageToUTF8(filename));
 #endif
 
@@ -371 +407 @@
         // The FBX SDK interprets the filename as UTF-8
 #ifdef OSG_USE_UTF8_FILENAME
-        std::string utf8filename(filename);
+        const std::string& utf8filename(filename);
 #else
-        std::string utf8filename(osgDB::convertStringFromCurrentCodePageToUTF8(filename));
+        std::string utf8filename(convertStringFromCurrentCodePageToUTF8(filename));
 #endif