generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #3705 from SpecLad:unused-nNull

Browse Source
This commit is contained in:
Vadim Pisarevsky 2015-02-19 18:40:22 +00:00
commit 65e4df751c
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/highgui/src/cap_msmf.hpp
View File

@ -609,11 +609,6 @@ public:
ComPtr() throw()
{
}
ComPtr(int nNull) throw()
{
assert(nNull == 0);
p = NULL;
}
ComPtr(T* lp) throw()
{
p = lp;
@ -644,13 +639,6 @@ public:
{
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()
{
return p.operator!=(pT);
@ -3129,7 +3117,7 @@ public:
HRESULT hr = CheckShutdown();
if (SUCCEEDED(hr)) {
if (m_spClock == NULL) {
if (!m_spClock) {
hr = MF_E_NO_CLOCK; // There is no presentation clock.
} else {
// Return the pointer to the caller.