applied changes proposed in 5122

larshg · Aug 6, 2015 · c7f420b · c7f420b
1 parent 573858f
commit c7f420b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/samples/opengl/opengl_interop.cpp b/samples/opengl/opengl_interop.cpp
@@ -329,7 +329,7 @@ class GLWinApp : public WinApp
             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);
         }
 
 

diff --git a/samples/opengl/winapp.hpp b/samples/opengl/winapp.hpp
@@ -56,7 +56,7 @@ class Timer
         m_diff = cv::getTickCount() - m_t0;
     }
 
-    float time(UNITS u = UNITS::MSEC)
+    float time(UNITS u = MSEC)
     {
         float sec = m_diff / m_tick_frequency;
-Original file line number
+Diff line change
@@ Expand Up / @@ -329,7 +329,7 @@ class GLWinApp : public WinApp @@
                 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);
             }
@@ Expand Down @@