projects
/
profile
/
ivi
/
opencv.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
157f35e
2875ce6
)
Merge pull request #2491 from ilya-lavrenov:tapi_sep_filter
author
Andrey Pavlenko
<andrey.pavlenko@itseez.com>
Mon, 24 Mar 2014 06:37:14 +0000
(10:37 +0400)
committer
OpenCV Buildbot
<buildbot@opencv.org>
Mon, 24 Mar 2014 06:37:15 +0000
(10:37 +0400)
1
2
modules/core/src/matrix.cpp
patch
|
diff1
|
diff2
|
blob
|
history
modules/core/src/ocl.cpp
patch
|
diff1
|
diff2
|
blob
|
history
modules/imgproc/test/ocl/test_filters.cpp
patch
|
diff1
|
diff2
|
blob
|
history
modules/imgproc/test/ocl/test_sepfilter2D.cpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
modules/core/src/matrix.cpp
Simple merge
diff --cc
modules/core/src/ocl.cpp
Simple merge
diff --cc
modules/imgproc/test/ocl/test_filters.cpp
Simple merge
diff --cc
modules/imgproc/test/ocl/test_sepfilter2D.cpp
index
d242a73
,
0aafb8a
..
34af4a6
---
1
/
modules/imgproc/test/ocl/test_sepfilter2D.cpp
---
2
/
modules/imgproc/test/ocl/test_sepfilter2D.cpp
+++ b/
modules/imgproc/test/ocl/test_sepfilter2D.cpp
@@@
-100,11
-92,10
+92,10
@@@
PARAM_TEST_CASE(SepFilter2D, MatDepth,
Border dstBorder = randomBorder(0, useRoi ? MAX_VALUE : 0);
randomSubMat(dst, dst_roi, roiSize, dstBorder, type, -MAX_VALUE, MAX_VALUE);
- anchor.x = -1;
- anchor.y = -1;
+ anchor.x = anchor.y = -1;
- UMAT_UPLOAD_INPUT_PARAMETER(src)
- UMAT_UPLOAD_OUTPUT_PARAMETER(dst)
+ UMAT_UPLOAD_INPUT_PARAMETER(src)
;
+ UMAT_UPLOAD_OUTPUT_PARAMETER(dst)
;
}
void Near(double threshold = 0.0)