Andrey Pavlenko
39754bd6f9
Merge pull request #1920 from alalek:ocl_disable_workaround
2013-12-05 16:46:25 +04:00
Roman Donchenko
bee4dff89d
Merge pull request #1447 from Siddharthk:master
2013-12-05 12:38:12 +04:00
Konstantin Matskevich
0a1ff0d42d
multithreading facedetector
2013-12-05 09:47:36 +04:00
Konstantin Matskevich
e38ba1999b
facedetect
2013-12-05 09:20:36 +04:00
Zhigang Gong
6ce03b0484
Fixed some implicitly type conversions between vector and scalar data type.
...
There are some mixed implicitly/explicitly type conversion between
scalar and vector. Although the spec allows those conversion, I prefer
to make them consistent and use explicitly all the cases.
Signed-off-by: Zhigang Gong <zhigang.gong@intel.com>
2013-12-05 09:35:21 +08:00
Josep Bosch
2153453fd1
Fixed little issue with mouse callback refering to issue 3409. Was using round instead of floor.
2013-12-04 22:32:20 +01:00
Vadim Pisarevsky
828b0b151b
another attempt to fix compile errors
2013-12-04 22:22:36 +04:00
Vadim Pisarevsky
fe11ca886a
trying to eliminate compile problems
2013-12-04 21:56:35 +04:00
Andrey Pavlenko
458ac2592b
Merge pull request #1908 from ilya-lavrenov:tapi_imgproc
2013-12-04 21:41:44 +04:00
Andrey Pavlenko
098d4e6174
Merge pull request #1924 from ilya-lavrenov:svm
2013-12-04 19:56:31 +04:00
Vadim Pisarevsky
ff87385201
refactored CascadeClassifier to hide implementation details (take 2)
2013-12-04 19:00:39 +04:00
Baichuan Su
632b21e090
Modify default setting, using ocl method when have ocl module
2013-12-04 18:26:54 +04:00
Baichuan Su
2cf16db683
Add Macro to decide using ocl method or not.
2013-12-04 18:26:54 +04:00
Baichuan Su
00300baa53
Add OpenCL SVM paths for bagofwords_classification and points_classifier samples.
2013-12-04 18:26:54 +04:00
siddharth
778edff9e1
Added comment in demo file
2013-12-04 19:18:00 +05:30
siddharth
c48ad880f3
Errors resolved
2013-12-04 19:18:00 +05:30
Anna Kogan
944f7bac42
After-merge corrections
2013-12-04 19:18:00 +05:30
siddharth
573e818415
New changes done and removed opencv_extra folder
...
Removed opencv_extra folder inside opencv folder
New changes done
Removed test images
2013-12-04 19:18:00 +05:30
siddharth
33e6c07485
Removed build errors and removed test images
...
Removed conflict
Error fix 1
Error fix 2
Error fix 3
Error fix 3
Error fix 4
Error fix 5
Error fix 6
Error fix 7
Error fix 8
Error fix 9
Error fix 10
Error fix 11
Error fix 12
Errors fixed
Removed opencv_extra folder inside opencv folder
2013-12-04 19:18:00 +05:30
siddharth
2f65a0d4ba
Changes done in npr module
2013-12-04 19:18:00 +05:30
siddharth
35d9ca6483
Changes done in cloning module
2013-12-04 19:18:00 +05:30
siddharth
daa9694cab
Changes done in decolorization module
2013-12-04 19:17:59 +05:30
siddharth
94eab9babe
Revert Back
2013-12-04 19:17:59 +05:30
siddharth
6c7272bde1
Update to remove Android error
2013-12-04 19:17:59 +05:30
siddharth
3b239561c6
Changed STL in contrast_preserve file
2013-12-04 19:17:59 +05:30
siddharth
f85a615f3f
whitespaces removed and other minor changes to fix build error
...
Update 1
update 2
Update 3
Update 4
Update 5
update 6
Update 7
Update 8
Update 9
Update 10
Update 11
Update 12
Update 13
Update 14
Update 15
Update 16
Update 17
Update 18
Update 19
Update 20
Update 21
Update 22
Removed Headers
Update 23
Update 24
Update 25
Update 26
Update 27
Update 28
2013-12-04 19:17:59 +05:30
siddharth
05c7c9325a
cloning_gui.cpp updated
2013-12-04 19:17:59 +05:30
siddharth
75b76554bf
errors in samples/cpp removed
2013-12-04 19:17:59 +05:30
siddharth
01e1ccfa88
cloning_demo error removed
2013-12-04 19:17:59 +05:30
siddharth
f8b00e5269
renamed
2013-12-04 19:17:59 +05:30
siddharth
7ab43585aa
remove cloning_example.cpp
2013-12-04 19:17:58 +05:30
siddharth
50c19423f9
cloning demo added
2013-12-04 19:17:58 +05:30
siddharth
56ab1c18e6
new filters added and all the 3 modules updated
...
All 3 modules Updated
2013-12-04 19:17:58 +05:30
siddharth
ae9b4003ae
edge preserve filters added and windows warning removed
...
update1
2013-12-04 19:17:58 +05:30
siddharth
1ed0e44090
added keyboard control
2013-12-04 19:17:58 +05:30
siddharth
e170115ad0
new interface added. decolor and cloning module added.
...
Both modules added
2013-12-04 19:17:58 +05:30
siddharth
5b0ee9e085
decolor module updated
2013-12-04 19:17:58 +05:30
siddharth
0802c06571
seamless cloning added
...
update1
update1
update4
2013-12-04 19:17:58 +05:30
siddharth
a1b3ba02a7
add color_boost + doc
2013-12-04 19:17:58 +05:30
siddharth
88aa4a9902
decolor module updated
...
update3
update4
update4
update5
added test data
2013-12-04 19:17:58 +05:30
siddharth
95db69f6b9
added new files
2013-12-04 19:17:58 +05:30
Roman Donchenko
0736ede7e5
Merge pull request #1914 from SpecLad:merge-2.4
2013-12-04 16:30:57 +04:00
Roman Donchenko
d8a4d3a2eb
Merge pull request #1921 from SpecLad:defined-msc-ver
2013-12-04 15:46:56 +04:00
Roman Donchenko
3e1586a1c6
Merge pull request #1919 from SpecLad:platfrom
2013-12-04 13:55:45 +04:00
Roman Donchenko
fa2cd93ecf
Merge pull request #1915 from jet47:gpu-color-test-fix
2013-12-04 13:55:28 +04:00
Ilya Lavrenov
e2b99a32b2
added cv::threshold to T-API
2013-12-04 13:45:44 +04:00
Ilya Lavrenov
474fc887a6
added cv::copyMakeBorder to T-API
2013-12-04 13:41:35 +04:00
Ilya Lavrenov
5b5f5878ce
added tests to imgproc
2013-12-04 13:41:34 +04:00
Alexander Alekhin
7b551af424
ocl: try to disable clFinish workaround
2013-12-04 13:00:37 +04:00
Roman Donchenko
11c7053b0f
Fixed a -Wundef warning in cl_platform.h.
...
_MSC_VER -> defined _MSC_VER. Fixes building with MinGW.
Similar to fbc91c5ee
.
2013-12-04 12:39:20 +04:00