Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv
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
Commits
c4b57d0d
Commit
c4b57d0d
authored
Jul 14, 2016
by
Ilya Lavrenov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
disable ippiMinMaxIndx_32f_C1R usage since it crashes on Nans
parent
a00f0c44
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
1 deletion
+12
-1
stat.cpp
modules/core/src/stat.cpp
+3
-1
test_arithm.cpp
modules/core/test/test_arithm.cpp
+9
-0
No files found.
modules/core/src/stat.cpp
View file @
c4b57d0d
...
...
@@ -2280,7 +2280,9 @@ static bool ipp_minMaxIdx( Mat &src, double* minVal, double* maxVal, int* minIdx
#endif
depth
==
CV_16U
?
(
ippiMinMaxIndxFuncC1
)
ippiMinMaxIndx_16u_C1R
:
#if !((defined _MSC_VER && defined _M_IX86) || defined __i386__)
depth
==
CV_32F
?
(
ippiMinMaxIndxFuncC1
)
ippiMinMaxIndx_32f_C1R
:
// See bug #4955: the function fails with SEGFAULT when the source matrix contains NANs
// IPPICV version is 9.0.1.
// depth == CV_32F ? (ippiMinMaxIndxFuncC1)ippiMinMaxIndx_32f_C1R :
#endif
0
;
CV_SUPPRESS_DEPRECATED_END
...
...
modules/core/test/test_arithm.cpp
View file @
c4b57d0d
...
...
@@ -1844,3 +1844,12 @@ TEST(Normalize, regression_5876_inplace_change_type)
normalize
(
m
,
m
,
1
,
0
,
NORM_MINMAX
,
CV_32F
);
EXPECT_EQ
(
0
,
cvtest
::
norm
(
m
,
result
,
NORM_INF
));
}
TEST
(
MinMaxLoc
,
regression_4955_nans
)
{
cv
::
Mat
one_mat
(
2
,
2
,
CV_32F
,
cv
::
Scalar
(
1
));
cv
::
minMaxLoc
(
one_mat
,
NULL
,
NULL
,
NULL
,
NULL
);
cv
::
Mat
nan_mat
(
2
,
2
,
CV_32F
,
cv
::
Scalar
(
NAN
));
cv
::
minMaxLoc
(
nan_mat
,
NULL
,
NULL
,
NULL
,
NULL
);
}
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