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

Invalid usage of cv::Ptr for arrays fixed.

Browse Source
This commit is contained in:
Alexander Smorkalov
2013-08-19 01:25:53 -07:00
parent 449b99a6d7
commit d62c98527a
3 changed files with 30 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
modules/core/src/system.cpp
View File

@@ -411,15 +411,14 @@ string tempfile( const char* suffix )
temp_file = temp_dir + std::wstring(L"\\") + temp_file;
DeleteFileW(temp_file.c_str());
size_t asize = wcstombs(NULL, temp_file.c_str(), 0);
Ptr<char> aname = new char[asize+1];
aname[asize] = 0;
wcstombs(aname, temp_file.c_str(), asize);
char aname[MAX_PATH];
size_t copied = wcstombs(aname, temp_file.c_str(), MAX_PATH);
CV_Assert((copied != MAX_PATH) && (copied != (size_t)-1));
fname = std::string(aname);
RoUninitialize();
#else
char temp_dir2[MAX_PATH + 1] = { 0 };
char temp_file[MAX_PATH + 1] = { 0 };
char temp_dir2[MAX_PATH] = { 0 };
char temp_file[MAX_PATH] = { 0 };
if (temp_dir == 0 || temp_dir[0] == 0)
{