Vladislav Vinogradov
|
0c7663eb3b
|
Merge branch 'master' into gpu-cuda-rename
Conflicts:
modules/core/include/opencv2/core/cuda.hpp
modules/cudacodec/src/thread.cpp
modules/cudacodec/src/thread.hpp
modules/superres/perf/perf_superres.cpp
modules/superres/src/btv_l1_cuda.cpp
modules/superres/src/optical_flow.cpp
modules/videostab/src/global_motion.cpp
modules/videostab/src/inpainting.cpp
samples/cpp/stitching_detailed.cpp
samples/cpp/videostab.cpp
samples/gpu/stereo_multi.cpp
|
2013-09-06 15:44:44 +04:00 |
|
Andrey Kamaev
|
e10ee89ec4
|
Merge branch 2.4
|
2012-11-30 19:54:24 +04:00 |
|
Andrey Pavlenko
|
b19f672843
|
(#2569) simplifying code to avoid Eclipse CDT editor confusion, removing warnings and typos in comments
|
2012-11-26 17:32:10 +04:00 |
|
Alexander Smorkalov
|
91a9923dcf
|
Face detection package name replaced on org.opencv.facedetect for consistency with Google Play package.
|
2012-11-09 09:40:19 +04:00 |
|
Alexander Smorkalov
|
95b7f5c46c
|
Face Detection sample namespace replaced on org.opencv.facedetect for consistency with Google Play.
|
2012-11-07 13:27:33 +04:00 |
|
Andrey Kamaev
|
eaf75dbc95
|
Fix crash on resume in face detection sample
|
2012-08-24 16:55:12 +04:00 |
|
Andrey Kamaev
|
a4235948a7
|
Fix Andoid samples: black screen after resume problem
|
2012-08-24 16:55:12 +04:00 |
|
Andrey Kamaev
|
e9e0668549
|
Fix crash on resume in face detection sample
|
2012-08-24 16:24:53 +04:00 |
|
Andrey Kamaev
|
285af48040
|
Fix Andoid samples: black screen after resume problem
|
2012-08-24 16:17:42 +04:00 |
|
Marina Kolpakova
|
680a44189c
|
merged the trunk r8704:8716
|
2012-06-28 16:13:29 +00:00 |
|
Alexander Smorkalov
|
700b685575
|
Revision 8725 restored. Android sample FaceDetection updated according DetectionBasedTracker interface.
|
2012-06-25 17:12:19 +00:00 |
|
Alexander Smorkalov
|
80febef237
|
revision 8721 vas merged to head. Detection based tracker interface changed. cpp and android samples updated.
|
2012-06-25 17:01:55 +00:00 |
|
Andrey Kamaev
|
bd901eb52d
|
Reverted r8721 and r8725 (issue #2080)
|
2012-06-24 08:50:03 +00:00 |
|
Alexander Smorkalov
|
02170a0a58
|
Sample updated due to new DetectionBasedTracker interface.
|
2012-06-22 14:07:54 +00:00 |
|
Alexander Smorkalov
|
a3be73b5cc
|
revisions 8681 and 8688 restored. Warning fixed.
Warning: changes beak binary compatibility
|
2012-06-21 14:37:28 +00:00 |
|
Andrey Kamaev
|
d48d7b2b46
|
Updated warning options for GCC; fixed new warnings.
|
2012-06-20 12:27:02 +00:00 |
|
Andrey Kamaev
|
50c2443691
|
Merged Android samples from trunk r8423 r8533
|
2012-06-01 08:45:45 +00:00 |
|
Alexander Smorkalov
|
3780685fe6
|
CodeReview #1512 notes fixed.
|
2012-05-31 12:26:29 +00:00 |
|