projects
/
platform
/
upstream
/
opencv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
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
6bed4e3
..
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>