projects
/
profile
/
ivi
/
opencv.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
88f5ef9
68a8a11
)
Merge pull request #1657 from KonstantinMatskevich:ocldistanceToCenters
author
Roman Donchenko
<roman.donchenko@itseez.com>
Mon, 28 Oct 2013 09:46:31 +0000
(13:46 +0400)
committer
OpenCV Buildbot
<buildbot@opencv.org>
Mon, 28 Oct 2013 09:46:32 +0000
(13:46 +0400)
1
2
modules/ocl/include/opencv2/ocl/ocl.hpp
patch
|
diff1
|
diff2
|
blob
|
history
modules/ocl/perf/perf_imgproc.cpp
patch
|
diff1
|
diff2
|
blob
|
history
modules/ocl/src/kmeans.cpp
patch
|
diff1
|
diff2
|
blob
|
history
modules/ocl/src/opencl/kmeans_kernel.cl
patch
|
diff1
|
diff2
|
blob
|
history
modules/ocl/test/test_kmeans.cpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
modules/ocl/include/opencv2/ocl/ocl.hpp
Simple merge
diff --cc
modules/ocl/perf/perf_imgproc.cpp
Simple merge
diff --cc
modules/ocl/src/kmeans.cpp
Simple merge
diff --cc
modules/ocl/src/opencl/kmeans_kernel.cl
Simple merge
diff --cc
modules/ocl/test/test_kmeans.cpp
Simple merge
projects / profile / ivi / opencv.git / commitdiff