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
539f8032
Commit
539f8032
authored
Sep 19, 2014
by
Artur Wieczorek
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed compilation errors under VS 2010 and Win 7
parent
772f6208
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
1 deletion
+15
-1
cap_msmf.cpp
modules/highgui/src/cap_msmf.cpp
+3
-1
cap_msmf.hpp
modules/highgui/src/cap_msmf.hpp
+12
-0
No files found.
modules/highgui/src/cap_msmf.cpp
View file @
539f8032
...
...
@@ -1500,11 +1500,13 @@ HRESULT ImageGrabber::startGrabbing(void)
DebugPrintOut
(
L"IMAGEGRABBER VIDEODEVICE %i: MESessionStopped
\n
"
,
ig_DeviceID
);
break
;
}
#if (WINVER >= 0x0602) // Available since Win 8
if
(
met
==
MEVideoCaptureDeviceRemoved
)
{
DebugPrintOut
(
L"IMAGEGRABBER VIDEODEVICE %i: MEVideoCaptureDeviceRemoved
\n
"
,
ig_DeviceID
);
break
;
}
#endif
if
((
met
==
MEError
)
||
(
met
==
MENonFatalError
))
{
pEvent
->
GetStatus
(
&
hrStatus
);
...
...
@@ -4110,7 +4112,7 @@ const GUID CvVideoWriter_MSMF::FourCC2GUID(int fourcc)
return
MFVideoFormat_DVSD
;
break
;
case
CV_FOURCC_MACRO
(
'd'
,
'v'
,
's'
,
'l'
):
return
MFVideoFormat_DVSL
;
break
;
#if (WINVER >=
_WIN32_WINNT_WIN8
)
#if (WINVER >=
0x0602
)
case
CV_FOURCC_MACRO
(
'H'
,
'2'
,
'6'
,
'3'
):
// Available only for Win 8 target.
return
MFVideoFormat_H263
;
break
;
#endif
...
...
modules/highgui/src/cap_msmf.hpp
View file @
539f8032
...
...
@@ -333,6 +333,7 @@ MAKE_ENUM(MediaEventType) MediaEventTypePairs[] = {
MAKE_ENUM_PAIR
(
MediaEventType
,
MEAudioSessionDisconnected
),
MAKE_ENUM_PAIR
(
MediaEventType
,
MEAudioSessionExclusiveModeOverride
),
MAKE_ENUM_PAIR
(
MediaEventType
,
MESinkV1Anchor
),
#if (WINVER >= 0x0602) // Available since Win 8
MAKE_ENUM_PAIR
(
MediaEventType
,
MECaptureAudioSessionVolumeChanged
),
MAKE_ENUM_PAIR
(
MediaEventType
,
MECaptureAudioSessionDeviceRemoved
),
MAKE_ENUM_PAIR
(
MediaEventType
,
MECaptureAudioSessionFormatChanged
),
...
...
@@ -340,6 +341,7 @@ MAKE_ENUM(MediaEventType) MediaEventTypePairs[] = {
MAKE_ENUM_PAIR
(
MediaEventType
,
MECaptureAudioSessionExclusiveModeOverride
),
MAKE_ENUM_PAIR
(
MediaEventType
,
MECaptureAudioSessionServerShutdown
),
MAKE_ENUM_PAIR
(
MediaEventType
,
MESinkV2Anchor
),
#endif
MAKE_ENUM_PAIR
(
MediaEventType
,
METrustUnknown
),
MAKE_ENUM_PAIR
(
MediaEventType
,
MEPolicyChanged
),
MAKE_ENUM_PAIR
(
MediaEventType
,
MEContentProtectionMessage
),
...
...
@@ -361,9 +363,11 @@ MAKE_ENUM(MediaEventType) MediaEventTypePairs[] = {
MAKE_ENUM_PAIR
(
MediaEventType
,
METransformHaveOutput
),
MAKE_ENUM_PAIR
(
MediaEventType
,
METransformDrainComplete
),
MAKE_ENUM_PAIR
(
MediaEventType
,
METransformMarker
),
#if (WINVER >= 0x0602) // Available since Win 8
MAKE_ENUM_PAIR
(
MediaEventType
,
MEByteStreamCharacteristicsChanged
),
MAKE_ENUM_PAIR
(
MediaEventType
,
MEVideoCaptureDeviceRemoved
),
MAKE_ENUM_PAIR
(
MediaEventType
,
MEVideoCaptureDevicePreempted
),
#endif
MAKE_ENUM_PAIR
(
MediaEventType
,
MEReservedMax
)
};
MAKE_MAP
(
MediaEventType
)
MediaEventTypeMap
(
MediaEventTypePairs
,
MediaEventTypePairs
+
sizeof
(
MediaEventTypePairs
)
/
sizeof
(
MediaEventTypePairs
[
0
]));
...
...
@@ -1050,7 +1054,11 @@ class StreamSink :
{
public
:
// IUnknown methods
#if defined(_MSC_VER) && _MSC_VER >= 1700 // '_Outptr_result_nullonfailure_' SAL is avaialable since VS 2012
STDMETHOD
(
QueryInterface
)(
REFIID
riid
,
_Outptr_result_nullonfailure_
void
**
ppv
)
#else
STDMETHOD
(
QueryInterface
)(
REFIID
riid
,
void
**
ppv
)
#endif
{
if
(
ppv
==
nullptr
)
{
return
E_POINTER
;
...
...
@@ -2389,7 +2397,11 @@ public:
}
return
cRef
;
}
#if defined(_MSC_VER) && _MSC_VER >= 1700 // '_Outptr_result_nullonfailure_' SAL is avaialable since VS 2012
STDMETHOD
(
QueryInterface
)(
REFIID
riid
,
_Outptr_result_nullonfailure_
void
**
ppv
)
#else
STDMETHOD
(
QueryInterface
)(
REFIID
riid
,
void
**
ppv
)
#endif
{
if
(
ppv
==
nullptr
)
{
return
E_POINTER
;
...
...
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