diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-03-23 21:25:29 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-03-23 21:28:16 +0300 |
| commit | c1095c7a9f1c96a5bb249bed8e465e653a54a4dc (patch) | |
| tree | 33dad2cf404d65fa757720a0acf5e4cb9b18abe9 /intern/opencolorio | |
| parent | 376eb77fd7c97cbec27b824dc751a318e526a9eb (diff) | |
Revert "Fix T47869: OpenColorIO Error with unicode path to config file under Windows"
White the config itself could be loaded this way, lookup tables can not. Additionally,
that's not really clear how to solve the issue with search path which is multi-byte
only in the API.
Reverting for further investigation.
This reverts commit ab4307aa0868f2d8389cc0dd500eff38909b08f1.
Diffstat (limited to 'intern/opencolorio')
| -rw-r--r-- | intern/opencolorio/ocio_impl.cc | 37 |
1 files changed, 2 insertions, 35 deletions
diff --git a/intern/opencolorio/ocio_impl.cc b/intern/opencolorio/ocio_impl.cc index 5c05d18ac48..82536a74159 100644 --- a/intern/opencolorio/ocio_impl.cc +++ b/intern/opencolorio/ocio_impl.cc @@ -25,7 +25,6 @@ * ***** END GPL LICENSE BLOCK ***** */ -#include <fstream> #include <iostream> #include <sstream> #include <string.h> @@ -56,19 +55,6 @@ using namespace OCIO_NAMESPACE; # define __func__ __FUNCTION__ #endif -#ifdef _WIN32 -# ifndef NOGDI -# define NOGDI -# endif -# ifndef NOMINMAX -# define NOMINMAX -# endif -# ifndef WIN32_LEAN_AND_MEAN -# define WIN32_LEAN_AND_MEAN -# endif -# include <windows.h> -#endif - static void OCIO_reportError(const char *err) { std::cerr << "OpenColorIO Error: " << err << std::endl; @@ -135,26 +121,7 @@ OCIO_ConstConfigRcPtr *OCIOImpl::configCreateFromFile(const char *filename) ConstConfigRcPtr *config = OBJECT_GUARDED_NEW(ConstConfigRcPtr); try { -#ifdef _WIN32 - const int length_mb = strlen(filename); - const int length_wc = MultiByteToWideChar(CP_UTF8, - 0, - filename, - length_mb, - NULL, - 0); - std::wstring wfilename(length_wc, 0); - MultiByteToWideChar(CP_UTF8, - 0, - filename, - length_mb, - &wfilename[0], - length_wc); - std::fstream stream(wfilename); -#else - std::fstream stream(filename); -#endif - *config = Config::CreateFromStream(stream); + *config = Config::CreateFromFile(filename); if (*config) return (OCIO_ConstConfigRcPtr *) config; @@ -655,7 +622,7 @@ void OCIOImpl::matrixTransformScale(float *m44, float *offset4, const float *sca const char *OCIOImpl::getVersionString(void) { - return OCIO_NAMESPACE::GetVersion(); + return GetVersion(); } int OCIOImpl::getVersionHex(void) |