Misty De Meo [Fri, 22 Mar 2013 16:18:42 +0000 (11:18 -0500)]
Fix ant/Java detection in cmake scripts
Mac OS X 10.7 and newer don't come with Java installed. They do
include some stub binaries, which ask the user if they want to
install Java when run.
OpenCV's cmake script just checks for the existence of an ant
binary and assumes that Java's available if ant is. As a result,
cmake will configure the build to use Java and it will fail once
it tries to compile the Java bindings.
This fixes the issue by checking for the exit status of
`ant -version` - it exits 0 if Java is installed, or 1
otherwise.
Andrey Kamaev [Fri, 22 Mar 2013 15:35:17 +0000 (19:35 +0400)]
Merge pull request #690 from berak:master
Andrey Kamaev [Fri, 22 Mar 2013 15:34:52 +0000 (19:34 +0400)]
Merge pull request #680 from vpisarev:c2cpp_video_take2
berak [Fri, 22 Mar 2013 08:31:40 +0000 (09:31 +0100)]
Update CMakeLists.txt
exclude IlmImf/b44ExpLogTable.cpp from the build,
it's used originally to generate IlmImf/b44ExpLogTable.h, but not nessecary for the library.(probably only here for documentation
when included with static linking it introduces a problem with multiple definitions of main()
Vadim Pisarevsky [Thu, 21 Mar 2013 21:29:33 +0000 (01:29 +0400)]
restored CV_EXPORTS_W in the background subtraction classes
Andrey Kamaev [Thu, 21 Mar 2013 16:59:18 +0000 (20:59 +0400)]
Merge branch '2.4'
Vadim Pisarevsky [Thu, 21 Mar 2013 16:23:52 +0000 (20:23 +0400)]
fixed documentation and warnings on Windows
Andrey Kamaev [Thu, 21 Mar 2013 16:01:59 +0000 (09:01 -0700)]
Merge pull request #664 from taka-no-me/ocl
Move OpenCL SURF to nonfree module
Andrey Kamaev [Thu, 21 Mar 2013 15:59:59 +0000 (08:59 -0700)]
Merge pull request #686 from taka-no-me/stereobm_sobel
Fixed wrong index in prefilterXSobel function
Andrey Kamaev [Thu, 21 Mar 2013 15:59:48 +0000 (08:59 -0700)]
Merge pull request #676 from vpisarev/svd_stuff
added test for bug #1448 and hopefully fixes the bug #2898
Andrey Kamaev [Thu, 21 Mar 2013 15:59:34 +0000 (08:59 -0700)]
Merge pull request #675 from jet47/gpu-test-fixes
GPU test fixes
Andrey Kamaev [Thu, 21 Mar 2013 15:57:39 +0000 (08:57 -0700)]
Merge pull request #682 from vpisarev/python_str_fix
repaired std::string handling
Andrey Kamaev [Mon, 18 Mar 2013 10:42:27 +0000 (14:42 +0400)]
Fix build errors
Dong Nguyen [Wed, 20 Mar 2013 03:56:13 +0000 (10:56 +0700)]
Fixed wrong in row index of SSE implementation in prefilterXSobel function.
Andrey Kamaev [Mon, 18 Mar 2013 08:45:52 +0000 (12:45 +0400)]
Move OpenCl SURF perf tests to nonfree and fix build of samples
Andrey Kamaev [Sun, 17 Mar 2013 22:32:20 +0000 (02:32 +0400)]
Disable crashing ocl tests
Andrey Kamaev [Sun, 17 Mar 2013 21:59:24 +0000 (01:59 +0400)]
Refactor OpenCL initialization and allow to use ocl module witout explicit setup
Andrey Kamaev [Sat, 16 Mar 2013 21:14:45 +0000 (01:14 +0400)]
Trying to make ocl surf work
1. Added more sync to reduction.
2. Turned off Image2D feature. Probably its support is not detected correctly.
3. Temporary disabled descriptor tests - can't localize a problem of the ocl descriptor.
Andrey Kamaev [Sat, 16 Mar 2013 15:34:39 +0000 (19:34 +0400)]
SURF accuracy test is moved to nonfree
Andrey Kamaev [Sat, 16 Mar 2013 11:47:40 +0000 (15:47 +0400)]
Move OpenCL SURF to nonfree module
Andrey Kamaev [Fri, 15 Mar 2013 19:56:31 +0000 (23:56 +0400)]
Allow OpenCL acceleration in every OpenCV module
Andrey Kamaev [Fri, 15 Mar 2013 19:29:22 +0000 (23:29 +0400)]
Refactor OpenCL search
Andrey Kamaev [Fri, 15 Mar 2013 16:56:29 +0000 (20:56 +0400)]
Turn on OpenCL by default
Vadim Pisarevsky [Thu, 21 Mar 2013 11:46:21 +0000 (15:46 +0400)]
fixed warnings; added read/write methods; fixed docs
Andrey Kamaev [Thu, 21 Mar 2013 10:59:55 +0000 (14:59 +0400)]
Merge pull request #679 from jet47:gpu-simd-functions
Andrey Kamaev [Thu, 21 Mar 2013 10:48:03 +0000 (14:48 +0400)]
Merge pull request #677 from jet47:gpu-lut-fix
Andrey Kamaev [Thu, 21 Mar 2013 10:47:48 +0000 (14:47 +0400)]
Merge pull request #665 from taka-no-me:core_utility
Andrey Kamaev [Thu, 21 Mar 2013 10:47:13 +0000 (14:47 +0400)]
Merge pull request #662 from asmorkalov:android_native_activity
Vladislav Vinogradov [Wed, 20 Mar 2013 12:27:58 +0000 (16:27 +0400)]
added simd_functions.hpp to device layer
Vladislav Vinogradov [Thu, 21 Mar 2013 08:18:56 +0000 (12:18 +0400)]
fixed minMax perf test
Vladislav Vinogradov [Wed, 20 Mar 2013 07:50:42 +0000 (11:50 +0400)]
disable tests that requires video support if it is not available
Vladislav Vinogradov [Wed, 20 Mar 2013 07:49:58 +0000 (11:49 +0400)]
increased epsilon in sanity test
Vladislav Vinogradov [Wed, 20 Mar 2013 07:49:33 +0000 (11:49 +0400)]
increased time limits in perf tests
Vladislav Vinogradov [Wed, 20 Mar 2013 08:31:21 +0000 (12:31 +0400)]
fixed gpu::LUT on multi device system
Vadim Pisarevsky [Thu, 21 Mar 2013 08:23:48 +0000 (12:23 +0400)]
Merge pull request #657 from prclibo:master
Vadim Pisarevsky [Thu, 21 Mar 2013 08:22:35 +0000 (12:22 +0400)]
Merge pull request #669 from vpisarev:fast_lin_svm
Vadim Pisarevsky [Thu, 21 Mar 2013 08:22:00 +0000 (12:22 +0400)]
Merge pull request #681 from jbohren-forks:fix-ellipse-segfault
Vadim Pisarevsky [Thu, 21 Mar 2013 07:30:38 +0000 (11:30 +0400)]
repaired std::string handling
cuda-geek [Thu, 21 Mar 2013 04:57:08 +0000 (08:57 +0400)]
Merge pull request #656 from jet47:gpu-nonfree
Jonathan Bohren [Wed, 20 Mar 2013 20:49:59 +0000 (16:49 -0400)]
Fixing segfault for near-zero-sized ellipses
Vadim Pisarevsky [Wed, 20 Mar 2013 15:51:49 +0000 (19:51 +0400)]
refactored video module; use the new-style algorithms now
Vadim Pisarevsky [Wed, 20 Mar 2013 15:51:33 +0000 (19:51 +0400)]
refactored video module; use the new-style algorithms now
Andrey Kamaev [Thu, 14 Mar 2013 16:10:54 +0000 (20:10 +0400)]
Move non-CV functionality from core.hpp to separate utility.hpp header
Bo Li [Wed, 20 Mar 2013 08:53:44 +0000 (09:53 +0100)]
update five-point license
Vadim Pisarevsky [Wed, 20 Mar 2013 07:58:19 +0000 (11:58 +0400)]
added test for bug #1448 and hopefully fixes the bug #2898
Andrey Kamaev [Tue, 19 Mar 2013 15:39:08 +0000 (19:39 +0400)]
Merge pull request #670 from Nerei:osx_compilation
Andrey Kamaev [Tue, 19 Mar 2013 15:38:52 +0000 (19:38 +0400)]
Merge pull request #668 from AoD314:webp2
Anatoly Baksheev [Tue, 19 Mar 2013 14:59:56 +0000 (18:59 +0400)]
compilation for osx
Vadim Pisarevsky [Tue, 19 Mar 2013 14:41:38 +0000 (18:41 +0400)]
added load/save feature for SVM classifier in letter_recog sample
Vadim Pisarevsky [Tue, 19 Mar 2013 14:28:17 +0000 (18:28 +0400)]
dramatic speedup of SVM::predict in the case of linear SVM
AoD314 [Tue, 19 Mar 2013 12:53:00 +0000 (16:53 +0400)]
improved test of webp
Andrey Kamaev [Tue, 19 Mar 2013 13:42:58 +0000 (17:42 +0400)]
Merge pull request #666 from cuda-geek:warnings
marina.kolpakova [Mon, 18 Mar 2013 23:25:33 +0000 (03:25 +0400)]
fix warnings under win.
Alexander Smorkalov [Tue, 12 Mar 2013 07:33:46 +0000 (11:33 +0400)]
Code refactoring was done.
Vladislav Vinogradov [Mon, 18 Mar 2013 12:14:37 +0000 (16:14 +0400)]
merged gpunonfree and nonfree module
Andrey Kamaev [Mon, 18 Mar 2013 12:00:54 +0000 (16:00 +0400)]
Merge pull request #663 from asmorkalov:manager_tegra4
Andrey Kamaev [Mon, 18 Mar 2013 11:56:54 +0000 (15:56 +0400)]
Merge pull request #654 from fish2000:patch-1
Andrey Kamaev [Mon, 18 Mar 2013 11:56:33 +0000 (15:56 +0400)]
Merge pull request #652 from Daniil-Osokin:fixCvtColorHeader
Andrey Kamaev [Mon, 18 Mar 2013 11:56:15 +0000 (15:56 +0400)]
Merge pull request #636 from ilya-lavrenov:SSE2_HOG
cuda-geek [Mon, 18 Mar 2013 11:34:02 +0000 (15:34 +0400)]
Merge pull request #661 from cuda-geek:merge-cpu-gpu-detections
Vladislav Vinogradov [Fri, 15 Mar 2013 13:58:18 +0000 (17:58 +0400)]
fixed warnings
Vladislav Vinogradov [Fri, 15 Mar 2013 10:09:39 +0000 (14:09 +0400)]
moved SURF_GPU and VIBE to gpunonfree module
Vladislav Vinogradov [Fri, 15 Mar 2013 10:09:10 +0000 (14:09 +0400)]
moved utility functions from gpu_perf_test and gpu_test to ts module
marina.kolpakova [Mon, 18 Mar 2013 09:50:45 +0000 (13:50 +0400)]
fix win warnings
cuda-geek [Mon, 18 Mar 2013 09:36:01 +0000 (13:36 +0400)]
Merge pull request #658 from Nerei:affine3_classes
cuda-geek [Mon, 18 Mar 2013 09:10:53 +0000 (13:10 +0400)]
Merge pull request #650 from taka-no-me:cvdef
cuda-geek [Mon, 18 Mar 2013 09:10:24 +0000 (13:10 +0400)]
Merge pull request #653 from jbohren-forks:master
Alexander Smorkalov [Mon, 18 Mar 2013 08:12:17 +0000 (12:12 +0400)]
Tegra4 support added.
Anatoly Baksheev [Sat, 16 Mar 2013 20:40:35 +0000 (00:40 +0400)]
Added Affine3<T> class
Alexander Smorkalov [Thu, 7 Mar 2013 11:13:30 +0000 (15:13 +0400)]
Initialization with Manager instead static link added.
Alexander Smorkalov [Mon, 4 Mar 2013 10:49:33 +0000 (14:49 +0400)]
Base for Native Activity example added.
Daniil Osokin [Thu, 14 Mar 2013 17:19:08 +0000 (21:19 +0400)]
Added missing enums for cvtColor RGB to YUV420p
marina.kolpakova [Mon, 18 Mar 2013 04:17:13 +0000 (08:17 +0400)]
refactor cpp files naming
marina.kolpakova [Fri, 15 Mar 2013 08:26:25 +0000 (12:26 +0400)]
merge Detection structure for CPU and GPU soft cascade detectors
cuda-geek [Sun, 17 Mar 2013 20:46:40 +0000 (00:46 +0400)]
Merge pull request #659 from Nerei:master
cuda-geek [Sun, 17 Mar 2013 19:00:04 +0000 (23:00 +0400)]
Merge pull request #660 from Nerei:2.4
Vadim Pisarevsky [Sun, 17 Mar 2013 15:13:37 +0000 (19:13 +0400)]
Merge pull request #532 from jet47:super-resolution
Anatoly Baksheev [Sun, 17 Mar 2013 14:43:55 +0000 (18:43 +0400)]
bugfix in sample to support LBP classifier. To merge to master also.
Anatoly Baksheev [Sun, 17 Mar 2013 14:02:52 +0000 (18:02 +0400)]
fixed compilation for vs2008
marina.kolpakova [Sun, 17 Mar 2013 01:50:45 +0000 (05:50 +0400)]
fix cuda
Bo Li [Fri, 15 Mar 2013 20:30:22 +0000 (21:30 +0100)]
updated doc
Bo Li [Fri, 15 Mar 2013 19:44:41 +0000 (20:44 +0100)]
rewrite five-point coeff matrix.
Andrey Kamaev [Fri, 15 Mar 2013 13:50:32 +0000 (17:50 +0400)]
Merge pull request #647 from taka-no-me:fix_ffmpeg_wrapper
Andrey Kamaev [Fri, 15 Mar 2013 12:55:58 +0000 (16:55 +0400)]
Unified handling of InputOutputArrays in Python wrapper generator
This makes arguments of type InputOutputArray required in python unless they
have a default value in C++.
As result following python functions changes signatures in non-trivial way:
* calcOpticalFlowFarneback
* calcOpticalFlowPyrLK
* calibrateCamera
* findContours
* findTransformECC
* floodFill
* kmeans
* PCACompute
* stereoCalibrate
And the following functions become return their modified inputs as a return
value:
* accumulate
* accumulateProduct
* accumulateSquare
* accumulateWeighted
* circle
* completeSymm
* cornerSubPix
* drawChessboardCorners
* drawContours
* drawDataMatrixCodes
* ellipse
* fillConvexPoly
* fillPoly
* filterSpeckles
* grabCut
* insertChannel
* line
* patchNaNs
* polylines
* randn
* randShuffle
* randu
* rectangle
* setIdentity
* updateMotionHistory
* validateDisparity
* watershed
cuda-geek [Fri, 15 Mar 2013 09:55:03 +0000 (13:55 +0400)]
Merge pull request #644 from jet47:gpu-debayer-mht
Alexander Bohn / FI$H2k [Fri, 15 Mar 2013 09:47:52 +0000 (06:47 -0300)]
Fix for encoding errors when building Java source
The generated OpenCV Java source can contain characters outside of ASCII on some systems – this patch allows the ant task to compile them.
Andrey Kamaev [Thu, 14 Mar 2013 10:49:15 +0000 (14:49 +0400)]
Extract common base header for C and C++ APIs
Andrey Kamaev [Fri, 15 Mar 2013 06:35:03 +0000 (10:35 +0400)]
Merge pull request #648 from cuda-geek:move-gpu-soft-cascade-to-softcascade-module
Andrey Kamaev [Fri, 15 Mar 2013 06:34:43 +0000 (10:34 +0400)]
Merge pull request #632 from pengx17:2.4
Andrey Kamaev [Fri, 15 Mar 2013 06:34:27 +0000 (10:34 +0400)]
Merge pull request #631 from bitwangyaoyao:2.4_stereo
Jonathan Bohren [Fri, 15 Mar 2013 03:29:46 +0000 (00:29 -0300)]
calib3d model superscript should be subscript
marina.kolpakova [Thu, 14 Mar 2013 19:06:17 +0000 (23:06 +0400)]
refactored cuda error handling; remove optional dependancies in soft cascade training app
marina.kolpakova [Thu, 14 Mar 2013 09:49:48 +0000 (13:49 +0400)]
fixed compilation with latest master changes
Vladislav Vinogradov [Wed, 13 Mar 2013 10:54:06 +0000 (14:54 +0400)]
implemented Malvar, He, and Cutler Bayer Demosaicing on gpu
Andrey Kamaev [Thu, 14 Mar 2013 10:50:03 +0000 (14:50 +0400)]
Fix build of ffmpeg wrapper with some versions of avutil
marina.kolpakova [Wed, 13 Mar 2013 13:12:19 +0000 (17:12 +0400)]
implement integral
marina.kolpakova [Wed, 13 Mar 2013 11:06:27 +0000 (15:06 +0400)]
remove generic version of GPU channel computer.
marina.kolpakova [Sun, 3 Mar 2013 12:27:49 +0000 (16:27 +0400)]
softcascade: remove device dependency on gpu
marina.kolpakova [Sun, 3 Mar 2013 09:01:17 +0000 (13:01 +0400)]
remove softcascade host dependencies on gpu module
marina.kolpakova [Sun, 3 Mar 2013 07:11:42 +0000 (11:11 +0400)]
move gpu version of soft cascade to dedicated module