Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
BC
public
mediastreamer2
Commits
fecb9688
Commit
fecb9688
authored
Nov 05, 2014
by
Ghislain MARY
Browse files
Fix nowebcam image opening on Windows with UNICODE defined.
parent
18902ba6
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
4 deletions
+7
-4
src/videofilters/nowebcam.c
src/videofilters/nowebcam.c
+7
-4
No files found.
src/videofilters/nowebcam.c
View file @
fecb9688
...
...
@@ -177,13 +177,16 @@ mblk_t *ms_load_jpeg_as_yuv(const char *jpgpath, MSVideoSize *reqsize){
uint8_t
*
jpgbuf
;
DWORD
err
;
HANDLE
fd
;
#if
def
ined(
UNICODE
) && !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
#ifdef
UNICODE
WCHAR
wUnicode
[
1024
];
MultiByteToWideChar
(
CP_UTF8
,
0
,
jpgpath
,
-
1
,
wUnicode
,
1024
);
#else
const
char
*
wUnicode
=
jpgpath
;
#endif
#if !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
fd
=
CreateFile2
(
wUnicode
,
GENERIC_READ
,
FILE_SHARE_READ
,
OPEN_EXISTING
,
NULL
);
#else
fd
=
CreateFile
(
jpgpath
,
GENERIC_READ
,
FILE_SHARE_READ
,
NULL
,
OPEN_EXISTING
,
0
,
NULL
);
fd
=
CreateFile
(
wUnicode
,
GENERIC_READ
,
FILE_SHARE_READ
,
NULL
,
OPEN_EXISTING
,
0
,
NULL
);
#endif
if
(
fd
==
INVALID_HANDLE_VALUE
){
ms_error
(
"Failed to open %s"
,
jpgpath
);
...
...
@@ -191,7 +194,7 @@ mblk_t *ms_load_jpeg_as_yuv(const char *jpgpath, MSVideoSize *reqsize){
}
st_sizel
=
0
;
st_sizeh
=
0
;
#if
defined(UNICODE) &&
!WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
#if !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
{
WIN32_FILE_ATTRIBUTE_DATA
attr_data
;
GetFileAttributesEx
(
wUnicode
,
GetFileExInfoStandard
,
&
attr_data
);
...
...
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