Merge pull request #5146 from avershov:fix-issue-5122

11b3529b · Alexander Alekhin · 53effc52 · c7f420ba · 11b3529b · 11b3529b
Commit 11b3529b authored Aug 07, 2015 by Alexander Alekhin
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

opengl_interop.cpp samples/opengl/opengl_interop.cpp +1 -1

winapp.hpp samples/opengl/winapp.hpp +1 -1

No files found.
--- a/samples/opengl/opengl_interop.cpp
+++ b/samples/opengl/opengl_interop.cpp
@@ -329,7 +329,7 @@ public:
            glXSwapBuffers(m_display, m_window);
 #endif

-            print_info(mode, m_timer.time(Timer::UNITS::MSEC), m_oclDevName);
+            print_info(mode, m_timer.time(Timer::MSEC), m_oclDevName);
        }



--- a/samples/opengl/winapp.hpp
+++ b/samples/opengl/winapp.hpp
@@ -56,7 +56,7 @@ public:
        m_diff = cv::getTickCount() - m_t0;
    }

-    float time(UNITS u = UNITS::MSEC)
+    float time(UNITS u = MSEC)
    {
        float sec = m_diff / m_tick_frequency;