Merge pull request #1937 from indianocean10000:patch-1

pull/1944/head
Alexander Alekhin 6 years ago
commit 2cb8399776
  1. 9
      modules/ximgproc/src/selectivesearchsegmentation.cpp

@ -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(fill2, 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(fill2, texture2, size2);
addStrategy(m2);

Loading…
Cancel
Save