diff options
Diffstat (limited to 'plugins/AdvaImg/src/FreeImage/Plugin.cpp')
| -rw-r--r-- | plugins/AdvaImg/src/FreeImage/Plugin.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/plugins/AdvaImg/src/FreeImage/Plugin.cpp b/plugins/AdvaImg/src/FreeImage/Plugin.cpp index 6f88e47e68..13da67434e 100644 --- a/plugins/AdvaImg/src/FreeImage/Plugin.cpp +++ b/plugins/AdvaImg/src/FreeImage/Plugin.cpp @@ -218,7 +218,7 @@ FreeImage_GetPluginList() { void DLL_CALLCONV FreeImage_Initialise(BOOL load_local_plugins_only) { if (s_plugin_reference_count++ == 0) { - + /* Note: initialize all singletons here in order to avoid race conditions with multi-threading @@ -261,8 +261,8 @@ FreeImage_Initialise(BOOL load_local_plugins_only) { //s_plugins->AddNode(InitXBM); //s_plugins->AddNode(InitXPM); //s_plugins->AddNode(InitDDS); - s_plugins->AddNode(InitGIF); - //s_plugins->AddNode(InitHDR); + s_plugins->AddNode(InitGIF); + //s_plugins->AddNode(InitHDR); //s_plugins->AddNode(InitG3); //s_plugins->AddNode(InitSGI); //s_plugins->AddNode(InitEXR); @@ -275,26 +275,26 @@ FreeImage_Initialise(BOOL load_local_plugins_only) { //#if !(defined(_MSC_VER) && (_MSC_VER <= 1310)) //s_plugins->AddNode(InitJXR); //#endif // unsupported by MS Visual Studio 2003 !!! - + // external plugin initialization #ifdef _WIN32 if (!load_local_plugins_only) { int count = 0; char buffer[MAX_PATH + 200]; - char current_dir[2 * _MAX_PATH], module[2 * _MAX_PATH]; + wchar_t current_dir[2 * _MAX_PATH], module[2 * _MAX_PATH]; BOOL bOk = FALSE; // store the current directory. then set the directory to the application location - if (GetCurrentDirectoryA(2 * _MAX_PATH, current_dir) != 0) { - if (GetModuleFileNameA(NULL, module, 2 * _MAX_PATH) != 0) { - char *last_point = strrchr(module, '\\'); + if (GetCurrentDirectoryW(2 * _MAX_PATH, current_dir) != 0) { + if (GetModuleFileNameW(NULL, module, 2 * _MAX_PATH) != 0) { + wchar_t *last_point = wcsrchr(module, L'\\'); if (last_point) { - *last_point = '\0'; + *last_point = L'\0'; - bOk = SetCurrentDirectoryA(module); + bOk = SetCurrentDirectoryW(module); } } } @@ -335,7 +335,7 @@ FreeImage_Initialise(BOOL load_local_plugins_only) { // restore the current directory if (bOk) { - SetCurrentDirectoryA(current_dir); + SetCurrentDirectoryW(current_dir); } } #endif // _WIN32 |