Merge pull request #9139 from Cartucho:improve_match_template_py

[platform/upstream/opencv.git] / samples / gpu / opengl.cpp

diff --git a/samples/gpu/opengl.cpp b/samples/gpu/opengl.cpp
index 9e2c68c..dd2f913 100644 (file)
--- a/samples/gpu/opengl.cpp
+++ b/samples/gpu/opengl.cpp
@@ -1,13 +1,10 @@
 #include <iostream>
 
-#ifdef WIN32
+#ifdef _WIN32
     #define WIN32_LEAN_AND_MEAN 1
     #define NOMINMAX 1
     #include <windows.h>
 #endif
-#if defined(_WIN64)
-    #include <windows.h>
-#endif
 
 #if defined(__APPLE__)
     #include <OpenGL/gl.h>
@@ -105,8 +102,8 @@ int main(int argc, char* argv[])
     for (;;)
     {
         updateWindow("OpenGL");
-        int key = waitKey(40);
-        if ((key & 0xff) == 27)
+        char key = (char)waitKey(40);
+        if (key == 27)
             break;
     }