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

Merge pull request #2093 from SpecLad:merge-2.4

Browse Source
This commit is contained in:
Andrey Pavlenko
2013-12-31 00:26:22 +04:00
committed by OpenCV Buildbot
parent 8a456c5a6b cdc10defa3
commit 967703c3ac
43 changed files with 182 additions and 661 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -107,7 +107,7 @@ std::wstring GetTempPathWinRT()
if (FAILED(WindowsCreateStringReference(RuntimeClass_Windows_Storage_ApplicationData,
(UINT32)wcslen(RuntimeClass_Windows_Storage_ApplicationData), &hstrHead, &str)))
return wstr;
if (FAILED(Windows::Foundation::GetActivationFactory(str, appdataFactory.ReleaseAndGetAddressOf())))
if (FAILED(RoGetActivationFactory(str, IID_PPV_ARGS(appdataFactory.ReleaseAndGetAddressOf()))))
return wstr;
if (FAILED(appdataFactory->get_Current(appdataRef.ReleaseAndGetAddressOf())))
return wstr;