Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
opencv
Commits
707048f6
Commit
707048f6
authored
Jul 17, 2013
by
Alexander Shishkov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
removed tonemap_algorithms due to wrapping problems
parent
8ccca90d
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
8 deletions
+6
-8
photo.hpp
modules/photo/include/opencv2/photo.hpp
+2
-2
tonemap.cpp
modules/photo/src/tonemap.cpp
+2
-3
test_hdr.cpp
modules/photo/test/test_hdr.cpp
+2
-3
No files found.
modules/photo/include/opencv2/photo.hpp
View file @
707048f6
...
...
@@ -60,7 +60,7 @@ enum
};
//! the tonemapping algorithm
enum
tonemap_algorithms
enum
{
TONEMAP_LINEAR
,
...
...
@@ -96,7 +96,7 @@ CV_EXPORTS_W void fastNlMeansDenoisingColoredMulti( InputArrayOfArrays srcImgs,
CV_EXPORTS_W
void
makeHDR
(
InputArrayOfArrays
srcImgs
,
const
std
::
vector
<
float
>&
exp_times
,
OutputArray
dst
,
bool
align
=
false
);
CV_EXPORTS_W
void
tonemap
(
InputArray
src
,
OutputArray
dst
,
tonemap_algorithms
algorithm
,
CV_EXPORTS_W
void
tonemap
(
InputArray
src
,
OutputArray
dst
,
int
algorithm
,
const
std
::
vector
<
float
>&
params
=
std
::
vector
<
float
>
());
CV_EXPORTS_W
void
exposureFusion
(
InputArrayOfArrays
srcImgs
,
OutputArray
dst
,
bool
align
=
false
,
float
wc
=
1
,
float
ws
=
1
,
float
we
=
0
);
...
...
modules/photo/src/tonemap.cpp
View file @
707048f6
...
...
@@ -155,7 +155,7 @@ static void DurandMap(Mat& src_img, Mat& dst_img, const std::vector<float>& para
merge
(
channels
,
dst_img
);
}
void
tonemap
(
InputArray
_src
,
OutputArray
_dst
,
tonemap_algorithms
algorithm
,
void
tonemap
(
InputArray
_src
,
OutputArray
_dst
,
int
algorithm
,
const
std
::
vector
<
float
>&
params
)
{
typedef
void
(
*
tonemap_func
)(
Mat
&
,
Mat
&
,
const
std
::
vector
<
float
>&
);
...
...
@@ -188,4 +188,4 @@ void tonemap(InputArray _src, OutputArray _dst, tonemap_algorithms algorithm,
float
gamma
=
getParam
(
params
,
0
,
1.0
f
);
pow
(
dst
,
1.0
f
/
gamma
,
dst
);
}
}
\ No newline at end of file
}
modules/photo/test/test_hdr.cpp
View file @
707048f6
...
...
@@ -111,7 +111,7 @@ TEST(Photo_Tonemap, regression)
for
(
int
i
=
TONEMAP_DURAND
;
i
<
TONEMAP_COUNT
;
i
++
)
{
Mat
result
;
tonemap
(
img
,
result
,
static_cast
<
tonemap_algorithms
>
(
i
)
,
param
);
tonemap
(
img
,
result
,
i
,
param
);
result
.
convertTo
(
result
,
CV_8UC3
,
255
);
double
max
=
1.0
;
minMaxLoc
(
abs
(
result
-
images
[
i
]),
NULL
,
&
max
);
...
...
@@ -140,4 +140,4 @@ TEST(Photo_Align, regression)
Point
calc
=
getExpShift
(
img
,
res
,
max_bits
);
ASSERT_TRUE
(
calc
==
-
shift
);
}
}
\ No newline at end of file
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment