Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
6df203c4
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,发现更多精彩内容 >>
提交
6df203c4
编写于
8月 03, 2013
作者:
A
Alexander Shishkov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fixes for Linux compilation, small changes
上级
c51b50b4
变更
8
显示空白变更内容
内联
并排
Showing
8 changed file
with
39 addition
and
41 deletion
+39
-41
modules/photo/include/opencv2/photo.hpp
modules/photo/include/opencv2/photo.hpp
+9
-15
modules/photo/src/align.cpp
modules/photo/src/align.cpp
+2
-3
modules/photo/src/hdr_common.cpp
modules/photo/src/hdr_common.cpp
+2
-3
modules/photo/src/hdr_common.hpp
modules/photo/src/hdr_common.hpp
+2
-3
modules/photo/src/merge.cpp
modules/photo/src/merge.cpp
+2
-3
modules/photo/src/tonemap.cpp
modules/photo/src/tonemap.cpp
+6
-7
modules/photo/test/test_hdr.cpp
modules/photo/test/test_hdr.cpp
+7
-7
modules/python/src2/cv2.cpp
modules/python/src2/cv2.cpp
+9
-0
未找到文件。
modules/photo/include/opencv2/photo.hpp
浏览文件 @
6df203c4
...
...
@@ -59,8 +59,6 @@ enum
INPAINT_TELEA
=
1
// A. Telea algorithm
};
CV_EXPORTS_W
bool
initModule_photo
();
//! restores the damaged image areas using one of the available intpainting algorithms
CV_EXPORTS_W
void
inpaint
(
InputArray
src
,
InputArray
inpaintMask
,
OutputArray
dst
,
double
inpaintRadius
,
int
flags
);
...
...
@@ -91,11 +89,7 @@ public:
CV_WRAP
virtual
void
setGamma
(
float
gamma
)
=
0
;
};
class
CV_EXPORTS_W
TonemapLinear
:
public
Tonemap
{
};
CV_EXPORTS_W
Ptr
<
TonemapLinear
>
createTonemapLinear
(
float
gamma
=
1.0
f
);
CV_EXPORTS_W
Ptr
<
Tonemap
>
createTonemapLinear
(
float
gamma
=
1.0
f
);
// "Adaptive Logarithmic Mapping For Displaying HighContrast Scenes", Drago et al., 2003
...
...
modules/photo/src/align.cpp
浏览文件 @
6df203c4
...
...
@@ -10,8 +10,7 @@
// License Agreement
// For Open Source Computer Vision Library
//
// Copyright (C) 2000-2008, Intel Corporation, all rights reserved.
// Copyright (C) 2009, Willow Garage Inc., all rights reserved.
// Copyright (C) 2013, OpenCV Foundation, all rights reserved.
// Third party copyrights are property of their respective owners.
//
// Redistribution and use in source and binary forms, with or without modification,
...
...
modules/photo/src/hdr_common.cpp
浏览文件 @
6df203c4
...
...
@@ -10,8 +10,7 @@
// License Agreement
// For Open Source Computer Vision Library
//
// Copyright (C) 2000-2008, Intel Corporation, all rights reserved.
// Copyright (C) 2009, Willow Garage Inc., all rights reserved.
// Copyright (C) 2013, OpenCV Foundation, all rights reserved.
// Third party copyrights are property of their respective owners.
//
// Redistribution and use in source and binary forms, with or without modification,
...
...
modules/photo/src/hdr_common.hpp
浏览文件 @
6df203c4
...
...
@@ -10,8 +10,7 @@
// License Agreement
// For Open Source Computer Vision Library
//
// Copyright (C) 2000-2008, Intel Corporation, all rights reserved.
// Copyright (C) 2009, Willow Garage Inc., all rights reserved.
// Copyright (C) 2013, OpenCV Foundation, all rights reserved.
// Third party copyrights are property of their respective owners.
//
// Redistribution and use in source and binary forms, with or without modification,
...
...
modules/photo/src/merge.cpp
浏览文件 @
6df203c4
...
...
@@ -10,8 +10,7 @@
// License Agreement
// For Open Source Computer Vision Library
//
// Copyright (C) 2000-2008, Intel Corporation, all rights reserved.
// Copyright (C) 2009, Willow Garage Inc., all rights reserved.
// Copyright (C) 2013, OpenCV Foundation, all rights reserved.
// Third party copyrights are property of their respective owners.
//
// Redistribution and use in source and binary forms, with or without modification,
...
...
modules/photo/src/tonemap.cpp
浏览文件 @
6df203c4
...
...
@@ -10,8 +10,7 @@
// License Agreement
// For Open Source Computer Vision Library
//
// Copyright (C) 2000-2008, Intel Corporation, all rights reserved.
// Copyright (C) 2009, Willow Garage Inc., all rights reserved.
// Copyright (C) 2013, OpenCV Foundation, all rights reserved.
// Third party copyrights are property of their respective owners.
//
// Redistribution and use in source and binary forms, with or without modification,
...
...
@@ -47,7 +46,7 @@
namespace
cv
{
class
TonemapLinearImpl
:
public
Tonemap
Linear
class
TonemapLinearImpl
:
public
Tonemap
{
public:
TonemapLinearImpl
(
float
gamma
)
:
gamma
(
gamma
),
name
(
"TonemapLinear"
)
...
...
@@ -93,7 +92,7 @@ protected:
float
gamma
;
};
Ptr
<
Tonemap
Linear
>
createTonemapLinear
(
float
gamma
)
Ptr
<
Tonemap
>
createTonemapLinear
(
float
gamma
)
{
return
new
TonemapLinearImpl
(
gamma
);
}
...
...
@@ -115,7 +114,7 @@ public:
_dst
.
create
(
src
.
size
(),
CV_32FC3
);
Mat
img
=
_dst
.
getMat
();
Ptr
<
TonemapLinear
>
linear
=
createTonemapLinear
(
1.0
f
);
Ptr
<
Tonemap
>
linear
=
createTonemapLinear
(
1.0
f
);
linear
->
process
(
src
,
img
);
Mat
gray_img
;
...
...
@@ -286,7 +285,7 @@ public:
_dst
.
create
(
src
.
size
(),
CV_32FC3
);
Mat
img
=
_dst
.
getMat
();
Ptr
<
TonemapLinear
>
linear
=
createTonemapLinear
(
1.0
f
);
Ptr
<
Tonemap
>
linear
=
createTonemapLinear
(
1.0
f
);
linear
->
process
(
src
,
img
);
Mat
gray_img
;
...
...
modules/photo/test/test_hdr.cpp
浏览文件 @
6df203c4
...
...
@@ -10,8 +10,7 @@
// License Agreement
// For Open Source Computer Vision Library
//
// Copyright (C) 2000-2008, Intel Corporation, all rights reserved.
// Copyright (C) 2009, Willow Garage Inc., all rights reserved.
// Copyright (C) 2013, OpenCV Foundation, all rights reserved.
// Third party copyrights are property of their respective owners.
//
// Redistribution and use in source and binary forms, with or without modification,
...
...
@@ -61,9 +60,10 @@ void checkEqual(Mat img0, Mat img1, double threshold)
ASSERT_FALSE
(
max
>
threshold
)
<<
max
;
}
void
loadExposureSeq
(
String
path
,
vector
<
Mat
>&
images
,
vector
<
float
>&
times
=
vector
<
float
>
())
static
vector
<
float
>
DEFAULT_VECTOR
;
void
loadExposureSeq
(
String
path
,
vector
<
Mat
>&
images
,
vector
<
float
>&
times
=
DEFAULT_VECTOR
)
{
ifstream
list_file
(
path
+
"list.txt"
);
ifstream
list_file
((
path
+
"list.txt"
).
c_str
()
);
ASSERT_TRUE
(
list_file
.
is_open
());
string
name
;
float
val
;
...
...
@@ -79,7 +79,7 @@ void loadExposureSeq(String path, vector<Mat>& images, vector<float>& times = ve
void
loadResponseCSV
(
String
path
,
Mat
&
response
)
{
response
=
Mat
(
256
,
3
,
CV_32F
);
ifstream
resp_file
(
path
);
ifstream
resp_file
(
path
.
c_str
()
);
for
(
int
i
=
0
;
i
<
256
;
i
++
)
{
for
(
int
channel
=
0
;
channel
<
3
;
channel
++
)
{
resp_file
>>
response
.
at
<
float
>
(
i
,
channel
);
...
...
@@ -98,7 +98,7 @@ TEST(Photo_Tonemap, regression)
float
gamma
=
2.2
f
;
test_path
+=
"tonemap/"
;
Ptr
<
TonemapLinear
>
linear
=
createTonemapLinear
(
gamma
);
Ptr
<
Tonemap
>
linear
=
createTonemapLinear
(
gamma
);
linear
->
process
(
img
,
result
);
loadImage
(
test_path
+
"linear.png"
,
expected
);
result
.
convertTo
(
result
,
CV_8UC3
,
255
);
...
...
@@ -156,7 +156,7 @@ TEST(Photo_MergeMertens, regression)
string
test_path
=
string
(
cvtest
::
TS
::
ptr
()
->
get_data_path
())
+
"hdr/"
;
vector
<
Mat
>
images
;
loadExposureSeq
(
test_path
+
"exposures/"
,
images
);
loadExposureSeq
((
test_path
+
"exposures/"
).
c_str
()
,
images
);
Ptr
<
MergeMertens
>
merge
=
createMergeMertens
();
...
...
modules/python/src2/cv2.cpp
浏览文件 @
6df203c4
...
...
@@ -131,6 +131,15 @@ typedef Ptr<StereoMatcher> Ptr_StereoMatcher;
typedef
Ptr
<
StereoBM
>
Ptr_StereoBM
;
typedef
Ptr
<
StereoSGBM
>
Ptr_StereoSGBM
;
typedef
Ptr
<
Tonemap
>
Ptr_Tonemap
;
typedef
Ptr
<
TonemapDrago
>
Ptr_TonemapDrago
;
typedef
Ptr
<
TonemapReinhardDevlin
>
Ptr_TonemapReinhardDevlin
;
typedef
Ptr
<
TonemapDurand
>
Ptr_TonemapDurand
;
typedef
Ptr
<
AlignMTB
>
Ptr_AlignMTB
;
typedef
Ptr
<
CalibrateDebevec
>
Ptr_CalibrateDebevec
;
typedef
Ptr
<
MergeDebevec
>
Ptr_MergeDebevec
;
typedef
Ptr
<
MergeMertens
>
Ptr_MergeMertens
;
typedef
Ptr
<
cv
::
softcascade
::
ChannelFeatureBuilder
>
Ptr_ChannelFeatureBuilder
;
typedef
SimpleBlobDetector
::
Params
SimpleBlobDetector_Params
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录