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
d2d9fd69
Commit
d2d9fd69
authored
Apr 10, 2018
by
Alexander Alekhin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
build: fix MSVS build problems
with 'CL=/permissive-'
parent
a68ffc81
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
6 deletions
+13
-6
color_lab.cpp
modules/imgproc/src/color_lab.cpp
+1
-1
cap_msmf.cpp
modules/videoio/src/cap_msmf.cpp
+11
-4
cap_msmf.hpp
modules/videoio/src/cap_msmf.hpp
+1
-1
No files found.
modules/imgproc/src/color_lab.cpp
View file @
d2d9fd69
...
...
@@ -700,7 +700,7 @@ struct XYZ2RGB_f<float>
:
dstcn
(
_dstcn
),
blueIdx
(
_blueIdx
)
{
for
(
int
i
=
0
;
i
<
9
;
i
++
)
coeffs
[
i
]
=
_coeffs
?
_coeffs
[
i
]
:
XYZ2sRGB_D65
[
i
];
coeffs
[
i
]
=
_coeffs
?
_coeffs
[
i
]
:
(
float
)
XYZ2sRGB_D65
[
i
];
if
(
blueIdx
==
0
)
{
std
::
swap
(
coeffs
[
0
],
coeffs
[
6
]);
...
...
modules/videoio/src/cap_msmf.cpp
View file @
d2d9fd69
...
...
@@ -543,7 +543,7 @@ public:
// Getting frame rate, which is getting from videodevice with deviceID
unsigned
int
getFrameRate
(
int
deviceID
)
const
;
// Getting name of videodevice with deviceID
wchar_t
*
getNameVideoDevice
(
int
deviceID
);
const
wchar_t
*
getNameVideoDevice
(
int
deviceID
);
// Getting interface MediaSource for Media Foundation from videodevice with deviceID
IMFMediaSource
*
getMediaSource
(
int
deviceID
);
// Getting format with id, which is supported by videodevice with deviceID
...
...
@@ -1371,8 +1371,10 @@ void ImageGrabberCallback::resumeGrabbing()
HRESULT
ImageGrabber
::
CreateTopology
(
IMFMediaSource
*
pSource
,
IMFActivate
*
pSinkActivate
,
IMFTopology
**
ppTopo
)
{
HRESULT
hr
=
S_OK
;
{
// "done:" scope
_ComPtr
<
IMFPresentationDescriptor
>
pPD
=
NULL
;
HRESULT
hr
=
!
pSource
?
E_POINTER
:
S_OK
;
CHECK_HR
(
hr
);
hr
=
!
pSource
?
E_POINTER
:
S_OK
;
CHECK_HR
(
hr
);
CHECK_HR
(
hr
=
pSource
->
CreatePresentationDescriptor
(
pPD
.
GetAddressOf
()));
DWORD
cStreams
=
0
;
...
...
@@ -1455,6 +1457,7 @@ HRESULT ImageGrabber::CreateTopology(IMFMediaSource *pSource, IMFActivate *pSink
else
hr
=
E_INVALIDARG
;
}
// "done:" scope
done
:
return
hr
;
}
...
...
@@ -2613,11 +2616,14 @@ HRESULT videoDevice::enumerateCaptureFormats(MAKE_WRL_REF(_MediaCapture) pSource
HRESULT
videoDevice
::
enumerateCaptureFormats
(
IMFMediaSource
*
pSource
)
{
HRESULT
hr
=
S_OK
;
{
// "done:" scope
_ComPtr
<
IMFPresentationDescriptor
>
pPD
=
NULL
;
_ComPtr
<
IMFStreamDescriptor
>
pSD
=
NULL
;
_ComPtr
<
IMFMediaTypeHandler
>
pHandler
=
NULL
;
_ComPtr
<
IMFMediaType
>
pType
=
NULL
;
HRESULT
hr
=
!
pSource
?
E_POINTER
:
S_OK
;
hr
=
!
pSource
?
E_POINTER
:
S_OK
;
if
(
FAILED
(
hr
))
{
goto
done
;
...
...
@@ -2655,6 +2661,7 @@ HRESULT videoDevice::enumerateCaptureFormats(IMFMediaSource *pSource)
vd_CurrentFormats
.
push_back
(
MT
);
}
}
// "done:" scope
done
:
return
hr
;
}
...
...
@@ -3234,7 +3241,7 @@ unsigned int videoInput::getFrameRate(int deviceID) const
return
0
;
}
wchar_t
*
videoInput
::
getNameVideoDevice
(
int
deviceID
)
const
wchar_t
*
videoInput
::
getNameVideoDevice
(
int
deviceID
)
{
if
(
deviceID
<
0
)
{
...
...
modules/videoio/src/cap_msmf.hpp
View file @
d2d9fd69
...
...
@@ -2088,7 +2088,7 @@ template <class T, bool NULLABLE = FALSE>
class
ComPtrList
:
public
List
<
T
*>
{
public
:
typedef
typename
List
<
T
*>::
Node
Node
;
typedef
T
*
Ptr
;
void
Clear
()
...
...
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