generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #218 from taka-no-me:drop_utf16

Browse Source
This commit is contained in:
Vadim Pisarevsky
2012-12-16 22:16:53 +04:00
committed by OpenCV Buildbot
parent d6add763c7 18e77d606c
commit 2508d8e2b4
2 changed files with 0 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
modules/core/include/opencv2/core/core.hpp
View File

@@ -109,13 +109,6 @@ template<typename _Tp> class CV_EXPORTS MatIterator_;
template<typename _Tp> class CV_EXPORTS MatConstIterator_;
template<typename _Tp> class CV_EXPORTS MatCommaInitializer_;
#if !defined(ANDROID) || (defined(_GLIBCXX_USE_WCHAR_T) && _GLIBCXX_USE_WCHAR_T)
typedef std::basic_string<wchar_t> WString;
CV_EXPORTS string fromUtf16(const WString& str);
CV_EXPORTS WString toUtf16(const string& str);
#endif
CV_EXPORTS string format( const char* fmt, ... );
CV_EXPORTS string tempfile( const char* suffix CV_DEFAULT(0));