platform/upstream/opencv.git
11 years agoAdd ECC algorithm
Georgios Evangelidis [Tue, 26 Feb 2013 22:27:54 +0000 (23:27 +0100)]
Add ECC algorithm

Evangelidis, G.D. and Psarakis E.Z. "Parametric Image Alignment using Enhanced
Correlation Coefficient Maximization", IEEE Transactions on PAMI, vol. 32, no.
10, 2008

11 years agoMerge pull request #580 from vrabaud:patch-1
Andrey Kamaev [Wed, 27 Feb 2013 20:39:04 +0000 (00:39 +0400)]
Merge pull request #580 from vrabaud:patch-1

11 years agoMerge pull request #462 from kobigurk:master
Andrey Kamaev [Wed, 27 Feb 2013 20:38:20 +0000 (00:38 +0400)]
Merge pull request #462 from kobigurk:master

11 years agoUpdate cmake/templates/OpenCVConfig.cmake.in
Vincent Rabaud [Wed, 27 Feb 2013 19:00:38 +0000 (11:00 -0800)]
Update cmake/templates/OpenCVConfig.cmake.in

find_package(OpenCV) should not include_directories by default, that is not standard afaik. Plus that creates problems when creating the ROS package :)

11 years agoMerge pull request #577 from ilya-lavrenov:BilateralFilter
Andrey Kamaev [Wed, 27 Feb 2013 15:44:55 +0000 (19:44 +0400)]
Merge pull request #577 from ilya-lavrenov:BilateralFilter

11 years agoMerge pull request #511 from aritzlc:master
Andrey Kamaev [Wed, 27 Feb 2013 15:33:01 +0000 (19:33 +0400)]
Merge pull request #511 from aritzlc:master

11 years agoadditional improvements for 32f
Ilya Lavrenov [Wed, 27 Feb 2013 13:54:22 +0000 (17:54 +0400)]
additional improvements for 32f

11 years agosome improvements of existing sse3 optimization of bilateral filter in case of 8uc3...
Ilya Lavrenov [Wed, 27 Feb 2013 12:53:09 +0000 (16:53 +0400)]
some improvements of existing sse3 optimization of bilateral filter in case of 8uc3. Now perf tests take 6120ms instead of previous 7250ms (1.18x speed-up)

11 years agoMerge pull request #566 from FabricioS:master
Andrey Kamaev [Wed, 27 Feb 2013 07:37:31 +0000 (11:37 +0400)]
Merge pull request #566 from FabricioS:master

11 years agoRepair build
Andrey Kamaev [Tue, 26 Feb 2013 19:12:20 +0000 (23:12 +0400)]
Repair build

11 years agoFix definition of the covariance matrix of derivatives.
Fabrice Silva [Tue, 26 Feb 2013 17:50:20 +0000 (18:50 +0100)]
Fix definition of the covariance matrix of derivatives.

11 years agoMerge pull request #543 from taka-no-me:explicit_stl
cuda-geek [Tue, 26 Feb 2013 16:54:12 +0000 (20:54 +0400)]
Merge pull request #543 from taka-no-me:explicit_stl

11 years agoMerge pull request #490 from mschoeler:master
Andrey Kamaev [Tue, 26 Feb 2013 14:33:05 +0000 (18:33 +0400)]
Merge pull request #490 from mschoeler:master

11 years agoAdded constants to gen_java.py
alegarda [Tue, 26 Feb 2013 10:21:43 +0000 (11:21 +0100)]
Added constants to gen_java.py

11 years agoMerge pull request #545 from cuda-geek:fix_lying_assertation
cuda-geek [Mon, 25 Feb 2013 19:11:02 +0000 (23:11 +0400)]
Merge pull request #545 from cuda-geek:fix_lying_assertation

11 years agofix lying assertation and hard-coded shrinkage
marina.kolpakova [Mon, 25 Feb 2013 14:51:12 +0000 (18:51 +0400)]
fix lying assertation and hard-coded shrinkage

11 years agoFix x64 build warnings
Andrey Kamaev [Mon, 25 Feb 2013 07:08:27 +0000 (11:08 +0400)]
Fix x64 build warnings

11 years agoRemove all using directives for STL namespace and members
Andrey Kamaev [Sun, 24 Feb 2013 16:14:01 +0000 (20:14 +0400)]
Remove all using directives for STL namespace and members

Made all STL usages explicit to be able automatically find all usages of
particular class or function.

11 years agoMerge pull request #534 from emchristiansen:c++11
Andrey Kamaev [Sun, 24 Feb 2013 19:31:11 +0000 (23:31 +0400)]
Merge pull request #534 from emchristiansen:c++11

11 years agorestore missed gpu functionality after merge #dddd285d
marina.kolpakova [Sun, 24 Feb 2013 18:14:57 +0000 (22:14 +0400)]
restore missed gpu functionality after merge #dddd285d

11 years agoMerge branch 2.4
Andrey Kamaev [Sun, 24 Feb 2013 16:16:41 +0000 (20:16 +0400)]
Merge branch 2.4

11 years agoMerge pull request #538 from NCBee:patch-2
Andrey Kamaev [Sun, 24 Feb 2013 11:27:01 +0000 (15:27 +0400)]
Merge pull request #538 from NCBee:patch-2

11 years agoMerge pull request #537 from bitwangyaoyao:2.4_fixWarpAffine
Andrey Kamaev [Sun, 24 Feb 2013 11:26:42 +0000 (15:26 +0400)]
Merge pull request #537 from bitwangyaoyao:2.4_fixWarpAffine

11 years agoMerge pull request #535 from bitwangyaoyao:2.4_clean
Andrey Kamaev [Sun, 24 Feb 2013 11:26:23 +0000 (15:26 +0400)]
Merge pull request #535 from bitwangyaoyao:2.4_clean

11 years agoMerge pull request #536 from bitwangyaoyao:2.4_fixHaar
Andrey Kamaev [Sun, 24 Feb 2013 11:26:06 +0000 (15:26 +0400)]
Merge pull request #536 from bitwangyaoyao:2.4_fixHaar

11 years agoUpdate doc/tutorials/core/adding_images/adding_images.rst
NCBee [Sat, 23 Feb 2013 15:28:24 +0000 (10:28 -0500)]
Update doc/tutorials/core/adding_images/adding_images.rst

Quick fix for: http://code.opencv.org/issues/2803

11 years agoremove the empty implementation when HAVE_OPENCL not defined
yao [Sat, 23 Feb 2013 12:50:03 +0000 (20:50 +0800)]
remove the empty implementation when HAVE_OPENCL not defined

11 years agofix mismatch of WarpAffine
yao [Sat, 23 Feb 2013 09:43:10 +0000 (17:43 +0800)]
fix mismatch of WarpAffine

11 years agosome cleanup
yao [Sat, 23 Feb 2013 07:34:43 +0000 (15:34 +0800)]
some cleanup

11 years agofix the haar kernel problems on Nvidia and Intel OCL
yao [Sat, 23 Feb 2013 07:19:46 +0000 (15:19 +0800)]
fix the haar kernel problems on Nvidia and Intel OCL

11 years agoRemove the perf running from ocl::matchTemplate accuracy tests
yao [Sat, 23 Feb 2013 06:30:04 +0000 (14:30 +0800)]
Remove the perf running from ocl::matchTemplate accuracy tests

11 years agoallows building with -std=c++11 under G++
Eric Christiansen [Fri, 22 Feb 2013 21:28:20 +0000 (13:28 -0800)]
allows building with -std=c++11 under G++

11 years agoCorrected a mistake in CHI2 kernel in line 354 and line 362 svm.cpp
Markus Schoeler [Fri, 22 Feb 2013 14:41:57 +0000 (15:41 +0100)]
Corrected a mistake in CHI2 kernel in line 354 and line 362 svm.cpp
Added new kernels to documentation

11 years agoMerge branch '2.4'
Andrey Kamaev [Fri, 22 Feb 2013 13:33:30 +0000 (17:33 +0400)]
Merge branch '2.4'

11 years agoUpdate FFMPEG wrapper binaries
OpenCV Buildbot [Fri, 22 Feb 2013 12:56:01 +0000 (16:56 +0400)]
Update FFMPEG wrapper binaries

11 years agoMerge pull request #506 from asmorkalov:crosscompile_tutorial
Andrey Kamaev [Fri, 22 Feb 2013 12:41:16 +0000 (16:41 +0400)]
Merge pull request #506 from asmorkalov:crosscompile_tutorial

11 years agoMerge pull request #531 from asmorkalov:android_mips_fix
Andrey Kamaev [Fri, 22 Feb 2013 12:40:19 +0000 (16:40 +0400)]
Merge pull request #531 from asmorkalov:android_mips_fix

11 years agoMerge pull request #530 from bitwangyaoyao:2.4_fixEqHist
Andrey Kamaev [Fri, 22 Feb 2013 12:40:05 +0000 (16:40 +0400)]
Merge pull request #530 from bitwangyaoyao:2.4_fixEqHist

11 years agoMerge pull request #529 from bitwangyaoyao:2.4_fixGemm
Andrey Kamaev [Fri, 22 Feb 2013 12:39:50 +0000 (16:39 +0400)]
Merge pull request #529 from bitwangyaoyao:2.4_fixGemm

11 years agoMerge pull request #528 from bitwangyaoyao:2.4_fixPyrLK
Andrey Kamaev [Fri, 22 Feb 2013 12:35:30 +0000 (16:35 +0400)]
Merge pull request #528 from bitwangyaoyao:2.4_fixPyrLK

11 years agoMerge pull request #527 from bitwangyaoyao:2.4_fixMeanShift
Andrey Kamaev [Fri, 22 Feb 2013 12:35:17 +0000 (16:35 +0400)]
Merge pull request #527 from bitwangyaoyao:2.4_fixMeanShift

11 years agoMerge pull request #523 from taka-no-me:fix_2815
Andrey Kamaev [Fri, 22 Feb 2013 12:34:28 +0000 (16:34 +0400)]
Merge pull request #523 from taka-no-me:fix_2815

11 years agoMerge pull request #518 from asmorkalov:ts_refactor
Andrey Kamaev [Fri, 22 Feb 2013 12:34:14 +0000 (16:34 +0400)]
Merge pull request #518 from asmorkalov:ts_refactor

11 years agofix the warning on Linux when OpenCL 1.2 not supported
yao [Fri, 22 Feb 2013 10:33:16 +0000 (18:33 +0800)]
fix the warning on Linux when OpenCL 1.2 not supported

11 years agoBug #2821 Installation of OpenCV modules breaks build on MIPS Android fixed.
Alexander Smorkalov [Fri, 22 Feb 2013 07:57:42 +0000 (11:57 +0400)]
Bug #2821 Installation of OpenCV modules breaks build on MIPS Android fixed.

Native camera libs for MIPS installation fixed.

11 years agoFix ocl::equalizeHist mismatch
yao [Fri, 22 Feb 2013 07:48:31 +0000 (15:48 +0800)]
Fix ocl::equalizeHist mismatch

11 years agoFix the compiling errors of gemm on Linux
yao [Fri, 22 Feb 2013 07:05:49 +0000 (15:05 +0800)]
Fix the compiling errors of gemm on Linux

11 years agoMerge pull request #526 from taka-no-me:fix_compatibility
cuda-geek [Fri, 22 Feb 2013 05:18:18 +0000 (09:18 +0400)]
Merge pull request #526 from taka-no-me:fix_compatibility

11 years agofix pyrLK's mismatch on Linux
yao [Fri, 22 Feb 2013 03:23:43 +0000 (11:23 +0800)]
fix pyrLK's mismatch on Linux

11 years agofix meanShift mismatch on none-double GPUs
yao [Fri, 22 Feb 2013 02:13:20 +0000 (10:13 +0800)]
fix meanShift mismatch on none-double GPUs

11 years agoRepair binary compatibility of ocl module
Andrey Kamaev [Thu, 21 Feb 2013 20:30:27 +0000 (00:30 +0400)]
Repair binary compatibility of ocl module

11 years agoFix binary compatibility of gpu module
Andrey Kamaev [Thu, 21 Feb 2013 20:14:58 +0000 (00:14 +0400)]
Fix binary compatibility of gpu module

11 years agoIndentation Ok
alegarda [Thu, 21 Feb 2013 14:48:23 +0000 (15:48 +0100)]
Indentation Ok

11 years agoIndentation ok
alegarda [Thu, 21 Feb 2013 14:25:22 +0000 (15:25 +0100)]
Indentation ok

11 years agoMerge pull request #520 from jet47:gpu-updates
Andrey Kamaev [Thu, 21 Feb 2013 14:03:06 +0000 (18:03 +0400)]
Merge pull request #520 from jet47:gpu-updates

11 years agofix for OpenCV issue #2815
gferry [Wed, 20 Feb 2013 13:19:55 +0000 (14:19 +0100)]
fix for OpenCV issue #2815

- libavcodec issue
- some decoders alter AVCodecContext width/height values, in a wrong way
- eg. in issue 2815, vp6f decoder changes these values, resulting in distorted / invalid frames
- this patch forces default AVCodecContext values

11 years agoMerge pull request #521 from asmorkalov:2.4.4_preparation
Andrey Kamaev [Thu, 21 Feb 2013 13:25:21 +0000 (17:25 +0400)]
Merge pull request #521 from asmorkalov:2.4.4_preparation

11 years agoFixed documentation build
Vladislav Vinogradov [Thu, 21 Feb 2013 13:06:53 +0000 (17:06 +0400)]
Fixed documentation build

11 years agoupdated gpu module API
Vladislav Vinogradov [Thu, 21 Feb 2013 12:12:33 +0000 (16:12 +0400)]
updated gpu module API

11 years agoMerge pull request #502 from jet47:opengl-updates
Andrey Kamaev [Thu, 21 Feb 2013 11:12:42 +0000 (15:12 +0400)]
Merge pull request #502 from jet47:opengl-updates

11 years agoOpenCV 2.4.4 preparation
Alexander Smorkalov [Thu, 21 Feb 2013 10:42:28 +0000 (14:42 +0400)]
OpenCV 2.4.4 preparation

Manager verison incremented;
Additional constatnt for library intialization added;
Documents updated.

11 years agoMerge pull request #498 from asmorkalov:doc_ptr
Andrey Kamaev [Thu, 21 Feb 2013 09:30:34 +0000 (13:30 +0400)]
Merge pull request #498 from asmorkalov:doc_ptr

11 years agoMerge pull request #519 from bitwangyaoyao:2.4_findOCL
Andrey Kamaev [Thu, 21 Feb 2013 09:30:20 +0000 (13:30 +0400)]
Merge pull request #519 from bitwangyaoyao:2.4_findOCL

11 years agodistCoeffs0 cols to 12
alegarda [Thu, 21 Feb 2013 09:18:55 +0000 (10:18 +0100)]
distCoeffs0 cols to 12

11 years agoFixed undistort.cpp
alegarda [Thu, 21 Feb 2013 09:00:28 +0000 (10:00 +0100)]
Fixed undistort.cpp

11 years agorestored source compatibility
Vladislav Vinogradov [Thu, 21 Feb 2013 08:31:04 +0000 (12:31 +0400)]
restored source compatibility

11 years agoMerge pull request #440 from AnnaKogan8:fixed-perfomance-tests
Andrey Kamaev [Thu, 21 Feb 2013 08:29:57 +0000 (12:29 +0400)]
Merge pull request #440 from AnnaKogan8:fixed-perfomance-tests

11 years agoMerge pull request #512 from jet47:core-gpu-updates
Andrey Kamaev [Thu, 21 Feb 2013 08:22:03 +0000 (12:22 +0400)]
Merge pull request #512 from jet47:core-gpu-updates

11 years agorestored binary compatibility
Vladislav Vinogradov [Thu, 21 Feb 2013 08:18:08 +0000 (12:18 +0400)]
restored binary compatibility

11 years agocv::Ptr description extended.
Alexander [Sun, 17 Feb 2013 14:18:12 +0000 (18:18 +0400)]
cv::Ptr description extended.

11 years agoAdd auto detection to Intel OCL
yao [Thu, 21 Feb 2013 08:11:18 +0000 (16:11 +0800)]
Add auto detection to Intel OCL

11 years agoTest system refactoring
Alexander Smorkalov [Thu, 21 Feb 2013 07:46:03 +0000 (11:46 +0400)]
Test system refactoring

cmpEps replaced on cmpEps2 to reduce code dublication;
Constants for cmpEps return values added.

11 years agoMerge pull request #508 from bitwangyaoyao:2.4_interpKernel
Andrey Kamaev [Thu, 21 Feb 2013 07:51:06 +0000 (11:51 +0400)]
Merge pull request #508 from bitwangyaoyao:2.4_interpKernel

11 years agooptimized DeviceInfo class and ensureSizeIsEnough
Vladislav Vinogradov [Tue, 19 Feb 2013 12:16:23 +0000 (16:16 +0400)]
optimized DeviceInfo class and ensureSizeIsEnough

11 years agoThin prism distortion model added doc
alegarda [Wed, 20 Feb 2013 14:25:49 +0000 (15:25 +0100)]
Thin prism distortion model added doc

Thin prism distortion model added to the
camera_calibration_and_3d_reconstruction.rst

11 years agoAdded Thin Prism Distortion Model
alegarda [Wed, 20 Feb 2013 14:11:47 +0000 (15:11 +0100)]
Added Thin Prism Distortion Model

Only the code.

11 years agoIncreased time limits
Anna Kogan [Wed, 20 Feb 2013 12:59:17 +0000 (16:59 +0400)]
Increased time limits

11 years agoSwitched to TEST_CYCLE_MULTIRUN for fast tests
Anna Kogan [Wed, 6 Feb 2013 10:53:33 +0000 (14:53 +0400)]
Switched to TEST_CYCLE_MULTIRUN for fast tests

11 years agoMerge pull request #509 from taka-no-me:fix_docs_master
Andrey Kamaev [Wed, 20 Feb 2013 11:50:47 +0000 (15:50 +0400)]
Merge pull request #509 from taka-no-me:fix_docs_master

11 years agoFix warnings from documentation build
Andrey Kamaev [Wed, 20 Feb 2013 11:01:15 +0000 (15:01 +0400)]
Fix warnings from documentation build

11 years agoFix documentation problems found by check_docs2 script
Andrey Kamaev [Wed, 20 Feb 2013 10:38:16 +0000 (14:38 +0400)]
Fix documentation problems found by check_docs2 script

11 years agoadd openCLExecuteKernelInterop method
yao [Wed, 20 Feb 2013 09:46:43 +0000 (17:46 +0800)]
add openCLExecuteKernelInterop method

11 years agoTutorial for ARM Linux cross compilation added.
Alexander Smorkalov [Tue, 12 Feb 2013 13:53:36 +0000 (17:53 +0400)]
Tutorial for ARM Linux cross compilation added.

11 years agoMerge branch '2.4'
Andrey Kamaev [Wed, 20 Feb 2013 08:31:16 +0000 (12:31 +0400)]
Merge branch '2.4'

11 years agoMerge pull request #505 from abidrahmank:2.4
Andrey Kamaev [Wed, 20 Feb 2013 08:29:52 +0000 (12:29 +0400)]
Merge pull request #505 from abidrahmank:2.4

11 years agoUpdate samples/python2/hist.py
Abid K [Tue, 19 Feb 2013 14:01:53 +0000 (19:31 +0530)]
Update samples/python2/hist.py

range in calcHist() changed from [0,255] to [0,256]. Otherwise, it won't count pixels with value 255. It can be verified taking sum of histogram values and checking it with image size.

11 years agoMerge pull request #503 from taka-no-me:fix_docs
Andrey Kamaev [Tue, 19 Feb 2013 14:01:51 +0000 (18:01 +0400)]
Merge pull request #503 from taka-no-me:fix_docs

11 years agoMerge pull request #500 from nielsgm:predict_python_wrapper_to_docs
Andrey Kamaev [Tue, 19 Feb 2013 14:01:30 +0000 (18:01 +0400)]
Merge pull request #500 from nielsgm:predict_python_wrapper_to_docs

11 years agoMerge pull request #492 from taka-no-me:fix_warnings_gcov
Andrey Kamaev [Tue, 19 Feb 2013 14:01:05 +0000 (18:01 +0400)]
Merge pull request #492 from taka-no-me:fix_warnings_gcov

11 years agoWhitelist functions/structs in check_docs2 that are impossible to fix in 2.4
Andrey Kamaev [Tue, 19 Feb 2013 11:56:34 +0000 (15:56 +0400)]
Whitelist functions/structs in check_docs2 that are impossible to fix in 2.4

11 years agoAdd support for enums into rst ocv domain
Andrey Kamaev [Tue, 19 Feb 2013 10:19:59 +0000 (14:19 +0400)]
Add support for enums into rst ocv domain

11 years agoFix several inconsistent declarations identified by check_doc2 script
Andrey Kamaev [Tue, 19 Feb 2013 08:01:27 +0000 (12:01 +0400)]
Fix several inconsistent declarations identified by check_doc2 script

11 years agoupdated OpenGL functionality:
Vladislav Vinogradov [Tue, 19 Feb 2013 10:13:11 +0000 (14:13 +0400)]
updated OpenGL functionality:

* removed OpenGLFuncTab, now extensions are loaded internally
* added support of GlBuffer and GlTexture2D to InputArray/OutputArray
* added ELEMENT_ARRAY_BUFFER and PIXEL_PACK_BUFFER targets
* added copyFrom/copyTo method for GlBuffer and GlTexture2D
* removed GlFont
* removed pointCloudShow
* removed OpenGLCleanCallback
* added Access parameter to GlBuffer::mapHost
* added autoRelease parameter to all create methods

11 years agoFix warnings about missing parent for class members
Andrey Kamaev [Tue, 19 Feb 2013 07:49:05 +0000 (11:49 +0400)]
Fix warnings about missing parent for class members

11 years agoHack to stop parsing of problematic CvStatModel::train definition
Andrey Kamaev [Tue, 19 Feb 2013 06:39:31 +0000 (10:39 +0400)]
Hack to stop parsing of problematic CvStatModel::train definition

11 years agoAvoid problem of old sphinx reporting an error on lines starting from :
Andrey Kamaev [Tue, 19 Feb 2013 06:34:43 +0000 (10:34 +0400)]
Avoid problem of old sphinx reporting an error on lines starting from :

See http://sourceforge.net/tracker/?func=detail&aid=3484857&group_id=38414&atid=422030

11 years agoAdded the predict_all function wrapper for python that was missing from the documentation
Niels Gerlif Myrtue [Tue, 19 Feb 2013 02:11:30 +0000 (13:11 +1100)]
Added the predict_all function wrapper for python that was missing from the documentation
Copied the docstring description

11 years agoMerge pull request #499 from vpisarev:zeroelem_fix
Andrey Kamaev [Mon, 18 Feb 2013 14:05:02 +0000 (18:05 +0400)]
Merge pull request #499 from vpisarev:zeroelem_fix

11 years agoMerge pull request #451 from bitwangyaoyao:2.4_operator
Andrey Kamaev [Mon, 18 Feb 2013 14:04:44 +0000 (18:04 +0400)]
Merge pull request #451 from bitwangyaoyao:2.4_operator

11 years agofixed problem reported by Thouis (Ray) Jones
Vadim Pisarevsky [Mon, 18 Feb 2013 13:01:21 +0000 (17:01 +0400)]
fixed problem reported by Thouis (Ray) Jones