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
f60726b0
Commit
f60726b0
authored
Sep 02, 2014
by
E Braun
Committed by
Vadim Pisarevsky
Sep 19, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "fix for bug 3172"
This reverts commit
ed2cdb71
.
parent
1675b23a
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
1 deletion
+3
-1
stat.cpp
modules/core/src/stat.cpp
+3
-1
No files found.
modules/core/src/stat.cpp
View file @
f60726b0
...
...
@@ -2463,7 +2463,7 @@ struct BatchDistInvoker : public ParallelLoopBody
}
void
cv
::
batchDistance
(
InputArray
_src1
,
InputArray
_src2
,
InputOutputArray
_dist
,
int
dtype
,
Input
OutputArray
_nidx
,
OutputArray
_dist
,
int
dtype
,
OutputArray
_nidx
,
int
normType
,
int
K
,
InputArray
_mask
,
int
update
,
bool
crosscheck
)
{
...
...
@@ -2479,6 +2479,8 @@ void cv::batchDistance( InputArray _src1, InputArray _src2,
}
CV_Assert
(
(
type
==
CV_8U
&&
dtype
==
CV_32S
)
||
dtype
==
CV_32F
);
K
=
std
::
min
(
K
,
src2
.
rows
);
_dist
.
create
(
src1
.
rows
,
(
K
>
0
?
K
:
src2
.
rows
),
dtype
);
Mat
dist
=
_dist
.
getMat
(),
nidx
;
if
(
_nidx
.
needed
()
)
...
...
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