Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
opencv
Commits
e03ffde3
Commit
e03ffde3
authored
Jul 25, 2013
by
Alexander Smorkalov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
WinRT API Certification fixes for core and contrib.
parent
62b85a41
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
9 deletions
+9
-9
inputoutput.cpp
modules/contrib/src/inputoutput.cpp
+9
-8
system.cpp
modules/core/src/system.cpp
+0
-1
No files found.
modules/contrib/src/inputoutput.cpp
View file @
e03ffde3
#include "opencv2/contrib/contrib.hpp"
#include "opencv2/contrib/contrib.hpp"
#include <cvconfig.h>
#if defined(WIN32) || defined(_WIN32)
#if defined(WIN32) || defined(_WIN32)
#include <windows.h>
#include <windows.h>
...
@@ -16,7 +17,7 @@ namespace cv
...
@@ -16,7 +17,7 @@ namespace cv
list
.
clear
();
list
.
clear
();
std
::
string
path_f
=
path
+
"/"
+
exten
;
std
::
string
path_f
=
path
+
"/"
+
exten
;
#ifdef WIN32
#ifdef WIN32
#if HAVE_WINRT
#if
def
HAVE_WINRT
WIN32_FIND_DATAW
FindFileData
;
WIN32_FIND_DATAW
FindFileData
;
#else
#else
WIN32_FIND_DATA
FindFileData
;
WIN32_FIND_DATA
FindFileData
;
...
@@ -28,7 +29,7 @@ namespace cv
...
@@ -28,7 +29,7 @@ namespace cv
wchar_t
*
wpath
=
(
wchar_t
*
)
malloc
((
size
+
1
)
*
sizeof
(
wchar_t
));
wchar_t
*
wpath
=
(
wchar_t
*
)
malloc
((
size
+
1
)
*
sizeof
(
wchar_t
));
wpath
[
size
]
=
0
;
wpath
[
size
]
=
0
;
mbstowcs
(
wpath
,
path_f
.
c_str
(),
path_f
.
size
());
mbstowcs
(
wpath
,
path_f
.
c_str
(),
path_f
.
size
());
hFind
=
FindFirstFile
W
(
wpath
,
&
FindFileData
);
hFind
=
FindFirstFile
ExW
(
wpath
,
FindExInfoStandard
,
&
FindFileData
,
FindExSearchNameMatch
,
NULL
,
0
);
free
(
wpath
);
free
(
wpath
);
#else
#else
hFind
=
FindFirstFileA
((
LPCSTR
)
path_f
.
c_str
(),
&
FindFileData
);
hFind
=
FindFirstFileA
((
LPCSTR
)
path_f
.
c_str
(),
&
FindFileData
);
...
@@ -50,7 +51,7 @@ namespace cv
...
@@ -50,7 +51,7 @@ namespace cv
char
*
fname
;
char
*
fname
;
#ifdef HAVE_WINRT
#ifdef HAVE_WINRT
size_t
asize
=
wcstombs
(
NULL
,
FindFileData
.
cFileName
,
0
);
size_t
asize
=
wcstombs
(
NULL
,
FindFileData
.
cFileName
,
0
);
char
*
fname
=
(
char
*
)
malloc
((
asize
+
1
)
*
sizeof
(
char
));
fname
=
(
char
*
)
malloc
((
asize
+
1
)
*
sizeof
(
char
));
fname
[
asize
]
=
0
;
fname
[
asize
]
=
0
;
wcstombs
(
fname
,
FindFileData
.
cFileName
,
asize
);
wcstombs
(
fname
,
FindFileData
.
cFileName
,
asize
);
#else
#else
...
@@ -104,7 +105,7 @@ namespace cv
...
@@ -104,7 +105,7 @@ namespace cv
std
::
string
path_f
=
path
+
"/"
+
exten
;
std
::
string
path_f
=
path
+
"/"
+
exten
;
list
.
clear
();
list
.
clear
();
#ifdef WIN32
#ifdef WIN32
#if HAVE_WINRT
#if
def
HAVE_WINRT
WIN32_FIND_DATAW
FindFileData
;
WIN32_FIND_DATAW
FindFileData
;
#else
#else
WIN32_FIND_DATA
FindFileData
;
WIN32_FIND_DATA
FindFileData
;
...
@@ -116,7 +117,7 @@ namespace cv
...
@@ -116,7 +117,7 @@ namespace cv
wchar_t
*
wpath
=
(
wchar_t
*
)
malloc
((
size
+
1
)
*
sizeof
(
wchar_t
));
wchar_t
*
wpath
=
(
wchar_t
*
)
malloc
((
size
+
1
)
*
sizeof
(
wchar_t
));
wpath
[
size
]
=
0
;
wpath
[
size
]
=
0
;
mbstowcs
(
wpath
,
path_f
.
c_str
(),
path_f
.
size
());
mbstowcs
(
wpath
,
path_f
.
c_str
(),
path_f
.
size
());
hFind
=
FindFirstFile
W
(
wpath
,
&
FindFileData
);
hFind
=
FindFirstFile
ExW
(
wpath
,
FindExInfoStandard
,
&
FindFileData
,
FindExSearchNameMatch
,
NULL
,
0
);
free
(
wpath
);
free
(
wpath
);
#else
#else
hFind
=
FindFirstFileA
((
LPCSTR
)
path_f
.
c_str
(),
&
FindFileData
);
hFind
=
FindFirstFileA
((
LPCSTR
)
path_f
.
c_str
(),
&
FindFileData
);
...
@@ -130,13 +131,13 @@ namespace cv
...
@@ -130,13 +131,13 @@ namespace cv
do
do
{
{
if
(
FindFileData
.
dwFileAttributes
==
FILE_ATTRIBUTE_DIRECTORY
&&
if
(
FindFileData
.
dwFileAttributes
==
FILE_ATTRIBUTE_DIRECTORY
&&
strcmp
(
FindFileData
.
cFileName
,
"."
)
!=
0
&&
wcscmp
(
FindFileData
.
cFileName
,
L
"."
)
!=
0
&&
strcmp
(
FindFileData
.
cFileName
,
".."
)
!=
0
)
wcscmp
(
FindFileData
.
cFileName
,
L
".."
)
!=
0
)
{
{
char
*
fname
;
char
*
fname
;
#ifdef HAVE_WINRT
#ifdef HAVE_WINRT
size_t
asize
=
wcstombs
(
NULL
,
FindFileData
.
cFileName
,
0
);
size_t
asize
=
wcstombs
(
NULL
,
FindFileData
.
cFileName
,
0
);
char
*
fname
=
(
char
*
)
malloc
((
asize
+
1
)
*
sizeof
(
char
));
fname
=
(
char
*
)
malloc
((
asize
+
1
)
*
sizeof
(
char
));
fname
[
asize
]
=
0
;
fname
[
asize
]
=
0
;
wcstombs
(
fname
,
FindFileData
.
cFileName
,
asize
);
wcstombs
(
fname
,
FindFileData
.
cFileName
,
asize
);
#else
#else
...
...
modules/core/src/system.cpp
View file @
e03ffde3
...
@@ -81,7 +81,6 @@
...
@@ -81,7 +81,6 @@
#ifdef HAVE_WINRT
#ifdef HAVE_WINRT
#include <wrl/client.h>
#include <wrl/client.h>
#pragma comment(lib, "MinCore_Downlevel")
std
::
wstring
GetTempPathWinRT
()
std
::
wstring
GetTempPathWinRT
()
{
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment