Skip to content

Commit 429d82c

Browse files
committed
Update edge_drawing.cpp
1 parent d4bcab0 commit 429d82c

File tree

1 file changed

+4
-9
lines changed

1 file changed

+4
-9
lines changed

modules/ximgproc/src/edge_drawing.cpp

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ int gradThresh;
2323
int op;
2424
bool SumFlag;
2525
int* grads;
26+
bool PFmode;
2627
};
2728

2829
void ComputeGradientBody::operator() (const Range& range) const
@@ -78,7 +79,7 @@ void ComputeGradientBody::operator() (const Range& range) const
7879

7980
gradRow[x] = (short)sum;
8081

81-
if (op == EdgeDrawing::PREWITT)
82+
if (PFmode)
8283
grads[(int)sum]++;
8384

8485
if (sum >= gradThresh)
@@ -351,13 +352,6 @@ void EdgeDrawingImpl::detectEdges(InputArray src)
351352
anchorThresh = params.AnchorThresholdValue;
352353
op = params.EdgeDetectionOperator;
353354

354-
if (params.PFmode)
355-
{
356-
op = PREWITT;
357-
gradThresh = 11;
358-
anchorThresh = 3;
359-
}
360-
361355
// Check parameters for sanity
362356
if (op < 0 || op > 3)
363357
op = 0;
@@ -444,7 +438,7 @@ void EdgeDrawingImpl::getEdgeImage(OutputArray _dst)
444438
void EdgeDrawingImpl::getGradientImage(OutputArray _dst)
445439
{
446440
if (!gradImage.empty())
447-
convertScaleAbs(gradImage, _dst);
441+
gradImage.copyTo(_dst);
448442
}
449443

450444
std::vector<std::vector<Point> > EdgeDrawingImpl::getSegments()
@@ -473,6 +467,7 @@ void EdgeDrawingImpl::ComputeGradient()
473467
body.SumFlag = params.SumFlag;
474468
body.op = op;
475469
body.grads = grads;
470+
body.PFmode = params.PFmode;
476471

477472
parallel_for_(Range(1, smoothImage.rows - 1), body);
478473
}

0 commit comments

Comments
 (0)