mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-24 19:20:28 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

cap_msmf.hpp: fix a warning about nNull being unused

Browse Source 
The two functions featuring nNull are not particularly needed, so
I simply removed them.

Conflicts:
	modules/highgui/src/cap_msmf.hpp
This commit is contained in:
Roman Donchenko 2015-02-16 19:31:51 +03:00 committed by Dikay900
parent b99f7a29df
commit 5455e38e15
1 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
modules/videoio/src/cap_msmf.hpp
View File

@ -603,11 +603,6 @@ public:
ComPtr() throw() ComPtr() throw()
{ {
} }
ComPtr(int nNull) throw()
{
assert(nNull == 0);
p = NULL;
}
ComPtr(T* lp) throw() ComPtr(T* lp) throw()
{ {
p = lp; p = lp;
@ -638,13 +633,6 @@ public:
{ {
return p.operator==(pT); return p.operator==(pT);
} }
// For comparison to NULL
bool operator==(int nNull) const
{
assert(nNull == 0);
return p.operator==(NULL);
}
bool operator!=(_In_opt_ T* pT) const throw() bool operator!=(_In_opt_ T* pT) const throw()
{ {
return p.operator!=(pT); return p.operator!=(pT);
@ -3123,7 +3111,7 @@ public:
HRESULT hr = CheckShutdown(); HRESULT hr = CheckShutdown();
if (SUCCEEDED(hr)) { if (SUCCEEDED(hr)) {
if (m_spClock == NULL) { if (!m_spClock) {
hr = MF_E_NO_CLOCK; // There is no presentation clock. hr = MF_E_NO_CLOCK; // There is no presentation clock.
} else { } else {
// Return the pointer to the caller. // Return the pointer to the caller.