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

..

androidcamera

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2013-12-03 17:35:21 +04:00

bioinspired

changed eps in Retina_OCL test

2013-11-22 12:35:46 +04:00

calib3d

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2013-11-26 15:05:26 +04:00

contrib

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2013-12-03 17:35:21 +04:00

core

Merge pull request #1914 from SpecLad:merge-2.4

2013-12-04 16:30:57 +04:00

cuda

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2013-12-03 17:35:21 +04:00

cudaarithm

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2013-12-03 17:35:21 +04:00

cudabgsegm

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2013-12-03 17:35:21 +04:00

cudacodec

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2013-12-03 17:35:21 +04:00

cudafeatures2d

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2013-12-03 17:35:21 +04:00

cudafilters

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2013-12-03 17:35:21 +04:00

cudaimgproc

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2013-12-03 17:35:21 +04:00

cudalegacy

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2013-11-11 16:55:36 +04:00

cudaoptflow

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2013-12-03 17:35:21 +04:00

cudastereo

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2013-12-03 17:35:21 +04:00

cudawarping

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2013-12-03 17:35:21 +04:00

cudev

Removed another usage of __func__, following #1763.

2013-11-11 17:02:50 +04:00

features2d

Minimized the number of arguments required to workaround the MSVC2013 compiler bug.

2013-10-21 21:43:26 +02:00

flann

Cherry-picked mariusmuja/flann@8c8b0e0cb8.

2013-10-02 16:09:45 +04:00

highgui

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2013-12-03 17:35:21 +04:00

imgproc

Merge pull request #1914 from SpecLad:merge-2.4

2013-12-04 16:30:57 +04:00

java

Switched OpenCV to a 3-component version number.

2013-11-15 19:41:53 +04:00

legacy

the first draft of transparent API and new UMat class. more files

2013-10-22 14:05:15 +04:00

matlab

Replace $(Configuration) with $<CONFIGURATION>

2013-10-24 18:20:16 +01:00

ml

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2013-11-26 15:05:26 +04:00

nonfree

another attempt to fix compile errors

2013-11-18 22:15:04 -05:00

objdetect

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2013-12-03 17:35:21 +04:00

ocl

Merge pull request #1914 from SpecLad:merge-2.4

2013-12-04 16:30:57 +04:00

optim

Merge pull request #1521 from nailbiter:optimCG

2013-10-29 16:14:32 +04:00

photo

Removed build errors and removed test images

2013-12-04 19:18:00 +05:30

python

fixed many bugs related to Mat::getUMat(), asynchronous kernel execution etc. Also, played a bit with ocl::cvtColor vs cv::cvtColor performance

2013-12-01 03:12:19 +04:00

shape

Merge pull request #1567 from ilya-lavrenov:warn_fix

2013-10-08 13:50:49 +04:00

softcascade

Merge branch 'master' into gpu-cuda-rename

2013-09-06 15:44:44 +04:00

stitching

Named GraphCutSeamFinderBase to allow its usage in makePtr.

2013-10-08 18:13:56 +04:00

superres

updated patch to bring in the first functions with "transparent API"

2013-11-18 11:48:00 -05:00

ts

Merge pull request #1909 from alalek:ocl_tapi_perf

2013-12-04 11:35:11 +04:00

video

CV_WRAP for BackgroundSubtractorMOG2

2013-11-30 13:35:23 +01:00

videostab

Merge branch 'master' into gpu-cuda-rename

2013-09-06 15:44:44 +04:00

viz

Viz code beautification

2013-11-17 19:33:55 +04:00

world

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2013-11-11 16:55:36 +04:00

CMakeLists.txt

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2013-06-10 18:18:01 +04:00

refman.rst.in

…