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.
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: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
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
Anatoly Baksheev [Sat, 16 Mar 2013 20:40:35 +0000 (00:40 +0400)]
Added Affine3<T> class
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
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
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
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
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
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
marina.kolpakova [Thu, 28 Feb 2013 12:19:16 +0000 (16:19 +0400)]
moved documentation for CUDA version of softcascade
Andrey Kamaev [Thu, 14 Mar 2013 07:42:22 +0000 (11:42 +0400)]
Merge pull request #645 from taka-no-me:bump_headers
Andrey Kamaev [Thu, 14 Mar 2013 07:42:05 +0000 (11:42 +0400)]
Merge pull request #642 from taka-no-me:fix1
Andrey Kamaev [Thu, 14 Mar 2013 07:41:35 +0000 (11:41 +0400)]
Merge pull request #641 from taka-no-me:stlfree_xadd
Andrey Kamaev [Thu, 14 Mar 2013 07:41:17 +0000 (11:41 +0400)]
Merge pull request #640 from cuda-geek:soft-cascade-sample
Andrey Kamaev [Wed, 13 Mar 2013 12:38:40 +0000 (16:38 +0400)]
Added compatibility headers
Andrey Kamaev [Wed, 13 Mar 2013 12:22:44 +0000 (16:22 +0400)]
Main module headers are moved 1 level up
e.g. <opencv2/core/core.hpp> become <opencv2/core.hpp>
Also renamed <opencv2/core/opengl_interop.hpp> to <opencv2/core/opengl.hpp>
cuda-geek [Wed, 13 Mar 2013 13:00:53 +0000 (17:00 +0400)]
Merge pull request #643 from cuda-geek:refactor-softcascade-globbing
marina.kolpakova [Wed, 13 Mar 2013 10:11:34 +0000 (14:11 +0400)]
use OpenCV's twister.
marina.kolpakova [Wed, 13 Mar 2013 09:40:11 +0000 (13:40 +0400)]
enable training test. refactor globbing
Andrey Kamaev [Wed, 13 Mar 2013 07:34:04 +0000 (11:34 +0400)]
Fixed MSVC warnings
marina.kolpakova [Wed, 13 Mar 2013 03:31:43 +0000 (07:31 +0400)]
add softcascade to people detector sample
Andrey Kamaev [Tue, 12 Mar 2013 18:36:00 +0000 (22:36 +0400)]
Avoid assert in lapac.cpp if findHomography fails in BestOf2NearestMatcher::match
Andrey Kamaev [Tue, 12 Mar 2013 15:30:42 +0000 (19:30 +0400)]
Make CV_XADD independent on STL and system headers
Andrey Kamaev [Tue, 12 Mar 2013 14:14:23 +0000 (18:14 +0400)]
Reword and merge pull request #625 from jet47/gpu-fixes
Vladislav Vinogradov [Wed, 6 Mar 2013 11:18:44 +0000 (15:18 +0400)]
Move opengl iterop code to cv::ogl namespace
Fixed issues: #2737 #2848
cuda-geek [Tue, 12 Mar 2013 11:57:56 +0000 (15:57 +0400)]
Merge pull request #629 from cuda-geek:globbing
cuda-geek [Tue, 12 Mar 2013 09:11:49 +0000 (13:11 +0400)]
Merge pull request #621 from cuda-geek:twister
Andrey Kamaev [Mon, 11 Mar 2013 17:14:20 +0000 (21:14 +0400)]
Merge pull request #622 from moshekaplan:python2_cleanups
Andrey Kamaev [Mon, 11 Mar 2013 17:13:36 +0000 (21:13 +0400)]
Merge pull request #610 from AoD314:webp2
Ilya Lavrenov [Mon, 11 Mar 2013 16:21:48 +0000 (20:21 +0400)]
sse2 hog
Andrey Kamaev [Mon, 11 Mar 2013 14:50:19 +0000 (18:50 +0400)]
Merge branch '2.4'
Andrey Kamaev [Mon, 11 Mar 2013 14:40:40 +0000 (18:40 +0400)]
Fix clang + ccache build warnings
Andrey Kamaev [Mon, 11 Mar 2013 13:35:46 +0000 (17:35 +0400)]
Merge pull request #635 from taka-no-me:c++11
Andrey Kamaev [Mon, 11 Mar 2013 13:15:09 +0000 (17:15 +0400)]
Merge pull request #634 from taka-no-me:c++11-master
Andrey Kamaev [Mon, 11 Mar 2013 12:03:48 +0000 (16:03 +0400)]
Fix build errors with c++11
AoD314 [Thu, 7 Mar 2013 14:55:30 +0000 (18:55 +0400)]
added docs
Andrey Kamaev [Mon, 11 Mar 2013 10:52:22 +0000 (14:52 +0400)]
Fix build errors
AoD314 [Thu, 7 Mar 2013 15:26:44 +0000 (19:26 +0400)]
added tests for WebP
AoD314 [Thu, 7 Mar 2013 15:29:19 +0000 (19:29 +0400)]
This code is based on https://github.com/prasannatsm/opencv code.
- added webp (lossy and lossless without alpha channel)
- added tests
cuda_geek [Sat, 9 Mar 2013 18:43:34 +0000 (22:43 +0400)]
add dlobbing for Windows
marina.kolpakova [Sat, 9 Mar 2013 17:10:45 +0000 (21:10 +0400)]
add dlobbing under *nix
marina.kolpakova [Tue, 5 Mar 2013 22:51:19 +0000 (02:51 +0400)]
add Mersenne Twister random number generator
AoD314 [Thu, 7 Mar 2013 15:28:15 +0000 (19:28 +0400)]
added CMakeLists.txt for build WebP
AoD314 [Mon, 4 Mar 2013 16:58:02 +0000 (20:58 +0400)]
added cpu-features for WebP
AoD314 [Mon, 4 Mar 2013 16:57:25 +0000 (20:57 +0400)]
added WebP library
Andrey Kamaev [Wed, 6 Mar 2013 11:47:09 +0000 (15:47 +0400)]
Merge pull request #620 from apavlenko:java_tutorial_fix
Andrey Pavlenko [Wed, 6 Mar 2013 09:00:00 +0000 (13:00 +0400)]
removing redundant code
Andrey Pavlenko [Wed, 6 Mar 2013 08:59:38 +0000 (12:59 +0400)]
minor formatting
Moshe Kaplan [Wed, 6 Mar 2013 06:41:02 +0000 (01:41 -0500)]
Fixed shebangs, added error checking
Andrey Pavlenko [Tue, 5 Mar 2013 15:03:36 +0000 (19:03 +0400)]
more formatting
Andrey Pavlenko [Tue, 5 Mar 2013 14:42:14 +0000 (18:42 +0400)]
updating JNI lib location for Unix; formatting update
Andrey Pavlenko [Tue, 5 Mar 2013 14:41:44 +0000 (18:41 +0400)]
moving JNI library to 'build/lib' dir on non-Win
Andrey Kamaev [Tue, 5 Mar 2013 13:39:53 +0000 (17:39 +0400)]
Merge pull request #592 from vpisarev:c2cpp_calib3d_ptsetreg
Andrey Kamaev [Tue, 5 Mar 2013 11:26:51 +0000 (15:26 +0400)]
Merge pull request #605 from vpisarev:c2cpp_calib3d_stereo
Andrey Kamaev [Tue, 5 Mar 2013 11:26:15 +0000 (15:26 +0400)]
Merge pull request #491 from Daniil-Osokin:cvtRGB2YUV420p
cuda-geek [Tue, 5 Mar 2013 09:50:29 +0000 (13:50 +0400)]
Merge pull request #607 from cuda-geek:auto-compile-cuda
cuda-geek [Tue, 5 Mar 2013 09:12:38 +0000 (13:12 +0400)]
Merge pull request #618 from caotto:master
marina.kolpakova [Mon, 4 Mar 2013 07:18:05 +0000 (11:18 +0400)]
forbid recursive globbing for OpenCV modules sources
cuda-geek [Tue, 5 Mar 2013 04:57:58 +0000 (08:57 +0400)]
Merge pull request #596 from ArtanisCV:master
cuda-geek [Tue, 5 Mar 2013 04:56:57 +0000 (08:56 +0400)]
Merge pull request #617 from moshekaplan:master
Charles Otto [Tue, 5 Mar 2013 03:06:05 +0000 (22:06 -0500)]
Add version checks to previous modifications to ffmpeg_cap_impl.hpp
Add version checks around uses of AVCodecID and av_opt_set, since these aren't
defined for older versions of ffmpeg.
Charles Otto [Mon, 4 Mar 2013 21:37:19 +0000 (16:37 -0500)]
Allow encoding with libx264 via ffmpeg to work
Add a call to avcodec_get_context_defaults3, this sets per-codec default values
and in the case of libx264 will stop VideoWriter::open (with fourcc=x264) from
failing due to libx264 complaining about broken ffmpeg default settings.
Set some additional libx264 encoder parameters.
Vadim Pisarevsky [Mon, 4 Mar 2013 20:03:37 +0000 (00:03 +0400)]
mask.create() re-converted to new style
Vadim Pisarevsky [Mon, 4 Mar 2013 20:00:21 +0000 (00:00 +0400)]
reverting changes in Homography kernel function. For some reason GCC on Linux does not like it.
Moshe Kaplan [Mon, 4 Mar 2013 17:25:35 +0000 (12:25 -0500)]
Small changes to Python samples
Update find_obj.py:
Added additional error checking for the loaded files and modified the detector check to be more pythonic (is versus ==).
Update common.py:
Fixed a typo (contais -> contains)
Andrey Kamaev [Mon, 4 Mar 2013 15:29:40 +0000 (19:29 +0400)]
Merge release 2.4.4
Vadim Pisarevsky [Mon, 4 Mar 2013 12:02:15 +0000 (16:02 +0400)]
some more minor fixes
cuda-geek [Sun, 3 Mar 2013 04:59:56 +0000 (08:59 +0400)]
Merge pull request #606 from cuda-geek:fix-depth-less-2-bug-in-soft-cascade
cuda-geek [Sun, 3 Mar 2013 04:59:36 +0000 (08:59 +0400)]
Merge pull request #608 from cuda-geek:soft-cascade-hot-fixes
Vadim Pisarevsky [Sat, 2 Mar 2013 20:54:46 +0000 (00:54 +0400)]
several minor fixes proposed by Andrey
marina.kolpakova [Sat, 2 Mar 2013 09:06:29 +0000 (13:06 +0400)]
remove unused parameter from softcascade::Octave constructor
marina.kolpakova [Sat, 2 Mar 2013 05:33:17 +0000 (09:33 +0400)]
fix typo in integral buffer initialization
marina.kolpakova [Sat, 2 Mar 2013 05:24:13 +0000 (09:24 +0400)]
fixes for soft cascade training app
Vadim Pisarevsky [Fri, 1 Mar 2013 22:17:49 +0000 (02:17 +0400)]
removed preset parameter in createStereoBM, updated stereo_match sample
marina.kolpakova [Fri, 1 Mar 2013 20:17:46 +0000 (00:17 +0400)]
add possibility to create CUDA powered modules with ocv_define_module macro
marina.kolpakova [Fri, 1 Mar 2013 19:40:32 +0000 (23:40 +0400)]
fix uninitialized magnitude channel bug
marina.kolpakova [Fri, 1 Mar 2013 19:39:32 +0000 (23:39 +0400)]
refactor channel builder
fix condition for sample index in assert
marina.kolpakova [Fri, 1 Mar 2013 19:33:28 +0000 (23:33 +0400)]
fix import in scale_caltech python script
marina.kolpakova [Fri, 1 Mar 2013 19:21:25 +0000 (23:21 +0400)]
fix bug: depth of resulting tree is less then 2.
Andrey Kamaev [Fri, 1 Mar 2013 15:44:17 +0000 (19:44 +0400)]
Disable -fomit-frame-pointer for OS X Clang as it leads to crash on exception thrown