Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv_contrib
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_contrib
Commits
2cb83997
Commit
2cb83997
authored
Dec 08, 2018
by
Alexander Alekhin
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1937 from indianocean10000:patch-1
parents
7670ff2c
1c65e636
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
6 deletions
+3
-6
selectivesearchsegmentation.cpp
modules/ximgproc/src/selectivesearchsegmentation.cpp
+3
-6
No files found.
modules/ximgproc/src/selectivesearchsegmentation.cpp
View file @
2cb83997
...
...
@@ -811,7 +811,7 @@ namespace cv {
Ptr
<
SelectiveSearchSegmentationStrategyTexture
>
texture2
=
createSelectiveSearchSegmentationStrategyTexture
();
Ptr
<
SelectiveSearchSegmentationStrategySize
>
size2
=
createSelectiveSearchSegmentationStrategySize
();
Ptr
<
SelectiveSearchSegmentationStrategyMultiple
>
m2
=
createSelectiveSearchSegmentationStrategyMultiple
(
fill
,
texture
,
size
);
Ptr
<
SelectiveSearchSegmentationStrategyMultiple
>
m2
=
createSelectiveSearchSegmentationStrategyMultiple
(
fill
2
,
texture2
,
size2
);
addStrategy
(
m2
);
...
...
@@ -839,10 +839,7 @@ namespace cv {
addImage
(
channel
[
0
]);
split
(
base_image
,
channel
);
std
::
vector
<
Mat
>
channel2
;
channel2
.
push_back
(
channel
[
2
]);
channel2
.
push_back
(
channel
[
1
]);
channel2
.
push_back
(
I
);
std
::
vector
<
Mat
>
channel2
=
{
channel
[
2
],
channel
[
1
],
I
};
Mat
rgI
;
merge
(
channel2
,
rgI
);
...
...
@@ -868,7 +865,7 @@ namespace cv {
Ptr
<
SelectiveSearchSegmentationStrategyTexture
>
texture2
=
createSelectiveSearchSegmentationStrategyTexture
();
Ptr
<
SelectiveSearchSegmentationStrategySize
>
size2
=
createSelectiveSearchSegmentationStrategySize
();
Ptr
<
SelectiveSearchSegmentationStrategyMultiple
>
m2
=
createSelectiveSearchSegmentationStrategyMultiple
(
fill
,
texture
,
size
);
Ptr
<
SelectiveSearchSegmentationStrategyMultiple
>
m2
=
createSelectiveSearchSegmentationStrategyMultiple
(
fill
2
,
texture2
,
size2
);
addStrategy
(
m2
);
...
...
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