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
e2673421
Commit
e2673421
authored
Dec 26, 2018
by
Alexander Alekhin
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #13504 from Tytan:stitcher_result_mask
parents
757411bf
f9c95144
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
+4
-2
stitching.hpp
modules/stitching/include/opencv2/stitching.hpp
+2
-0
stitcher.cpp
modules/stitching/src/stitcher.cpp
+2
-2
No files found.
modules/stitching/include/opencv2/stitching.hpp
View file @
e2673421
...
...
@@ -283,6 +283,7 @@ public:
std
::
vector
<
int
>
component
()
const
{
return
indices_
;
}
std
::
vector
<
detail
::
CameraParams
>
cameras
()
const
{
return
cameras_
;
}
CV_WRAP
double
workScale
()
const
{
return
work_scale_
;
}
UMat
resultMask
()
const
{
return
result_mask_
;
}
private
:
Status
matchImages
();
...
...
@@ -313,6 +314,7 @@ private:
std
::
vector
<
cv
::
UMat
>
seam_est_imgs_
;
std
::
vector
<
int
>
indices_
;
std
::
vector
<
detail
::
CameraParams
>
cameras_
;
UMat
result_mask_
;
double
work_scale_
;
double
seam_scale_
;
double
seam_work_aspect_
;
...
...
modules/stitching/src/stitcher.cpp
View file @
e2673421
...
...
@@ -357,8 +357,8 @@ Stitcher::Status Stitcher::composePanorama(InputArrayOfArrays images, OutputArra
#if ENABLE_LOG
int64
blend_t
=
getTickCount
();
#endif
UMat
result
,
result_mask
;
blender_
->
blend
(
result
,
result_mask
);
UMat
result
;
blender_
->
blend
(
result
,
result_mask
_
);
LOGLN
(
"blend time: "
<<
((
getTickCount
()
-
blend_t
)
/
getTickFrequency
())
<<
" sec"
);
LOGLN
(
"Compositing, time: "
<<
((
getTickCount
()
-
t
)
/
getTickFrequency
())
<<
" sec"
);
...
...
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