Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
3b075a50
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,发现更多精彩内容 >>
提交
3b075a50
编写于
9月 21, 2012
作者:
A
Anatoly Baksheev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fixed warnings under windows
上级
0abe7f31
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
13 addition
and
13 deletion
+13
-13
modules/gpu/src/hough.cpp
modules/gpu/src/hough.cpp
+11
-11
modules/imgproc/src/generalized_hough.cpp
modules/imgproc/src/generalized_hough.cpp
+1
-1
modules/imgproc/test/test_imgwarp.cpp
modules/imgproc/test/test_imgwarp.cpp
+1
-1
未找到文件。
modules/gpu/src/hough.cpp
浏览文件 @
3b075a50
...
@@ -730,7 +730,7 @@ namespace
...
@@ -730,7 +730,7 @@ namespace
GHT_Ballard_Pos_calcHist_gpu
(
edgePointList
.
ptr
<
unsigned
int
>
(
0
),
edgePointList
.
ptr
<
float
>
(
1
),
edgePointList
.
cols
,
GHT_Ballard_Pos_calcHist_gpu
(
edgePointList
.
ptr
<
unsigned
int
>
(
0
),
edgePointList
.
ptr
<
float
>
(
1
),
edgePointList
.
cols
,
r_table
,
r_sizes
.
ptr
<
int
>
(),
r_table
,
r_sizes
.
ptr
<
int
>
(),
hist
,
hist
,
dp
,
levels
);
(
float
)
dp
,
levels
);
}
}
}
}
...
@@ -742,7 +742,7 @@ namespace
...
@@ -742,7 +742,7 @@ namespace
ensureSizeIsEnough
(
2
,
maxSize
,
CV_32FC4
,
outBuf
);
ensureSizeIsEnough
(
2
,
maxSize
,
CV_32FC4
,
outBuf
);
posCount
=
GHT_Ballard_Pos_findPosInHist_gpu
(
hist
,
outBuf
.
ptr
<
float4
>
(
0
),
outBuf
.
ptr
<
int3
>
(
1
),
maxSize
,
dp
,
votesThreshold
);
posCount
=
GHT_Ballard_Pos_findPosInHist_gpu
(
hist
,
outBuf
.
ptr
<
float4
>
(
0
),
outBuf
.
ptr
<
int3
>
(
1
),
maxSize
,
(
float
)
dp
,
votesThreshold
);
}
}
/////////////////////////////////////
/////////////////////////////////////
...
@@ -813,7 +813,7 @@ namespace
...
@@ -813,7 +813,7 @@ namespace
GHT_Ballard_PosScale_calcHist_gpu
(
edgePointList
.
ptr
<
unsigned
int
>
(
0
),
edgePointList
.
ptr
<
float
>
(
1
),
edgePointList
.
cols
,
GHT_Ballard_PosScale_calcHist_gpu
(
edgePointList
.
ptr
<
unsigned
int
>
(
0
),
edgePointList
.
ptr
<
float
>
(
1
),
edgePointList
.
cols
,
r_table
,
r_sizes
.
ptr
<
int
>
(),
r_table
,
r_sizes
.
ptr
<
int
>
(),
hist
,
rows
,
cols
,
hist
,
rows
,
cols
,
minScale
,
scaleStep
,
scaleRange
,
dp
,
levels
);
(
float
)
minScale
,
(
float
)
scaleStep
,
scaleRange
,
(
float
)
dp
,
levels
);
}
}
}
}
...
@@ -830,7 +830,7 @@ namespace
...
@@ -830,7 +830,7 @@ namespace
ensureSizeIsEnough
(
2
,
maxSize
,
CV_32FC4
,
outBuf
);
ensureSizeIsEnough
(
2
,
maxSize
,
CV_32FC4
,
outBuf
);
posCount
=
GHT_Ballard_PosScale_findPosInHist_gpu
(
hist
,
rows
,
cols
,
scaleRange
,
outBuf
.
ptr
<
float4
>
(
0
),
outBuf
.
ptr
<
int3
>
(
1
),
maxSize
,
minScale
,
scaleStep
,
dp
,
votesThreshold
);
posCount
=
GHT_Ballard_PosScale_findPosInHist_gpu
(
hist
,
rows
,
cols
,
scaleRange
,
outBuf
.
ptr
<
float4
>
(
0
),
outBuf
.
ptr
<
int3
>
(
1
),
maxSize
,
(
float
)
minScale
,
(
float
)
scaleStep
,
(
float
)
dp
,
votesThreshold
);
}
}
/////////////////////////////////////
/////////////////////////////////////
...
@@ -901,7 +901,7 @@ namespace
...
@@ -901,7 +901,7 @@ namespace
GHT_Ballard_PosRotation_calcHist_gpu
(
edgePointList
.
ptr
<
unsigned
int
>
(
0
),
edgePointList
.
ptr
<
float
>
(
1
),
edgePointList
.
cols
,
GHT_Ballard_PosRotation_calcHist_gpu
(
edgePointList
.
ptr
<
unsigned
int
>
(
0
),
edgePointList
.
ptr
<
float
>
(
1
),
edgePointList
.
cols
,
r_table
,
r_sizes
.
ptr
<
int
>
(),
r_table
,
r_sizes
.
ptr
<
int
>
(),
hist
,
rows
,
cols
,
hist
,
rows
,
cols
,
minAngle
,
angleStep
,
angleRange
,
dp
,
levels
);
(
float
)
minAngle
,
(
float
)
angleStep
,
angleRange
,
(
float
)
dp
,
levels
);
}
}
}
}
...
@@ -918,7 +918,7 @@ namespace
...
@@ -918,7 +918,7 @@ namespace
ensureSizeIsEnough
(
2
,
maxSize
,
CV_32FC4
,
outBuf
);
ensureSizeIsEnough
(
2
,
maxSize
,
CV_32FC4
,
outBuf
);
posCount
=
GHT_Ballard_PosRotation_findPosInHist_gpu
(
hist
,
rows
,
cols
,
angleRange
,
outBuf
.
ptr
<
float4
>
(
0
),
outBuf
.
ptr
<
int3
>
(
1
),
maxSize
,
minAngle
,
angleStep
,
dp
,
votesThreshold
);
posCount
=
GHT_Ballard_PosRotation_findPosInHist_gpu
(
hist
,
rows
,
cols
,
angleRange
,
outBuf
.
ptr
<
float4
>
(
0
),
outBuf
.
ptr
<
int3
>
(
1
),
maxSize
,
(
float
)
minAngle
,
(
float
)
angleStep
,
(
float
)
dp
,
votesThreshold
);
}
}
/////////////////////////////////////////
/////////////////////////////////////////
...
@@ -1205,7 +1205,7 @@ namespace
...
@@ -1205,7 +1205,7 @@ namespace
if
(
edgePointList
.
cols
>
0
)
if
(
edgePointList
.
cols
>
0
)
{
{
build_func
(
edgePointList
.
ptr
<
unsigned
int
>
(
0
),
edgePointList
.
ptr
<
float
>
(
1
),
edgePointList
.
cols
,
build_func
(
edgePointList
.
ptr
<
unsigned
int
>
(
0
),
edgePointList
.
ptr
<
float
>
(
1
),
edgePointList
.
cols
,
features
.
sizes
.
ptr
<
int
>
(),
maxSize
,
xi
,
angleEpsilon
,
levels
,
make_float2
(
center
.
x
,
center
.
y
),
maxDist
);
features
.
sizes
.
ptr
<
int
>
(),
maxSize
,
(
float
)
xi
,
(
float
)
angleEpsilon
,
levels
,
make_float2
((
float
)
center
.
x
,
(
float
)
center
.
y
),
(
float
)
maxDist
);
}
}
}
}
...
@@ -1218,7 +1218,7 @@ namespace
...
@@ -1218,7 +1218,7 @@ namespace
hist
.
setTo
(
Scalar
::
all
(
0
));
hist
.
setTo
(
Scalar
::
all
(
0
));
GHT_Guil_Full_calcOHist_gpu
(
templFeatures
.
sizes
.
ptr
<
int
>
(),
imageFeatures
.
sizes
.
ptr
<
int
>
(
0
),
GHT_Guil_Full_calcOHist_gpu
(
templFeatures
.
sizes
.
ptr
<
int
>
(),
imageFeatures
.
sizes
.
ptr
<
int
>
(
0
),
hist
.
ptr
<
int
>
(),
minAngle
,
maxAngle
,
angleStep
,
angleRange
,
levels
,
templFeatures
.
maxSize
);
hist
.
ptr
<
int
>
(),
(
float
)
minAngle
,
(
float
)
maxAngle
,
(
float
)
angleStep
,
angleRange
,
levels
,
templFeatures
.
maxSize
);
cudaSafeCall
(
cudaMemcpy
(
&
h_buf
[
0
],
hist
.
data
,
h_buf
.
size
()
*
sizeof
(
int
),
cudaMemcpyDeviceToHost
)
);
cudaSafeCall
(
cudaMemcpy
(
&
h_buf
[
0
],
hist
.
data
,
h_buf
.
size
()
*
sizeof
(
int
),
cudaMemcpyDeviceToHost
)
);
angles
.
clear
();
angles
.
clear
();
...
@@ -1242,7 +1242,7 @@ namespace
...
@@ -1242,7 +1242,7 @@ namespace
hist
.
setTo
(
Scalar
::
all
(
0
));
hist
.
setTo
(
Scalar
::
all
(
0
));
GHT_Guil_Full_calcSHist_gpu
(
templFeatures
.
sizes
.
ptr
<
int
>
(),
imageFeatures
.
sizes
.
ptr
<
int
>
(
0
),
GHT_Guil_Full_calcSHist_gpu
(
templFeatures
.
sizes
.
ptr
<
int
>
(),
imageFeatures
.
sizes
.
ptr
<
int
>
(
0
),
hist
.
ptr
<
int
>
(),
angle
,
angleEpsilon
,
minScale
,
maxScale
,
iScaleStep
,
scaleRange
,
levels
,
templFeatures
.
maxSize
);
hist
.
ptr
<
int
>
(),
(
float
)
angle
,
(
float
)
angleEpsilon
,
(
float
)
minScale
,
(
float
)
maxScale
,
(
float
)
iScaleStep
,
scaleRange
,
levels
,
templFeatures
.
maxSize
);
cudaSafeCall
(
cudaMemcpy
(
&
h_buf
[
0
],
hist
.
data
,
h_buf
.
size
()
*
sizeof
(
int
),
cudaMemcpyDeviceToHost
)
);
cudaSafeCall
(
cudaMemcpy
(
&
h_buf
[
0
],
hist
.
data
,
h_buf
.
size
()
*
sizeof
(
int
),
cudaMemcpyDeviceToHost
)
);
scales
.
clear
();
scales
.
clear
();
...
@@ -1263,10 +1263,10 @@ namespace
...
@@ -1263,10 +1263,10 @@ namespace
hist
.
setTo
(
Scalar
::
all
(
0
));
hist
.
setTo
(
Scalar
::
all
(
0
));
GHT_Guil_Full_calcPHist_gpu
(
templFeatures
.
sizes
.
ptr
<
int
>
(),
imageFeatures
.
sizes
.
ptr
<
int
>
(
0
),
GHT_Guil_Full_calcPHist_gpu
(
templFeatures
.
sizes
.
ptr
<
int
>
(),
imageFeatures
.
sizes
.
ptr
<
int
>
(
0
),
hist
,
angle
,
angleEpsilon
,
scale
,
dp
,
levels
,
templFeatures
.
maxSize
);
hist
,
(
float
)
(
float
)
angle
,
(
float
)
angleEpsilon
,
(
float
)
scale
,
(
float
)
dp
,
levels
,
templFeatures
.
maxSize
);
posCount
=
GHT_Guil_Full_findPosInHist_gpu
(
hist
,
outBuf
.
ptr
<
float4
>
(
0
),
outBuf
.
ptr
<
int3
>
(
1
),
posCount
=
GHT_Guil_Full_findPosInHist_gpu
(
hist
,
outBuf
.
ptr
<
float4
>
(
0
),
outBuf
.
ptr
<
int3
>
(
1
),
posCount
,
maxSize
,
angle
,
angleVotes
,
scale
,
scaleVotes
,
dp
,
posThresh
);
posCount
,
maxSize
,
(
float
)
angle
,
angleVotes
,
(
float
)
scale
,
scaleVotes
,
(
float
)
dp
,
posThresh
);
}
}
}
}
...
...
modules/imgproc/src/generalized_hough.cpp
浏览文件 @
3b075a50
...
@@ -972,7 +972,7 @@ namespace
...
@@ -972,7 +972,7 @@ namespace
f
.
p1
=
p1
;
f
.
p1
=
p1
;
f
.
p2
=
p2
;
f
.
p2
=
p2
;
f
.
alpha12
=
clampAngle
(
fastAtan2
(
d
.
y
,
d
.
x
)
-
p1
.
theta
);
f
.
alpha12
=
clampAngle
(
fastAtan2
(
(
float
)
d
.
y
,
(
float
)
d
.
x
)
-
p1
.
theta
);
f
.
d12
=
norm
(
d
);
f
.
d12
=
norm
(
d
);
if
(
f
.
d12
>
maxDist
)
if
(
f
.
d12
>
maxDist
)
...
...
modules/imgproc/test/test_imgwarp.cpp
浏览文件 @
3b075a50
...
@@ -1502,7 +1502,7 @@ TEST(Imgproc_resize_area, regression)
...
@@ -1502,7 +1502,7 @@ TEST(Imgproc_resize_area, regression)
absdiff
(
actual
,
expected
,
diff
);
absdiff
(
actual
,
expected
,
diff
);
Mat
one_channel_diff
=
diff
.
reshape
(
1
);
Mat
one_channel_diff
=
diff
.
reshape
(
1
);
int
elem_diff
=
1
.0
f
;
int
elem_diff
=
1
;
Size
dsize
=
actual
.
size
();
Size
dsize
=
actual
.
size
();
bool
next
=
true
;
bool
next
=
true
;
for
(
int
dy
=
0
;
dy
<
dsize
.
height
&&
next
;
++
dy
)
for
(
int
dy
=
0
;
dy
<
dsize
.
height
&&
next
;
++
dy
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录