Roman Donchenko 63c61b4b98 Revert "replaced sprintf with cv::format" ...

Fixing build breakage.

This reverts commit b83eff7ecf.

2014-01-16 17:58:26 +04:00

..

androidcamera

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

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

bioinspired

bioinspired: fix ocl test, skip them if OpenCL is not available

2013-12-11 15:56:54 +04:00

calib3d

Revert "replaced sprintf with cv::format"

2014-01-16 17:58: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 #2147 from ilya-lavrenov:tapi_sqrt

2014-01-14 11:34:03 +04:00

cuda

Merge commit '05b9c991dd' into merge-2.4

2013-12-30 17:30:59 +04:00

cudaarithm

Merge commit '05b9c991dd' into merge-2.4

2013-12-30 17:30:59 +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

fixed typo

2014-01-01 19:41:14 +04:00

cudalegacy

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

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

cudaoptflow

Merge commit '05b9c991dd' into merge-2.4

2013-12-30 17:30:59 +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

Merge pull request #1881 from pentschev:defaultNorm_master

2013-12-17 13:53:59 +04:00

flann

Merge commit '1acc1085d' into merge-2.4

2013-12-30 16:37:39 +04:00

highgui

Merge commit '4b885e206' into merge-2.4

2013-12-30 16:48:45 +04:00

imgproc

fixed cv::cvtColor

2014-01-14 16:16:35 +04:00

java

Merge commit '83cdd43a' into merge-2.4

2013-12-30 16:36:35 +04:00

legacy

DescriptorExtractor: added defaultNorm() to return default norm type.

2013-12-09 09:54:42 -02: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

CUDA dependency in nonfree nodule removed. OpenCV.mk generation fixed.

2013-12-27 11:18:10 +04:00

objdetect

Merge pull request #2127 from apavlenko:perf_cascades

2014-01-16 12:37:02 +04:00

ocl

Merge commit '0566ab4d3d' into merge-2.4

2013-12-30 16:51:46 +04:00

optim

Merge pull request #1521 from nailbiter:optimCG

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

photo

fixed warnings

2013-12-07 01:05:07 +04:00

python

Merge commit '4b885e206' into merge-2.4

2013-12-30 16:48:45 +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

updated docs according to the last changes

2014-01-10 18:19:26 +04:00

superres

Make dependency from CUDA explicit to prevent from fake dependedcies from CUDA runtime.

2013-12-19 10:27:38 +04:00

ts

fixed case with zero mask

2014-01-09 19:26:09 +04:00

video

refactored cv::CamShift and cv::meanShift

2013-12-21 14:40:59 +04:00

videostab

Code review fixes.

2013-12-23 11:34:46 +04:00

viz

fixed -Wshadow and other warnings, added rvec test

2013-12-07 20:33:50 +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

…