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
79e13be0
Commit
79e13be0
authored
Jan 03, 2019
by
Alexander Alekhin
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #13566 from qchateau:fix_13563
parents
fd08d0d8
c72a8552
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
exposure_compensate.hpp
.../include/opencv2/stitching/detail/exposure_compensate.hpp
+3
-2
exposure_compensate.cpp
modules/stitching/src/exposure_compensate.cpp
+2
-3
No files found.
modules/stitching/include/opencv2/stitching/detail/exposure_compensate.hpp
View file @
79e13be0
...
...
@@ -60,6 +60,7 @@ namespace detail {
class
CV_EXPORTS_W
ExposureCompensator
{
public
:
ExposureCompensator
()
:
updateGain
(
true
)
{}
virtual
~
ExposureCompensator
()
{}
enum
{
NO
,
GAIN
,
GAIN_BLOCKS
,
CHANNELS
,
CHANNELS_BLOCKS
};
...
...
@@ -189,7 +190,7 @@ public:
CV_WRAP
BlocksGainCompensator
(
int
bl_width
=
32
,
int
bl_height
=
32
)
:
BlocksGainCompensator
(
bl_width
,
bl_height
,
1
)
{}
CV_WRAP
BlocksGainCompensator
(
int
bl_width
,
int
bl_height
,
int
nr_feeds
)
:
BlocksCompensator
(
bl_width
,
bl_height
,
nr_feeds
)
{
setUpdateGain
(
true
);
}
:
BlocksCompensator
(
bl_width
,
bl_height
,
nr_feeds
)
{}
void
feed
(
const
std
::
vector
<
Point
>
&
corners
,
const
std
::
vector
<
UMat
>
&
images
,
const
std
::
vector
<
std
::
pair
<
UMat
,
uchar
>
>
&
masks
)
CV_OVERRIDE
;
...
...
@@ -210,7 +211,7 @@ class CV_EXPORTS_W BlocksChannelsCompensator : public BlocksCompensator
{
public
:
CV_WRAP
BlocksChannelsCompensator
(
int
bl_width
=
32
,
int
bl_height
=
32
,
int
nr_feeds
=
1
)
:
BlocksCompensator
(
bl_width
,
bl_height
,
nr_feeds
)
{
setUpdateGain
(
true
);
}
:
BlocksCompensator
(
bl_width
,
bl_height
,
nr_feeds
)
{}
void
feed
(
const
std
::
vector
<
Point
>
&
corners
,
const
std
::
vector
<
UMat
>
&
images
,
const
std
::
vector
<
std
::
pair
<
UMat
,
uchar
>
>
&
masks
)
CV_OVERRIDE
;
...
...
modules/stitching/src/exposure_compensate.cpp
View file @
79e13be0
...
...
@@ -62,11 +62,10 @@ Ptr<ExposureCompensator> ExposureCompensator::createDefault(int type)
e
=
makePtr
<
ChannelsCompensator
>
();
else
if
(
type
==
CHANNELS_BLOCKS
)
e
=
makePtr
<
BlocksChannelsCompensator
>
();
if
(
e
.
get
()
!=
nullptr
)
{
e
->
setUpdateGain
(
true
);
return
e
;
}
CV_Error
(
Error
::
StsBadArg
,
"unsupported exposure compensation method"
);
}
...
...
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