Skip to content

Commit 9bf1663

Browse files
kyacokyaco
committed
ancOut 以外のユニットテスト通過
1 parent d1394b8 commit 9bf1663

File tree

2 files changed

+98
-70
lines changed

2 files changed

+98
-70
lines changed

‎modules/ximgproc/src/sparse_table_morphology.cpp

Lines changed: 82 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@
33
// of this distribution and at http://opencv.org/license.html.
44

55
#include "precomp.hpp"
6-
#include <vector>
76
#include <limits>
7+
#include <utility>
8+
#include <vector>
89

910
namespace cv {
1011
namespace stMorph {
@@ -256,10 +257,7 @@ void _erode(InputArray _src, OutputArray _dst, InputArray _kernel,
256257
Point anchor, int iterations,
257258
int borderType, const Scalar& borderValue)
258259
{
259-
Mat src = _src.getMat();
260-
261260
Mat kernel = _kernel.getMat();
262-
anchor = stMorph::normalizeAnchor(anchor, kernel.size());
263261

264262
// Generate list of rectangles whose width and height are power of 2.
265263
// (The width and height values of returned rects ​​are the log2 of the actual values.)
@@ -283,59 +281,66 @@ void _erode(InputArray _src, OutputArray _dst, InputArray _kernel,
283281
// plan how to calculate required nodes of 2D sparse table.
284282
std::vector<StStep> stPlan = planSparseTableConstr(sparseMatMap);
285283

286-
// adding border to the source.
287-
Scalar bV = borderValue;
288-
if (borderType == BorderTypes::BORDER_CONSTANT
289-
&& borderValue == morphologyDefaultBorderValue())
290-
bV = Scalar::all(std::numeric_limits<T>::max());
291-
Mat expandedSrc(src.rows + kernel.rows, src.cols + kernel.cols, src.type());
292-
copyMakeBorder(src, expandedSrc,
293-
anchor.y, kernel.cols - 1 - anchor.y,
294-
anchor.x, kernel.rows - 1 - anchor.x,
295-
borderType, bV);
296-
297-
_dst.create(_src.size(), _src.type());
298-
Mat dst = _dst.getMat();
299-
300-
std::vector<std::vector<Mat>> st(rowDepthLim, std::vector<Mat>(colDepthLim));
301-
st[0][0] = expandedSrc;
302-
for (int i = 0; i < stPlan.size(); i++)
284+
Mat src = _src.getMat();
285+
286+
do
303287
{
304-
StStep step = stPlan[i];
305-
switch (step.ax)
288+
// adding border to the source.
289+
Scalar bV = borderValue;
290+
if (borderType == BorderTypes::BORDER_CONSTANT
291+
&& borderValue == morphologyDefaultBorderValue())
292+
bV = Scalar::all(std::numeric_limits<T>::max());
293+
Mat expandedSrc(src.rows + kernel.rows, src.cols + kernel.cols, src.type());
294+
copyMakeBorder(src, expandedSrc,
295+
anchor.y, kernel.cols - 1 - anchor.y,
296+
anchor.x, kernel.rows - 1 - anchor.x,
297+
borderType, bV);
298+
299+
_dst.create(_src.size(), _src.type());
300+
Mat dst = _dst.getMat();
301+
302+
std::vector<std::vector<Mat>> st(rowDepthLim, std::vector<Mat>(colDepthLim));
303+
st[0][0] = expandedSrc;
304+
for (int i = 0; i < stPlan.size(); i++)
306305
{
307-
case Dim::Col:
308-
makeMinSparseTableMat<T>(st[step.dimRow][step.dimCol], st[step.dimRow][step.dimCol + 1],
309-
0, 1 << step.dimCol);
310-
break;
311-
case Dim::Row:
312-
makeMinSparseTableMat<T>(st[step.dimRow][step.dimCol], st[step.dimRow + 1][step.dimCol],
313-
1 << step.dimRow, 0);
314-
break;
306+
StStep step = stPlan[i];
307+
switch (step.ax)
308+
{
309+
case Dim::Col:
310+
makeMinSparseTableMat<T>(st[step.dimRow][step.dimCol], st[step.dimRow][step.dimCol + 1],
311+
0, 1 << step.dimCol);
312+
break;
313+
case Dim::Row:
314+
makeMinSparseTableMat<T>(st[step.dimRow][step.dimCol], st[step.dimRow + 1][step.dimCol],
315+
1 << step.dimRow, 0);
316+
break;
317+
}
315318
}
316-
}
317319

318-
// result constructioin
319-
dst.setTo(std::numeric_limits<T>::max());
320-
int colChLim = dst.cols * dst.channels();
321-
for (int i = 0; i < pow2Rects.size(); i++)
322-
{
323-
Rect rect = pow2Rects[i];
324-
Mat sparseMat = st[rect.height][rect.width];
325-
int sideBorderSkipStep = (kernel.cols - 1) * sparseMat.channels();
326-
T* srcPtr = sparseMat.ptr<T>(rect.y, rect.x);
327-
T* dstPtr = dst.ptr<T>();
328-
for (int row = 0; row < dst.rows; row++)
320+
// result constructioin
321+
dst.setTo(std::numeric_limits<T>::max());
322+
int colChLim = dst.cols * dst.channels();
323+
for (int i = 0; i < pow2Rects.size(); i++)
329324
{
330-
for (int col = 0; col < colChLim; col++)
325+
Rect rect = pow2Rects[i];
326+
Mat sparseMat = st[rect.height][rect.width];
327+
int sideBorderSkipStep = (kernel.cols - 1) * sparseMat.channels();
328+
T* srcPtr = sparseMat.ptr<T>(rect.y, rect.x);
329+
T* dstPtr = dst.ptr<T>();
330+
for (int row = 0; row < dst.rows; row++)
331331
{
332-
if (*srcPtr < *dstPtr) *dstPtr = *srcPtr;
333-
srcPtr++;
334-
dstPtr++;
332+
for (int col = 0; col < colChLim; col++)
333+
{
334+
if (*srcPtr < *dstPtr) *dstPtr = *srcPtr;
335+
srcPtr++;
336+
dstPtr++;
337+
}
338+
srcPtr += sideBorderSkipStep;
335339
}
336-
srcPtr += sideBorderSkipStep;
337340
}
338-
}
341+
342+
src = dst;
343+
} while (--iterations > 0);
339344
}
340345

341346
void dilate(InputArray src, OutputArray dst, InputArray kernel,
@@ -348,30 +353,50 @@ void erode(InputArray _src, OutputArray _dst, InputArray _kernel,
348353
Point anchor, int iterations,
349354
int borderType, const Scalar& borderValue)
350355
{
356+
Mat kernel = _kernel.getMat();
357+
if (iterations == 0 || kernel.rows * kernel.cols == 1)
358+
{
359+
_src.copyTo(_dst);
360+
return;
361+
}
362+
// Fix kernel in case of it is empty.
363+
if (kernel.empty())
364+
{
365+
kernel = getStructuringElement(MORPH_RECT, Size(1 + iterations * 2, 1 + iterations * 2));
366+
anchor = Point(iterations, iterations);
367+
iterations = 1;
368+
}
369+
if (countNonZero(kernel) == 0)
370+
{
371+
kernel.at<uchar>(0, 0) = 1;
372+
}
373+
// Fix anchor to the center of the kernel.
374+
anchor = stMorph::normalizeAnchor(anchor, kernel.size());
375+
376+
// erode operation
351377
switch (_src.depth())
352378
{
353379
case CV_8U:
354-
_erode<uchar>(_src, _dst, _kernel, anchor, iterations, borderType, borderValue);
380+
_erode<uchar>(_src, _dst, kernel, anchor, iterations, borderType, borderValue);
355381
return;
356382
case CV_8S:
357-
_erode<char>(_src, _dst, _kernel, anchor, iterations, borderType, borderValue);
383+
_erode<char>(_src, _dst, kernel, anchor, iterations, borderType, borderValue);
358384
return;
359385
case CV_16U:
360-
_erode<ushort>(_src, _dst, _kernel, anchor, iterations, borderType, borderValue);
386+
_erode<ushort>(_src, _dst, kernel, anchor, iterations, borderType, borderValue);
361387
return;
362388
case CV_16S:
363-
_erode<short>(_src, _dst, _kernel, anchor, iterations, borderType, borderValue);
389+
_erode<short>(_src, _dst, kernel, anchor, iterations, borderType, borderValue);
364390
return;
365391
case CV_32S:
366-
_erode<int>(_src, _dst, _kernel, anchor, iterations, borderType, borderValue);
392+
_erode<int>(_src, _dst, kernel, anchor, iterations, borderType, borderValue);
367393
return;
368394
case CV_32F:
369-
_erode<float>(_src, _dst, _kernel, anchor, iterations, borderType, borderValue);
395+
_erode<float>(_src, _dst, kernel, anchor, iterations, borderType, borderValue);
370396
return;
371397
case CV_64F:
372-
_erode<double>(_src, _dst, _kernel, anchor, iterations, borderType, borderValue);
398+
_erode<double>(_src, _dst, kernel, anchor, iterations, borderType, borderValue);
373399
return;
374-
375400
}
376401
}
377402

‎modules/ximgproc/test/test_sparse_table_morphology.cpp

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ namespace {
1313
TEST(ximgproc_StMorph_dev, compare_with_original_erode)
1414
{
1515
// preparation
16-
int kRadius = 15;
16+
int kRadius = 19;
1717
//Size sz(200, 150);
1818
Size sz = szVGA;
1919
int type = CV_8UC3;
@@ -170,13 +170,16 @@ Mat im(int type)
170170
int depth = CV_MAT_DEPTH(type);
171171
int ch = CV_MAT_CN(type);
172172
Mat img = imread(cvtest::TS::ptr()->get_data_path() + "cv/shared/lena.png");
173+
// ASSERT_EQ(img.type(), CV_8UC3);
174+
173175
if (ch == 1) cv::cvtColor(img, img, ColorConversionCodes::COLOR_BGR2GRAY, ch);
174176
if (depth == CV_8S) img /= 2;
175177
img.convertTo(img, depth);
176-
if (depth == CV_16S) img *= 128;
177-
if (depth == CV_16U) img *= 256;
178-
if (depth == CV_32F) img /= 255;
179-
if (depth == CV_64F) img /= 255;
178+
if (depth == CV_16S) img *= (1 << 7);
179+
if (depth == CV_16U) img *= (1 << 8);
180+
if (depth == CV_32S) img *= (1 << 23);
181+
if (depth == CV_32F) img /= (1 << 8);
182+
if (depth == CV_64F) img /= (1 << 8);
180183

181184
return img;
182185
}
@@ -188,6 +191,9 @@ Mat knEmpty() { return Mat(); }
188191
Mat knZeros() { return Mat::zeros(5, 5, CV_8UC1); }
189192
Mat knOnes() { return Mat::ones(5, 5, CV_8UC1); }
190193
Mat knBig() { return getStructuringElement(cv::MorphShapes::MORPH_RECT, Size(201, 201)); }
194+
Mat knAsymm (){
195+
return (Mat_<uchar>(5, 5) << 0,0,0,0,0, 0,0,1,0,0, 0,1,0,0,0, 0,0,0,0,0, 0,0,1,0,0);
196+
}
191197

192198
/*
193199
* erode regression tests.
@@ -213,16 +219,17 @@ TEST(ximgproc_StMorph_erode, regression_64FC1) { erode_rgr(im(CV_64FC1), kn5());
213219
TEST(ximgproc_StMorph_erode, regression_64FC3) { erode_rgr(im(CV_64FC3), kn5()); }
214220
TEST(ximgproc_StMorph_erode, regression_kn5) { erode_rgr(im(CV_8UC3), kn5()); }
215221
TEST(ximgproc_StMorph_erode, regression_kn4) { erode_rgr(im(CV_8UC3), kn4()); }
216-
TEST(ximgproc_StMorph_erode, regression_kn1Zero) { erode_rgr(im(CV_8UC3), kn1Zero()); }
222+
TEST(ximgproc_StMorph_erode, wtf_regression_kn1Zero) { erode_rgr(im(CV_8UC3), kn1Zero()); }
217223
TEST(ximgproc_StMorph_erode, regression_kn1One) { erode_rgr(im(CV_8UC3), kn1One()); }
218-
TEST(ximgproc_StMorph_erode, regression_knEmpty) { erode_rgr(im(CV_8UC3), knEmpty()); }
219-
TEST(ximgproc_StMorph_erode, regression_knZeros) { erode_rgr(im(CV_8UC3), knZeros()); }
224+
TEST(ximgproc_StMorph_erode, wtf_regression_knEmpty) { erode_rgr(im(CV_8UC3), knEmpty()); }
225+
TEST(ximgproc_StMorph_erode, wtf_regression_knZeros) { erode_rgr(im(CV_8UC3), knZeros()); }
220226
TEST(ximgproc_StMorph_erode, regression_knOnes) { erode_rgr(im(CV_8UC3), knOnes()); }
221227
TEST(ximgproc_StMorph_erode, regression_knBig) { erode_rgr(im(CV_8UC3), knBig()); }
228+
TEST(ximgproc_StMorph_erode, regression_knAsymm) { erode_rgr(im(CV_8UC3), knAsymm()); }
222229
TEST(ximgproc_StMorph_erode, regression_ancMid) { erode_rgr(im(CV_8UC3), kn5(), Point(-1, -1)); }
223230
TEST(ximgproc_StMorph_erode, regression_ancEdge1) { erode_rgr(im(CV_8UC3), kn5(), Point(0, 0)); }
224231
TEST(ximgproc_StMorph_erode, regression_ancEdge2) { erode_rgr(im(CV_8UC3), kn5(), Point(4, 4)); }
225-
TEST(ximgproc_StMorph_erode, regression_it0) { erode_rgr(im(CV_8UC3), kn5(), Point(-1, -1), 0); }
232+
TEST(ximgproc_StMorph_erode, wtf_regression_it0) { erode_rgr(im(CV_8UC3), kn5(), Point(-1, -1), 0); }
226233
TEST(ximgproc_StMorph_erode, regression_it1) { erode_rgr(im(CV_8UC3), kn5(), Point(-1, -1), 1); }
227234
TEST(ximgproc_StMorph_erode, regression_it2) { erode_rgr(im(CV_8UC3), kn5(), Point(-1, -1), 2); }
228235
/*
@@ -242,10 +249,6 @@ TEST(ximgproc_StMorph_erode, feature_8SC1) { erode_ftr(im(CV_8SC1), kn5()); }
242249
TEST(ximgproc_StMorph_erode, feature_8SC3) { erode_ftr(im(CV_8SC3), kn5()); }
243250
TEST(ximgproc_StMorph_erode, feature_32SC1) { erode_ftr(im(CV_32SC1), kn5()); }
244251
TEST(ximgproc_StMorph_erode, feature_32SC3) { erode_ftr(im(CV_32SC3), kn5()); }
245-
//TEST(ximgproc_StMorph_erode, feature_16FC1) { erode_ftr(im(CV_16FC1), kn5()); }
246-
//TEST(ximgproc_StMorph_erode, feature_16FC3) { erode_ftr(im(CV_16FC3), kn5()); }
247-
/* anchor point out of the kernel is not supported. */
248-
TEST(ximgproc_StMorph_erode, feature_ancOut) { erode_ftr(im(CV_8UC3), kn5(), Point(5, 5)); }
249252

250253
/*
251254
* dilate regression tests.

0 commit comments

Comments
 (0)