Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
c9027fec
O
Opencv
项目概览
Greenplum
/
Opencv
大约 1 年 前同步成功
通知
7
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
O
Opencv
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
c9027fec
编写于
5月 20, 2012
作者:
A
Andrey Kamaev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fixed few MinGW build problems
上级
5a3cbadf
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
22 addition
and
10 deletion
+22
-10
cmake/OpenCVDetectPython.cmake
cmake/OpenCVDetectPython.cmake
+1
-1
cmake/OpenCVUtils.cmake
cmake/OpenCVUtils.cmake
+13
-6
modules/highgui/src/window_w32.cpp
modules/highgui/src/window_w32.cpp
+8
-3
未找到文件。
cmake/OpenCVDetectPython.cmake
浏览文件 @
c9027fec
if
(
MSVC
AND NOT PYTHON_EXECUTABLE
)
if
(
WIN32
AND NOT PYTHON_EXECUTABLE
)
# search for executable with the same bitness as resulting binaries
# standard FindPythonInterp always prefers executable from system path
# this is really important because we are using the interpreter for numpy search and for choosing the install location
...
...
cmake/OpenCVUtils.cmake
浏览文件 @
c9027fec
...
...
@@ -11,7 +11,7 @@ if(NOT COMMAND find_host_program)
endmacro
()
endif
()
#
added
include directories in such way that directories from the OpenCV source tree go first
#
adds
include directories in such way that directories from the OpenCV source tree go first
function
(
ocv_include_directories
)
set
(
__add_before
""
)
foreach
(
dir
${
ARGN
}
)
...
...
@@ -25,6 +25,12 @@ function(ocv_include_directories)
include_directories
(
BEFORE
${
__add_before
}
)
endfunction
()
# clears all passed variables
macro
(
ocv_clear_vars
)
foreach
(
_var
${
ARGN
}
)
unset
(
${
_var
}
CACHE
)
endforeach
()
endmacro
()
# Provides an option that the user can optionally select.
# Can accept condition to control when option is available for user.
...
...
@@ -352,10 +358,11 @@ macro(ocv_parse_header2 LIBNAME HDR_PATH VARNAME SCOPE)
set
(
${
LIBNAME
}
_VERSION_STRING
"
${${
LIBNAME
}
_VERSION_STRING
}
.
${${
LIBNAME
}
_VERSION_TWEAK
}
"
${
SCOPE
}
)
endif
()
else
()
unset
(
${
LIBNAME
}
_VERSION_MAJOR CACHE
)
unset
(
${
LIBNAME
}
_VERSION_MINOR CACHE
)
unset
(
${
LIBNAME
}
_VERSION_PATCH CACHE
)
unset
(
${
LIBNAME
}
_VERSION_TWEAK CACHE
)
unset
(
${
LIBNAME
}
_VERSION_STRING CACHE
)
ocv_clear_vars
(
${
LIBNAME
}
_VERSION_MAJOR
${
LIBNAME
}
_VERSION_MAJOR
${
LIBNAME
}
_VERSION_MINOR
${
LIBNAME
}
_VERSION_PATCH
${
LIBNAME
}
_VERSION_TWEAK
${
LIBNAME
}
_VERSION_STRING
)
endif
()
endmacro
()
modules/highgui/src/window_w32.cpp
浏览文件 @
c9027fec
...
...
@@ -978,6 +978,11 @@ CV_IMPL int cvNamedWindow( const char* name, int flags )
DWORD
defStyle
=
WS_VISIBLE
|
WS_MINIMIZEBOX
|
WS_MAXIMIZEBOX
|
WS_SYSMENU
;
int
len
;
CvRect
rect
;
#ifdef HAVE_OPENGL
bool
useGl
;
HDC
hGLDC
;
HGLRC
hGLRC
;
#endif
cvInitSystem
(
0
,
0
);
...
...
@@ -1013,9 +1018,9 @@ CV_IMPL int cvNamedWindow( const char* name, int flags )
if
(
flags
&
CV_WINDOW_OPENGL
)
CV_ERROR
(
CV_OpenGlNotSupported
,
"Library was built without OpenGL support"
);
#else
bool
useGl
=
false
;
HDC
hGLDC
=
0
;
HGLRC
hGLRC
=
0
;
useGl
=
false
;
hGLDC
=
0
;
hGLRC
=
0
;
if
(
flags
&
CV_WINDOW_OPENGL
)
createGlContext
(
hWnd
,
hGLDC
,
hGLRC
,
useGl
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录