Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
S
stitchEm
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
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Franco (nextime) Lanza
stitchEm
Commits
20693a55
Unverified
Commit
20693a55
authored
5 years ago
by
Wieland Morgenstern
Committed by
GitHub
5 years ago
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #31 from stitchEm/mask-merger-destructor
voronoi merger inherits mask merger, make destructor virtual
parents
4e95c38b
9a55190e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
maskMerger.hpp
lib/src/core1/maskMerger.hpp
+1
-1
voronoiMaskMerger.hpp
lib/src/core1/voronoiMaskMerger.hpp
+1
-1
No files found.
lib/src/core1/maskMerger.hpp
View file @
20693a55
...
...
@@ -33,7 +33,7 @@ class MaskMerger {
static
MaskMerger
*
factor
(
const
MaskMergerType
maskMergerType
);
~
MaskMerger
();
virtual
~
MaskMerger
();
virtual
Status
setParameters
(
const
std
::
vector
<
double
>&
params
)
=
0
;
...
...
This diff is collapsed.
Click to expand it.
lib/src/core1/voronoiMaskMerger.hpp
View file @
20693a55
...
...
@@ -14,7 +14,7 @@ namespace Core {
class
VoronoiMaskMerger
:
public
MaskMerger
{
public
:
VoronoiMaskMerger
()
:
feather
(
0
)
{}
~
VoronoiMaskMerger
()
{}
virtual
~
VoronoiMaskMerger
()
override
{}
Status
setup
(
const
PanoDefinition
&
,
GPU
::
Buffer
<
const
uint32_t
>
inputsMask
,
const
ImageMapping
&
fromIm
,
const
ImageMerger
*
const
to
,
GPU
::
Stream
)
override
;
...
...
This diff is collapsed.
Click to expand it.
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