From: Roman Donchenko <roman.donchenko@itseez.com>
Date: Mon, 16 Feb 2015 16:31:51 +0000 (+0300)
Subject: cap_msmf.hpp: fix a warning about nNull being unused
X-Git-Tag: accepted/tizen/6.0/unified/20201030.111113~1314^2~277^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d218f280700d91f6df132c84f6519df16ba6890d;p=platform%2Fupstream%2Fopencv.git

cap_msmf.hpp: fix a warning about nNull being unused

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

diff --git a/modules/highgui/src/cap_msmf.hpp b/modules/highgui/src/cap_msmf.hpp
index c1b3f94..9ce2a9c 100644
--- a/modules/highgui/src/cap_msmf.hpp
+++ b/modules/highgui/src/cap_msmf.hpp
@@ -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.