Andrey Kamaev 57d3152cd0 Merge branch '2.4'

2013-01-31 14:35:27 +04:00

..

app/nv_perf_test

warnings, renamed Marina's GPU_PERF_TEST_P

2012-12-25 22:00:20 +04:00

doc

fixes for gpu module:

2013-01-23 21:05:06 +04:00

include/opencv2/gpu

Merge branch '2.4'

2013-01-31 14:35:27 +04:00

misc

fixed build for CARMA:

2013-01-23 21:05:08 +04:00

perf

implemented Luv/Lab <-> RGB conversion

2013-01-23 21:05:08 +04:00

src

Merge branch '2.4'

2013-01-31 14:35:27 +04:00

test

fixed tests (call resetDevice, if there was a gpu failure)

2013-01-23 21:05:04 +04:00

CMakeLists.txt

fixed build for CARMA:

2013-01-23 21:05:08 +04:00