Ilya Lavrenov
96adeb71ca
update android.toolchain.cmake
2014-12-18 19:31:10 +03:00
Vadim Pisarevsky
79f770455b
Merge pull request #3517 from wangyan42164:ocl_denoising_2
2014-12-18 14:50:13 +00:00
Vadim Pisarevsky
183454a723
Merge pull request #3522 from ilya-lavrenov:update_android_toolchain_cmake
2014-12-18 14:49:35 +00:00
Ilya Lavrenov
ba612fc9bd
update android.toolchain.cmake
2014-12-17 20:08:55 +03:00
Joe Howse
13c04120dd
For Java compatibility, avoiding explicit pseudonym in enum
2014-12-16 21:37:14 -04:00
Ana Huaman Quispe
1ad1b737c2
Fixed registration bug: It was ALWAYS OFF - even after changing the property
2014-12-16 19:45:50 -05:00
Joe Howse
620a969285
Allow BGR, RGB, or gray capture via libv4l
2014-12-16 20:07:37 -04:00
Artur Wieczorek
854a722c70
Implement VideoCapture::get, CvCapture::getProperty, IVideoCapture::getProperty as constant methods.
2014-12-16 16:08:22 +01:00
Florian Verdet
f87f0cc481
fix obvious copy+paste typo in computeDistance()
...
(with this else-branch, argument contour2 would not be used at all)
2014-12-16 12:46:07 +01:00
Maksim Shabunin
91e21847e2
Some changes to make migration to 3.0 easier
2014-12-16 13:00:31 +03:00
Yan Wang
efa84d8225
Use preprocessor for constant values in OpenCL kernel instead of
...
the parameter variable.
It could improve the performance of
OCL_Cascade_Image_MinSize_CascadeClassifier.CascadeClassifier/*.
Especially,
OCL_Cascade_Image_MinSize_CascadeClassifier.CascadeClassifier/15
OCL_Cascade_Image_MinSize_CascadeClassifier.CascadeClassifier/16
could be improved about 2% in Intel platform.
Signed-off-by: Yan Wang <yan.wang@linux.intel.com>
2014-12-16 16:21:05 +08:00
Yan Wang
fd2d800c06
Remove unnecessary local variable "size".
...
It should also be better for optimizing when compiling kernel.
Signed-off-by: Yan Wang <yan.wang@linux.intel.com>
2014-12-16 14:25:24 +08:00
Ana Huaman Quispe
0b429fee7b
Changed CV_DbgAssert to CV_Assert when setting video modes for OpenNI2. Otherwise, in release mode the default modes never get set
2014-12-15 18:16:25 -05:00
Vadim Pisarevsky
241991c677
Merge pull request #3498 from ilya-lavrenov:omp
2014-12-15 18:08:31 +00:00
Vadim Pisarevsky
009aec5164
Merge pull request #3491 from mshabunin:ios-extra-world
2014-12-15 18:07:09 +00:00
Vadim Pisarevsky
3c74c23bad
Merge pull request #3473 from TobyWanKenobi:master
2014-12-15 18:04:01 +00:00
Vadim Pisarevsky
d54b069ae1
Merge pull request #3448 from Ashod:highgui_trackbar_improvements
2014-12-15 18:03:01 +00:00
Vadim Pisarevsky
4ef03ccbe1
Merge pull request #3449 from Ashod:2.4_highgui_trackbar_improvements
2014-12-15 18:02:29 +00:00
Olexa Bilaniuk
bcc630a8dc
Merge remote-tracking branch 'upstream/master' into rho
2014-12-15 12:31:22 -05:00
StevenPuttemans
73d1ea9a52
fix bug 2432 for 2.4 branch
2014-12-15 11:56:42 +01:00
StevenPuttemans
edb608d206
fix documentation bug 2432
2014-12-15 11:53:55 +01:00
StevenPuttemans
db9a0cfbc0
add extra to FeatureDetector docs
2014-12-15 11:31:18 +01:00
vincentweb
4d12beb723
Added better OpenNI2 support to the Asus Xtion and Occipital Structure
...
sensors which do not have image generators.
2014-12-14 20:52:24 +01:00
mattip
ff7ea605ef
export thread control to generated wrappers
2014-12-14 11:55:02 +02:00
Boaz Stolk
bb873b1de5
add option to link to dynamic IPP libraries
2014-12-12 14:21:47 +01:00
Sync-my-L2P
5a43c7a28e
Update segmentation.cpp
...
removed trailing whitespaces
2014-12-11 17:36:36 +01:00
doltac
6cc5959356
Fixed typos in latentSVM detector demo.
2014-12-11 19:22:40 +09:00
Ilya Lavrenov
ce81433aff
ability to enable OpenMP simultaneously with other parallel framework
2014-12-10 13:34:39 +03:00
vbystricky
c48f30d4ec
Move createsamples application from 2.4 version
2014-12-10 12:17:58 +04:00
Vadim Pisarevsky
fed1b3fd59
Merge pull request #3495 from taka-no-me:fix_android_arm64
2014-12-09 14:12:22 +00:00
Vadim Pisarevsky
25378587e2
Merge pull request #3479 from mshabunin:doxygen-tutorials
2014-12-09 14:06:23 +00:00
Vadim Pisarevsky
10dc5a3759
Merge pull request #3492 from Dmitry-Me:reduceVariablesScope1
2014-12-09 14:05:35 +00:00
Andrey Kamaev
9582c33eab
Fix build for Android arm64-v8a
2014-12-09 12:06:56 +03:00
Alexander Alekhin
0f7721e915
Merge pull request #3486 from Chuanbo-Weng:repeat-perf
2014-12-08 15:49:21 +00:00
Dmitry-Me
f269828160
Reduce variables scope, move declaration to first use point
2014-12-08 18:21:17 +03:00
TobyWanKenobi
b35f5d115f
Removed "FORMAT_XML" to generalize format
...
Removed the "FileStorage::FORMAT_XML" to generalize format of the String
model.
2014-12-08 09:21:55 +01:00
orestis
c762da9893
Fix SymmColumnSmallVec_32s16s SSE code
...
Specifically, in general antisymmetric case src[-1] (S0) should be
subtracted from from src[1] (S2), and not the opposite.
2014-12-06 19:53:07 +02:00
Ashod Nakashian
63c49be487
highgui: Support to change trackbar count in setTrackbarPos and replaced deprecated CreateToolbarEx in Windows.
2014-12-06 11:56:01 -05:00
Ashod Nakashian
006384edaf
highgui: Support to change trackbar count in setTrackbarPos and replaced deprecated CreateToolbarEx in Windows.
2014-12-06 11:55:17 -05:00
Vadim Pisarevsky
0a4c616d43
Merge pull request #3487 from taka-no-me:ctrl_s_gtk
2014-12-06 10:04:22 +00:00
Vadim Pisarevsky
ef347f4b62
Merge pull request #3472 from Dmitry-Me:preventDivByZero
2014-12-06 08:09:01 +00:00
Vadim Pisarevsky
e0ab007b2b
Merge pull request #3475 from fhsm:master
2014-12-06 08:08:44 +00:00
Vadim Pisarevsky
ef534537b4
Merge pull request #3478 from akarsakov:rect_fix_typo
2014-12-06 08:08:27 +00:00
Vadim Pisarevsky
4f82b3588a
Merge pull request #3480 from mshabunin:python-test-24
2014-12-06 08:07:56 +00:00
Vadim Pisarevsky
bada364eb3
Merge pull request #3481 from mshabunin:python-test
2014-12-06 08:07:39 +00:00
Vadim Pisarevsky
3481c1caec
Merge pull request #3488 from jeremyhu:PR-4048
2014-12-06 08:03:56 +00:00
Olexa Bilaniuk
51963f95dd
Merge remote-tracking branch 'upstream/master' into rho
2014-12-05 15:56:33 -05:00
Jeremy Huddleston Sequoia
35f96d6da7
Fix tautologies in calibfilter.cpp which cause a build failure when using -Werror=address with clang-3.5
...
http://code.opencv.org/issues/4048
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
2014-12-05 10:22:11 -08:00
Maksim Shabunin
c28fea32c7
Build separate world-like iOS framework for contrib
2014-12-05 17:48:28 +03:00
Alexander Alekhin
893deb4040
Merge pull request #3483 from wangyan42164:ocl_orb_improve
2014-12-05 12:55:54 +00:00