Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
e4307d05
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,发现更多精彩内容 >>
提交
e4307d05
编写于
3月 13, 2012
作者:
A
Andrey Kamaev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Made dependency of features2d and calib3d from highgui optional
上级
d68311b9
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
46 addition
and
9 deletion
+46
-9
cmake/OpenCVModule.cmake
cmake/OpenCVModule.cmake
+6
-1
modules/calib3d/src/calibinit.cpp
modules/calib3d/src/calibinit.cpp
+8
-2
modules/calib3d/src/checkchessboard.cpp
modules/calib3d/src/checkchessboard.cpp
+6
-1
modules/calib3d/src/circlesgrid.cpp
modules/calib3d/src/circlesgrid.cpp
+6
-1
modules/features2d/CMakeLists.txt
modules/features2d/CMakeLists.txt
+1
-1
modules/features2d/src/blobdetector.cpp
modules/features2d/src/blobdetector.cpp
+6
-1
modules/features2d/src/oneway.cpp
modules/features2d/src/oneway.cpp
+13
-1
modules/objdetect/src/datamatrix.cpp
modules/objdetect/src/datamatrix.cpp
+0
-1
未找到文件。
cmake/OpenCVModule.cmake
浏览文件 @
e4307d05
...
...
@@ -277,7 +277,12 @@ macro(ocv_glob_modules)
if
(
__ocvmodules
)
list
(
SORT __ocvmodules
)
foreach
(
mod
${
__ocvmodules
}
)
if
(
EXISTS
"
${
__path
}
/
${
mod
}
/CMakeLists.txt"
)
if
(
CMAKE_VERSION VERSION_LESS 2.8
)
get_filename_component
(
__realpath
"
${
__path
}
/
${
mod
}
"
ABSOLUTE
)
else
()
get_filename_component
(
__realpath
"
${
__path
}
/
${
mod
}
"
REALPATH
)
endif
()
if
(
EXISTS
"
${
__realpath
}
/CMakeLists.txt"
AND NOT __realpath STREQUAL CMAKE_CURRENT_SOURCE_DIR
)
add_subdirectory
(
"
${
__path
}
/
${
mod
}
"
"
${
CMAKE_CURRENT_BINARY_DIR
}
/
${
mod
}
/.
${
mod
}
"
)
endif
()
endforeach
()
...
...
modules/calib3d/src/calibinit.cpp
浏览文件 @
e4307d05
...
...
@@ -65,16 +65,22 @@
//#define ENABLE_TRIM_COL_ROW
//#pragma comment(lib, "highgui200d.lib")
//#define DEBUG_CHESSBOARD
#ifdef DEBUG_CHESSBOARD
# include "opencv2/opencv_modules.hpp"
# ifdef HAVE_OPENCV_HIGHGUI
# include "opencv2/highgui/highgui.hpp"
# else
# undef DEBUG_CHESSBOARD
# endif
#endif
#ifdef DEBUG_CHESSBOARD
static
int
PRINTF
(
const
char
*
fmt
,
...
)
{
va_list
args
;
va_start
(
args
,
fmt
);
return
vprintf
(
fmt
,
args
);
}
#include "..//..//include/opencv/highgui.h"
#else
static
int
PRINTF
(
const
char
*
,
...
)
{
...
...
modules/calib3d/src/checkchessboard.cpp
浏览文件 @
e4307d05
...
...
@@ -47,7 +47,12 @@
//#define DEBUG_WINDOWS
#if defined(DEBUG_WINDOWS)
#include "highgui.h"
# include "opencv2/opencv_modules.hpp"
# ifdef HAVE_OPENCV_HIGHGUI
# include "opencv2/highgui/highgui.hpp"
# else
# undef DEBUG_WINDOWS
# endif
#endif
void
icvGetQuadrangleHypotheses
(
CvSeq
*
contours
,
std
::
vector
<
std
::
pair
<
float
,
int
>
>&
quads
,
int
class_id
)
...
...
modules/calib3d/src/circlesgrid.cpp
浏览文件 @
e4307d05
...
...
@@ -44,7 +44,12 @@
//#define DEBUG_CIRCLES
#ifdef DEBUG_CIRCLES
#include "opencv2/highgui/highgui.hpp"
# include "opencv2/opencv_modules.hpp"
# ifdef HAVE_OPENCV_HIGHGUI
# include "opencv2/highgui/highgui.hpp"
# else
# undef DEBUG_CIRCLES
# endif
#endif
using
namespace
cv
;
...
...
modules/features2d/CMakeLists.txt
浏览文件 @
e4307d05
set
(
the_description
"2D Features Framework"
)
ocv_define_module
(
features2d opencv_imgproc opencv_
highgui opencv_flann
)
ocv_define_module
(
features2d opencv_imgproc opencv_
flann OPTIONAL opencv_highgui
)
modules/features2d/src/blobdetector.cpp
浏览文件 @
e4307d05
...
...
@@ -46,7 +46,12 @@
//#define DEBUG_BLOB_DETECTOR
#ifdef DEBUG_BLOB_DETECTOR
#include "opencv2/highgui/highgui.hpp"
# include "opencv2/opencv_modules.hpp"
# ifdef HAVE_OPENCV_HIGHGUI
# include "opencv2/highgui/highgui.hpp"
# else
# undef DEBUG_BLOB_DETECTOR
# endif
#endif
using
namespace
cv
;
...
...
modules/features2d/src/oneway.cpp
浏览文件 @
e4307d05
...
...
@@ -8,9 +8,13 @@
*/
#include "precomp.hpp"
#include "opencv2/
highgui/highgui
.hpp"
#include "opencv2/
opencv_modules
.hpp"
#include <stdio.h>
#ifdef HAVE_OPENCV_HIGHGUI
# include "opencv2/highgui/highgui.hpp"
#endif
namespace
cv
{
inline
int
round
(
float
value
)
...
...
@@ -655,6 +659,7 @@ namespace cv{
void
OneWayDescriptor
::
Save
(
const
char
*
path
)
{
#ifdef HAVE_OPENCV_HIGHGUI
for
(
int
i
=
0
;
i
<
m_pose_count
;
i
++
)
{
char
buf
[
1024
];
...
...
@@ -669,6 +674,9 @@ namespace cv{
cvReleaseImage
(
&
patch
);
}
#else
CV_Error
(
CV_StsNotImplemented
,
"This method required opencv_highgui disabled in current build"
);
#endif
}
void
OneWayDescriptor
::
Write
(
CvFileStorage
*
fs
,
const
char
*
name
)
...
...
@@ -1772,6 +1780,7 @@ namespace cv{
void
loadPCAFeatures
(
const
char
*
path
,
const
char
*
images_list
,
vector
<
IplImage
*>&
patches
,
CvSize
patch_size
)
{
#ifdef HAVE_OPENCV_HIGHGUI
char
images_filename
[
1024
];
sprintf
(
images_filename
,
"%s/%s"
,
path
,
images_list
);
FILE
*
pFile
=
fopen
(
images_filename
,
"r"
);
...
...
@@ -1800,6 +1809,9 @@ namespace cv{
cvReleaseImage
(
&
img
);
}
fclose
(
pFile
);
#else
CV_Error
(
CV_StsNotImplemented
,
"This method required opencv_highgui disabled in current build"
);
#endif
}
void
generatePCAFeatures
(
const
char
*
path
,
const
char
*
img_filename
,
FileStorage
&
fs
,
const
char
*
postfix
,
...
...
modules/objdetect/src/datamatrix.cpp
浏览文件 @
e4307d05
...
...
@@ -493,7 +493,6 @@ endo: ; // end search for this o
}
#include <opencv2/imgproc/imgproc.hpp>
#include <opencv2/highgui/highgui.hpp>
namespace
cv
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录