Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
4c66b876
O
Opencv
项目概览
Greenplum
/
Opencv
11 个月 前同步成功
通知
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,发现更多精彩内容 >>
提交
4c66b876
编写于
12月 07, 2013
作者:
A
Anatoly Baksheev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fixed -Wshadow and other warnings, added rvec test
上级
f62ffa2a
变更
4
显示空白变更内容
内联
并排
Showing
4 changed file
with
33 addition
and
18 deletion
+33
-18
modules/calib3d/test/test_affine3.cpp
modules/calib3d/test/test_affine3.cpp
+27
-0
modules/viz/include/opencv2/viz/types.hpp
modules/viz/include/opencv2/viz/types.hpp
+2
-2
modules/viz/src/precomp.hpp
modules/viz/src/precomp.hpp
+0
-14
modules/viz/src/viz3d_impl.cpp
modules/viz/src/viz3d_impl.cpp
+4
-2
未找到文件。
modules/calib3d/test/test_affine3.cpp
浏览文件 @
4c66b876
...
...
@@ -79,3 +79,30 @@ TEST(Calib3d_Affine3f, accuracy)
ASSERT_LT
(
cv
::
norm
(
diff
,
cv
::
NORM_INF
),
1e-15
);
}
TEST
(
Calib3d_Affine3f
,
accuracy_rvec
)
{
cv
::
RNG
rng
;
typedef
float
T
;
cv
::
Affine3
<
T
>::
Vec3
w
;
cv
::
Affine3
<
T
>::
Mat3
u
,
vt
,
R
;
for
(
int
i
=
0
;
i
<
100
;
++
i
)
{
rng
.
fill
(
R
,
cv
::
RNG
::
UNIFORM
,
-
10
,
10
,
true
);
cv
::
SVD
::
compute
(
R
,
w
,
u
,
vt
,
cv
::
SVD
::
FULL_UV
+
cv
::
SVD
::
MODIFY_A
);
R
=
u
*
vt
;
//double s = (double)cv::getTickCount();
cv
::
Affine3
<
T
>::
Vec3
va
=
cv
::
Affine3
<
T
>
(
R
).
rvec
();
//std::cout << "M:" <<(cv::getTickCount() - s)*1000/cv::getTickFrequency() << std::endl;
cv
::
Affine3
<
T
>::
Vec3
vo
;
//s = (double)cv::getTickCount();
cv
::
Rodrigues
(
R
,
vo
);
//std::cout << "O:" <<(cv::getTickCount() - s)*1000/cv::getTickFrequency() << std::endl;
ASSERT_LT
(
cv
::
norm
(
va
-
vo
),
1e-9
);
}
}
modules/viz/include/opencv2/viz/types.hpp
浏览文件 @
4c66b876
...
...
@@ -176,8 +176,8 @@ namespace cv
/// cv::viz::Color
inline
cv
::
viz
::
Color
::
Color
()
:
Scalar
(
0
,
0
,
0
)
{}
inline
cv
::
viz
::
Color
::
Color
(
double
gray
)
:
Scalar
(
gray
,
gray
,
gray
)
{}
inline
cv
::
viz
::
Color
::
Color
(
double
blue
,
double
green
,
double
red
)
:
Scalar
(
blue
,
green
,
red
)
{}
inline
cv
::
viz
::
Color
::
Color
(
double
_gray
)
:
Scalar
(
_gray
,
_gray
,
_
gray
)
{}
inline
cv
::
viz
::
Color
::
Color
(
double
_blue
,
double
_green
,
double
_red
)
:
Scalar
(
_blue
,
_green
,
_
red
)
{}
inline
cv
::
viz
::
Color
::
Color
(
const
Scalar
&
color
)
:
Scalar
(
color
)
{}
inline
cv
::
viz
::
Color
cv
::
viz
::
Color
::
black
()
{
return
Color
(
0
,
0
,
0
);
}
...
...
modules/viz/src/precomp.hpp
浏览文件 @
4c66b876
...
...
@@ -54,14 +54,6 @@
#include <list>
#include <vector>
#if defined __GNUC__
#pragma GCC system_header
#ifdef __DEPRECATED
#undef __DEPRECATED
#define __DEPRECATED_DISABLED__
#endif
#endif
#include <vtkAppendPolyData.h>
#include <vtkAssemblyPath.h>
#include <vtkCellData.h>
...
...
@@ -70,7 +62,6 @@
#include <vtkSmartPointer.h>
#include <vtkDataSet.h>
#include <vtkPolygon.h>
//#include <vtkPointPicker.h>
#include <vtkUnstructuredGrid.h>
#include <vtkDiskSource.h>
#include <vtkPlaneSource.h>
...
...
@@ -120,11 +111,6 @@
#include <vtkAlgorithmOutput.h>
#include <vtkImageMapper.h>
#if defined __GNUC__ && defined __DEPRECATED_DISABLED__
#define __DEPRECATED
#undef __DEPRECATED_DISABLED__
#endif
#include <opencv2/core.hpp>
#include <opencv2/viz.hpp>
#include <opencv2/viz/widget_accessor.hpp>
...
...
modules/viz/src/viz3d_impl.cpp
浏览文件 @
4c66b876
...
...
@@ -48,6 +48,8 @@
#include "precomp.hpp"
vtkRenderWindowInteractor
*
vtkRenderWindowInteractorFixNew
();
#if 1 || !defined __APPLE__
vtkRenderWindowInteractor
*
vtkRenderWindowInteractorFixNew
()
{
...
...
@@ -57,7 +59,7 @@ vtkRenderWindowInteractor* vtkRenderWindowInteractorFixNew()
/////////////////////////////////////////////////////////////////////////////////////////////
cv
::
viz
::
Viz3d
::
VizImpl
::
VizImpl
(
const
String
&
name
)
:
s
tyle_
(
vtkSmartPointer
<
cv
::
viz
::
InteractorStyle
>::
New
())
,
widget_actor_map_
(
new
WidgetActorMap
),
s_lastDone_
(
0.0
)
:
s
_lastDone_
(
0.0
),
style_
(
vtkSmartPointer
<
cv
::
viz
::
InteractorStyle
>::
New
()),
widget_actor_map_
(
new
WidgetActorMap
)
{
renderer_
=
vtkSmartPointer
<
vtkRenderer
>::
New
();
...
...
@@ -77,7 +79,7 @@ cv::viz::Viz3d::VizImpl::VizImpl(const String &name)
style_
->
UseTimersOn
();
/////////////////////////////////////////////////
interactor_
=
vtkSmartPointer
<
vtkRenderWindowInteractor
>::
Take
(
vtkRenderWindowInteractorFixNew
());
interactor_
=
vtkSmartPointer
<
vtkRenderWindowInteractor
>::
Take
(
vtkRenderWindowInteractorFixNew
());
window_
->
AlphaBitPlanesOff
();
window_
->
PointSmoothingOff
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录