Adrien BAK
|
a14bfb331d
|
remove logging
|
2014-10-14 16:08:44 +09:00 |
|
Adrien BAK
|
a361cc9479
|
remove some more useless buffers and rename a bunch of variables
|
2014-10-14 16:08:44 +09:00 |
|
Adrien BAK
|
61fe623cf1
|
backport bug fix
|
2014-10-14 16:08:44 +09:00 |
|
Adrien BAK
|
d46c466e20
|
remove useless buffers
|
2014-10-14 16:08:44 +09:00 |
|
Adrien BAK
|
89be83e5be
|
rename variables
|
2014-10-14 16:08:43 +09:00 |
|
Adrien BAK
|
b3ddc2b9a7
|
refactor array_product
|
2014-10-14 16:08:43 +09:00 |
|
Adrien BAK
|
33c15d6309
|
rename stuff, adds logging and replace shitty else if chain by switch
|
2014-10-14 16:08:43 +09:00 |
|
Adrien BAK
|
1f6acc23fa
|
adds header guards + move impl to proper file
|
2014-10-14 16:08:43 +09:00 |
|
Adrien BAK
|
e8c2f2ee3e
|
constness
|
2014-10-14 16:08:43 +09:00 |
|
Adrien BAK
|
2f046ae873
|
fix grayscale loading
|
2014-10-14 16:08:43 +09:00 |
|
Adrien BAK
|
63715a899e
|
fix regressiont ests npr
|
2014-10-14 16:08:43 +09:00 |
|
Adrien BAK
|
ed0eb139cb
|
improve decolor tests
|
2014-10-14 16:08:43 +09:00 |
|
Adrien BAK
|
0a3aab288a
|
improved cloning test
|
2014-10-14 16:08:42 +09:00 |
|
Vadim Pisarevsky
|
ca5e73a9d0
|
Merge pull request #3283 from abak:fix-cloning-illumination-change-noipp
|
2014-10-09 14:57:57 +00:00 |
|
berak
|
56fcc41d70
|
bugfix #3945 pass idx,idx1 by reference instead of static vars
|
2014-10-07 12:19:54 +02:00 |
|
Adrien BAK
|
037f27c882
|
change masking to patchNaNs
|
2014-09-30 14:58:40 +09:00 |
|
Adrien BAK
|
2411556242
|
fix photo::cloning::IlluminationChange when IPP is used
|
2014-09-30 14:28:44 +09:00 |
|
Vadim Pisarevsky
|
95a4943762
|
Merge pull request #3103 from vpisarev:core_imgproc_optim_rearrangements
|
2014-08-14 13:39:01 +00:00 |
|
Vadim Pisarevsky
|
9a5aa4b23c
|
trying to solve compile problems; temporarily disabled some tests for just added optimization algo's
|
2014-08-14 14:37:30 +04:00 |
|
Vadim Pisarevsky
|
4530c7ad08
|
trying to fix builds
|
2014-08-14 13:18:04 +04:00 |
|
Vadim Pisarevsky
|
257463719b
|
removed optim module; moved its functionality to core and photo modules; moved drawing functions from core to imgproc. Removed FilterEngine etc. from public API
|
2014-08-14 12:50:07 +04:00 |
|
Alexander Karsakov
|
75ede6e17c
|
Minimal image size is set to 5*5 for OCL path of fastNlMeansDenoising and fastNlMeansDenoisingColored since it breaks tests with test_loop_times=30 and in general doesn't make sense for computation on GPU.
|
2014-08-14 12:14:33 +04:00 |
|
Alexander Alekhin
|
55188fe991
|
world fix
|
2014-08-05 20:12:35 +04:00 |
|
Vadim Pisarevsky
|
05164bf713
|
Merge pull request #2608 from Siddharthk:master
|
2014-08-01 09:13:32 +00:00 |
|
siddharth
|
4cdc155eac
|
test
|
2014-07-29 00:15:11 +05:30 |
|
siddharth
|
0972a2d758
|
Fixed mixed cloning bug
|
2014-07-29 00:15:11 +05:30 |
|
siddharth
|
88d05a89d4
|
removed build error
Whitespaces removed
|
2014-07-29 00:15:11 +05:30 |
|
siddharth
|
1a14d8506d
|
recursive filter output corrected
|
2014-07-29 00:15:11 +05:30 |
|
siddharth
|
14631be59f
|
Updated Documentation
|
2014-07-29 00:15:11 +05:30 |
|
András Kovács
|
d1c7983fe5
|
calibrateDebevec index fix (issue 3664)
|
2014-07-21 17:27:03 +02:00 |
|
vbystricky
|
4286f60387
|
Extract imgcodecs module from highgui
|
2014-07-07 16:28:08 +04:00 |
|
Ilya Lavrenov
|
4a63b3dd90
|
cv2cvtest part2
|
2014-04-09 13:08:51 +04:00 |
|
Ilya Lavrenov
|
2cd51c04e4
|
fixed condition in cv::FNLM
|
2014-04-01 23:18:07 +04:00 |
|
Roman Donchenko
|
da7a605224
|
Merge pull request #2123 from white-pony:vkysenko/fix-mertens
|
2014-03-25 14:37:56 +04:00 |
|
Andrey Pavlenko
|
2299e2ed1b
|
Merge pull request #2494 from ilya-lavrenov:tapi_merge
|
2014-03-20 13:39:39 +04:00 |
|
Ilya Lavrenov
|
b73490f86c
|
eliminated restriction src[i].channels() == 1 in cv::merge
|
2014-03-19 13:56:31 +04:00 |
|
Ilya Lavrenov
|
6fe71bd27c
|
added 4 channels support to fnlm
|
2014-03-18 14:29:02 +04:00 |
|
Andrey Pavlenko
|
6b6cfa893d
|
Merge pull request #2382 from ilya-lavrenov:tapi_nlmeans
|
2014-03-13 16:48:38 +04:00 |
|
Ilya Lavrenov
|
9b31e6cd44
|
changes according to reviewer's suggestions
|
2014-03-11 15:40:31 +04:00 |
|
Roman Donchenko
|
5527f2872d
|
Merge pull request #2409 from juanmanpr:master
|
2014-03-04 15:32:13 +04:00 |
|
Roman Donchenko
|
db85c35e69
|
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
modules/contrib/src/basicretinafilter.hpp
modules/contrib/src/magnoretinafilter.hpp
modules/contrib/src/parvoretinafilter.hpp
modules/contrib/src/retinacolor.hpp
modules/gpu/include/opencv2/gpu/gpu.hpp
modules/highgui/src/cap_tyzx.cpp
modules/ocl/perf/perf_filters.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/opencl/haarobjectdetect.cl
modules/ocl/test/test_filters.cpp
modules/ocl/test/test_objdetect.cpp
|
2014-03-03 13:45:22 +04:00 |
|
Ilya Lavrenov
|
eedf86402d
|
typos
|
2014-03-02 21:04:17 +04:00 |
|
juanmanpr
|
7a68e3d207
|
CV_Assert for photo module corrected
|
2014-02-25 19:58:08 +01:00 |
|
Roman Donchenko
|
48432502b6
|
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
cmake/OpenCVDetectCUDA.cmake
doc/tutorials/introduction/linux_gcc_cmake/linux_gcc_cmake.rst
modules/core/CMakeLists.txt
modules/features2d/perf/opencl/perf_brute_force_matcher.cpp
modules/highgui/src/grfmt_tiff.cpp
modules/imgproc/src/clahe.cpp
modules/imgproc/src/moments.cpp
modules/nonfree/CMakeLists.txt
modules/ocl/perf/perf_ml.cpp
modules/superres/CMakeLists.txt
|
2014-02-25 15:02:24 +04:00 |
|
juanmanpr
|
540a60fca7
|
Replaced calls to cout from photo module, by CV_Assert
|
2014-02-25 00:29:07 +01:00 |
|
Ilya Lavrenov
|
c7857e8c13
|
small fixes
|
2014-02-21 12:19:08 +04:00 |
|
Andrey Pavlenko
|
9c5bd85247
|
Merge pull request #2375 from akarsakov:fix_getGradient
|
2014-02-20 21:41:43 +04:00 |
|
Alexander Karsakov
|
7e4dea968c
|
Fixed typo with indexes in getGradient(x/y) functions.
|
2014-02-20 13:58:31 +04:00 |
|
Ilya Lavrenov
|
8bf616e4c7
|
added color image support via L*a*b*
|
2014-02-19 18:35:37 +04:00 |
|
Ilya Lavrenov
|
634e8d37cc
|
fixed for 2 channels
|
2014-02-19 18:18:22 +04:00 |
|
Ilya Lavrenov
|
7faf1f6277
|
some improvements
|
2014-02-19 15:01:34 +04:00 |
|
Ilya Lavrenov
|
72c327fef8
|
hope it finally works
|
2014-02-18 19:23:38 +04:00 |
|
Ilya Lavrenov
|
38cbe9873a
|
small fixes
|
2014-02-18 14:56:13 +04:00 |
|
Ilya Lavrenov
|
9db28f332a
|
more fixes
|
2014-02-18 14:32:03 +04:00 |
|
Ilya Lavrenov
|
891dbeabba
|
implemented OpenCL version of cv::fastNlMeansDenoising
|
2014-02-18 14:32:03 +04:00 |
|
Ilya Lavrenov
|
d27068f79a
|
some more refactoring
|
2014-02-18 14:32:03 +04:00 |
|
Ilya Lavrenov
|
e16d89e8d6
|
some refactoring
|
2014-02-18 14:32:03 +04:00 |
|
Roman Donchenko
|
029ffb7c2d
|
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
modules/core/src/gl_core_3_1.cpp
modules/core/src/opencl/convert.cl
modules/cudaimgproc/src/cuda/canny.cu
modules/cudastereo/perf/perf_stereo.cpp
modules/gpu/perf/perf_imgproc.cpp
modules/gpu/test/test_denoising.cpp
modules/ocl/src/opencl/imgproc_resize.cl
samples/cpp/Qt_sample/main.cpp
|
2014-02-17 15:24:05 +04:00 |
|
Ilya Lavrenov
|
4f2cdc9bac
|
added performance tests for NLMeans
|
2014-02-11 18:21:53 +04:00 |
|
Ilya Lavrenov
|
37789f015a
|
deleted excess semicolons, commas
|
2014-01-18 01:31:33 +04:00 |
|
Volodymyr Kysenko
|
89dd828e3c
|
added test for correct handling of uniforma areas in the MergeMertens
|
2014-01-09 14:10:00 -08:00 |
|
Volodymyr Kysenko
|
aa36898024
|
added epsilon value to weights in the MergeMertens in order to avoid zero weights for pixels from uniformly filled areas of image
|
2014-01-07 19:38:57 -08:00 |
|
Ilya Lavrenov
|
73aa43d2ca
|
fixed warnings
|
2013-12-07 01:05:07 +04:00 |
|
Ilya Lavrenov
|
926cab2baa
|
fixed warnings
|
2013-12-06 15:20:29 +04:00 |
|
siddharth
|
c48ad880f3
|
Errors resolved
|
2013-12-04 19:18:00 +05:30 |
|
Anna Kogan
|
944f7bac42
|
After-merge corrections
|
2013-12-04 19:18:00 +05:30 |
|
siddharth
|
573e818415
|
New changes done and removed opencv_extra folder
Removed opencv_extra folder inside opencv folder
New changes done
Removed test images
|
2013-12-04 19:18:00 +05:30 |
|
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 |
|
siddharth
|
2f65a0d4ba
|
Changes done in npr module
|
2013-12-04 19:18:00 +05:30 |
|
siddharth
|
35d9ca6483
|
Changes done in cloning module
|
2013-12-04 19:18:00 +05:30 |
|
siddharth
|
daa9694cab
|
Changes done in decolorization module
|
2013-12-04 19:17:59 +05:30 |
|
siddharth
|
94eab9babe
|
Revert Back
|
2013-12-04 19:17:59 +05:30 |
|
siddharth
|
6c7272bde1
|
Update to remove Android error
|
2013-12-04 19:17:59 +05:30 |
|
siddharth
|
3b239561c6
|
Changed STL in contrast_preserve file
|
2013-12-04 19:17:59 +05:30 |
|
siddharth
|
f85a615f3f
|
whitespaces removed and other minor changes to fix build error
Update 1
update 2
Update 3
Update 4
Update 5
update 6
Update 7
Update 8
Update 9
Update 10
Update 11
Update 12
Update 13
Update 14
Update 15
Update 16
Update 17
Update 18
Update 19
Update 20
Update 21
Update 22
Removed Headers
Update 23
Update 24
Update 25
Update 26
Update 27
Update 28
|
2013-12-04 19:17:59 +05:30 |
|
siddharth
|
56ab1c18e6
|
new filters added and all the 3 modules updated
All 3 modules Updated
|
2013-12-04 19:17:58 +05:30 |
|
siddharth
|
ae9b4003ae
|
edge preserve filters added and windows warning removed
update1
|
2013-12-04 19:17:58 +05:30 |
|
siddharth
|
1ed0e44090
|
added keyboard control
|
2013-12-04 19:17:58 +05:30 |
|
siddharth
|
e170115ad0
|
new interface added. decolor and cloning module added.
Both modules added
|
2013-12-04 19:17:58 +05:30 |
|
siddharth
|
5b0ee9e085
|
decolor module updated
|
2013-12-04 19:17:58 +05:30 |
|
siddharth
|
0802c06571
|
seamless cloning added
update1
update1
update4
|
2013-12-04 19:17:58 +05:30 |
|
siddharth
|
a1b3ba02a7
|
add color_boost + doc
|
2013-12-04 19:17:58 +05:30 |
|
siddharth
|
88aa4a9902
|
decolor module updated
update3
update4
update4
update5
added test data
|
2013-12-04 19:17:58 +05:30 |
|
siddharth
|
95db69f6b9
|
added new files
|
2013-12-04 19:17:58 +05:30 |
|
Vadim Pisarevsky
|
d0b3c7a518
|
added some diagnostic into Tonemap test
|
2013-11-18 23:14:44 -05:00 |
|
Anatoly Baksheev
|
e154bce259
|
fixed compilation for vs2008
|
2013-11-17 14:13:13 +04:00 |
|
Ilya Lavrenov
|
35d9ce0c0c
|
fixed warnings
|
2013-10-08 12:46:43 +04:00 |
|
Roman Donchenko
|
1ac1b9ae35
|
Merge pull request #1474 from f-morozov:for_pr
|
2013-10-02 11:49:54 +04:00 |
|
Fedor Morozov
|
c9ace38897
|
Docs updated, added InputArray, fixes for makePtr,...
|
2013-09-26 19:02:35 +04:00 |
|
Fedor Morozov
|
f99be6bda6
|
Mergin itseez
|
2013-09-18 18:55:12 +04:00 |
|
Fedor Morozov
|
90b6af1496
|
Merge new changes
|
2013-09-18 18:21:45 +04:00 |
|
Fedor Morozov
|
b1af5cc478
|
Remove ghost removal
|
2013-09-18 18:15:51 +04:00 |
|
Fedor Morozov
|
89508bf7ab
|
NO exr now
|
2013-09-17 00:46:15 +04:00 |
|
Fedor Morozov
|
76c6fa9348
|
No EXR in tests
|
2013-09-17 00:39:22 +04:00 |
|
Fedor Morozov
|
a7bcf63765
|
Robertson docs
|
2013-09-06 18:21:59 +04:00 |
|
Fedor Morozov
|
c118f3c529
|
Robertson update
|
2013-09-06 17:30:43 +04:00 |
|
Vladislav Vinogradov
|
0c7663eb3b
|
Merge branch 'master' into gpu-cuda-rename
Conflicts:
modules/core/include/opencv2/core/cuda.hpp
modules/cudacodec/src/thread.cpp
modules/cudacodec/src/thread.hpp
modules/superres/perf/perf_superres.cpp
modules/superres/src/btv_l1_cuda.cpp
modules/superres/src/optical_flow.cpp
modules/videostab/src/global_motion.cpp
modules/videostab/src/inpainting.cpp
samples/cpp/stitching_detailed.cpp
samples/cpp/videostab.cpp
samples/gpu/stereo_multi.cpp
|
2013-09-06 15:44:44 +04:00 |
|
Fedor Morozov
|
deeaddb0a9
|
Doc update
|
2013-09-06 14:49:19 +04:00 |
|
Fedor Morozov
|
f4792f8a44
|
Doc update
|
2013-09-06 14:43:04 +04:00 |
|
Roman Donchenko
|
32205d3c5b
|
Boring changes - photo.
|
2013-09-05 19:02:58 +04:00 |
|
Fedor Morozov
|
e33a4f79f8
|
Merge branch 'devel' of https://github.com/f-morozov/opencv into devel
|
2013-09-05 14:49:18 +04:00 |
|
Fedor Morozov
|
85eb52b8af
|
Debevec Calibrate
|
2013-09-05 14:41:35 +04:00 |
|
fm
|
cb27740de4
|
Linux compilation
|
2013-09-05 14:26:21 +04:00 |
|
Fedor Morozov
|
0f703b8162
|
Calibrate Debevec changes
|
2013-09-05 14:10:53 +04:00 |
|
Alexander Shishkov
|
924f7ce373
|
small changes for compilation
|
2013-09-03 14:05:14 +04:00 |
|
Fedor Morozov
|
e15eabe3fa
|
Ghostbusters
|
2013-09-02 16:03:10 +04:00 |
|
Vladislav Vinogradov
|
cbe437571e
|
fixed docs
|
2013-09-02 14:00:44 +04:00 |
|
Vladislav Vinogradov
|
fd88654b45
|
replaced GPU -> CUDA
|
2013-09-02 14:00:44 +04:00 |
|
Vladislav Vinogradov
|
3c34b24f1f
|
replaced gpu->cuda in files names
|
2013-09-02 14:00:44 +04:00 |
|
Vladislav Vinogradov
|
a0ae602bb7
|
renamed gpuimgproc -> cudaimgproc
|
2013-09-02 14:00:43 +04:00 |
|
Vladislav Vinogradov
|
dcd600cc47
|
renamed gpuarithm -> cudaarithm
|
2013-09-02 14:00:42 +04:00 |
|
Vladislav Vinogradov
|
cfe4a71dc6
|
renamed gpu* source to cuda* in core module
|
2013-09-02 14:00:42 +04:00 |
|
Vladislav Vinogradov
|
8282f6ebc1
|
renamed gpu::cudev namespace -> cuda::device
cudev is used for new device layer
|
2013-09-02 14:00:41 +04:00 |
|
Vladislav Vinogradov
|
e895b7455e
|
renamed gpu namespace -> cuda
|
2013-09-02 14:00:41 +04:00 |
|
Fedor Morozov
|
9f9873017c
|
HDR test changes
|
2013-08-28 02:17:49 +04:00 |
|
Roman Donchenko
|
9ed475cf52
|
War on Whitespace, master edition: file endings.
|
2013-08-27 14:23:26 +04:00 |
|
Roman Donchenko
|
2c4bbb313c
|
Merge commit '43aec5ad' into merge-2.4
Conflicts:
cmake/OpenCVConfig.cmake
cmake/OpenCVLegacyOptions.cmake
modules/contrib/src/retina.cpp
modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
modules/gpu/doc/video.rst
modules/gpu/src/speckle_filtering.cpp
modules/python/src2/cv2.cv.hpp
modules/python/test/test2.py
samples/python/watershed.py
|
2013-08-27 13:26:44 +04:00 |
|
Fedor Morozov
|
833f8d16fa
|
Robertson and tutorial
|
2013-08-26 15:23:37 +04:00 |
|
Roman Donchenko
|
e9a28f66ee
|
Normalized file endings.
|
2013-08-21 18:59:25 +04:00 |
|
Roman Donchenko
|
f55740da70
|
Deleted all trailing whitespace.
|
2013-08-21 18:59:24 +04:00 |
|
Roman Donchenko
|
beada19ad0
|
Merge pull request #1297 from SpecLad:merge-2.4
|
2013-08-20 14:10:22 +04:00 |
|
Roman Donchenko
|
f76dd99299
|
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
cmake/OpenCVModule.cmake
doc/tutorials/calib3d/camera_calibration/camera_calibration.rst
doc/tutorials/features2d/feature_detection/feature_detection.rst
doc/tutorials/features2d/feature_flann_matcher/feature_flann_matcher.rst
doc/tutorials/features2d/feature_homography/feature_homography.rst
modules/core/include/opencv2/core/operations.hpp
modules/core/src/arithm.cpp
modules/gpu/perf/perf_video.cpp
modules/imgproc/include/opencv2/imgproc/imgproc.hpp
modules/java/generator/gen_java.py
modules/java/generator/src/cpp/VideoCapture.cpp
modules/nonfree/src/opencl/surf.cl
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_haar.cpp
modules/ocl/perf/perf_precomp.hpp
modules/ocl/src/color.cpp
modules/ocl/src/filtering.cpp
modules/ocl/test/test_color.cpp
modules/ocl/test/test_objdetect.cpp
modules/python/src2/cv2.cpp
samples/gpu/CMakeLists.txt
samples/gpu/super_resolution.cpp
|
2013-08-19 19:02:36 +04:00 |
|
Vladislav Vinogradov
|
9f33de7071
|
added cvconfig.hpp header file to gpu tests
it uses HAVE_CUDA, HAVE_NVCUVID, etc. macroses
|
2013-08-19 12:46:57 +04:00 |
|
Roman Donchenko
|
2530b580a8
|
Merge branch 'master' into merge-2.4
Conflicts:
modules/photo/doc/inpainting.rst
|
2013-08-16 14:14:12 +04:00 |
|
abidrahmank
|
92d04d439e
|
docs changes
|
2013-08-13 21:58:49 +05:30 |
|
Roman Donchenko
|
6b5ac42a9b
|
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
modules/features2d/doc/common_interfaces_of_descriptor_extractors.rst
modules/features2d/doc/object_categorization.rst
modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
modules/gpu/doc/image_filtering.rst
modules/gpu/doc/image_processing.rst
modules/gpu/doc/video.rst
modules/imgproc/doc/miscellaneous_transformations.rst
modules/imgproc/doc/object_detection.rst
modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst
modules/imgproc/src/samplers.cpp
modules/ml/doc/k_nearest_neighbors.rst
modules/nonfree/doc/feature_detection.rst
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/photo/doc/inpainting.rst
modules/ts/include/opencv2/ts.hpp
platforms/scripts/camera_build.conf
samples/android/camera-calibration/AndroidManifest.xml
|
2013-08-13 12:56:39 +04:00 |
|
Roman Donchenko
|
d9f71b762f
|
Deleted almost all of the precomp.cpp files.
Looks like we don't actually use them; when creating precompiled headers
with Visual C++, a dummy .cpp is created at build time.
|
2013-08-08 12:43:07 +04:00 |
|
StevenPuttemans
|
ed76b2f98f
|
Like mentioned by Andrei Pavlenko after merging pullrequest #1206, a wrong
ReST directive was used. Also fixed some other ReST directives that were
not correct and removed some warnings during buildbot checks.
|
2013-08-07 14:49:33 +02:00 |
|
Fedor Morozov
|
19082e0504
|
Documentation update
|
2013-08-07 11:15:41 +04:00 |
|
Fedor Morozov
|
3725c1fb4c
|
Documentation updates
|
2013-08-06 18:13:34 +04:00 |
|
Fedor Morozov
|
e914fc2471
|
Merge branch 'master' of https://github.com/f-morozov/opencv
|
2013-08-06 17:49:29 +04:00 |
|
Fedor Morozov
|
4a4c5190f0
|
Documentation updates
|
2013-08-06 17:49:02 +04:00 |
|
Alexander Shishkov
|
3c218717a9
|
Merge branch 'master' of https://github.com/f-morozov/opencv
|
2013-08-06 15:41:39 +04:00 |
|
Alexander Shishkov
|
c4fb0e9dbb
|
few changes for compilation
|
2013-08-06 15:41:32 +04:00 |
|
Fedor Morozov
|
bef8d8192e
|
Minor fixes, new MergeDebevec
|
2013-08-06 15:24:01 +04:00 |
|
Roman Donchenko
|
dcaf923517
|
Merge remote-tracking branch 'origin/2.4'
Conflicts:
3rdparty/ffmpeg/ffmpeg_version.cmake
cmake/OpenCVFindLibsGrfmt.cmake
cmake/templates/cvconfig.h.cmake
modules/bioinspired/doc/retina/index.rst
modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
modules/calib3d/src/precomp.hpp
modules/contrib/src/inputoutput.cpp
modules/contrib/src/precomp.hpp
modules/core/include/opencv2/core/internal.hpp
modules/core/include/opencv2/core/types_c.h
modules/core/src/drawing.cpp
modules/core/src/precomp.hpp
modules/core/src/system.cpp
modules/features2d/doc/common_interfaces_of_descriptor_matchers.rst
modules/features2d/doc/common_interfaces_of_feature_detectors.rst
modules/features2d/include/opencv2/features2d/features2d.hpp
modules/features2d/src/precomp.hpp
modules/flann/src/precomp.hpp
modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
modules/gpu/doc/image_filtering.rst
modules/gpu/doc/image_processing.rst
modules/gpu/doc/video.rst
modules/gpu/perf/perf_imgproc.cpp
modules/gpu/perf4au/main.cpp
modules/gpu/src/imgproc.cpp
modules/gpu/src/precomp.hpp
modules/gpu/test/test_imgproc.cpp
modules/highgui/CMakeLists.txt
modules/highgui/test/test_precomp.hpp
modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst
modules/imgproc/src/precomp.hpp
modules/java/generator/src/cpp/Mat.cpp
modules/legacy/src/precomp.hpp
modules/ml/doc/k_nearest_neighbors.rst
modules/ml/src/precomp.hpp
modules/nonfree/doc/feature_detection.rst
modules/nonfree/src/precomp.hpp
modules/objdetect/include/opencv2/objdetect/objdetect.hpp
modules/objdetect/src/cascadedetect.cpp
modules/objdetect/src/hog.cpp
modules/objdetect/src/precomp.hpp
modules/objdetect/test/test_latentsvmdetector.cpp
modules/ocl/src/hog.cpp
modules/ocl/src/opencl/objdetect_hog.cl
modules/ocl/src/precomp.hpp
modules/photo/src/precomp.hpp
modules/stitching/src/precomp.hpp
modules/superres/perf/perf_precomp.hpp
modules/superres/src/optical_flow.cpp
modules/superres/src/precomp.hpp
modules/superres/test/test_precomp.hpp
modules/ts/include/opencv2/ts.hpp
modules/video/src/precomp.hpp
modules/videostab/src/precomp.hpp
modules/world/src/precomp.hpp
|
2013-08-06 13:56:49 +04:00 |
|
Fedor Morozov
|
4c0f7f9e59
|
Tonemapping documentation update
|
2013-08-05 20:35:48 +04:00 |
|
Fedor Morozov
|
cb999a231e
|
Mantiuk's tonemapping
|
2013-08-05 19:31:10 +04:00 |
|
Fedor Morozov
|
17609b90c7
|
Mantiuk's tonemapping
|
2013-08-05 19:22:42 +04:00 |
|
Alexander Shishkov
|
6df203c449
|
Fixes for Linux compilation, small changes
|
2013-08-03 01:45:20 +04:00 |
|
StevenPuttemans
|
f28496c628
|
Added sample links in documentation for python2, ocl and gpu
|
2013-08-02 14:05:08 +02:00 |
|
Fedor Morozov
|
c51b50b44c
|
Algorithm names in code
|
2013-08-02 00:01:15 +04:00 |
|
Fedor Morozov
|
ed0828d0a8
|
New HDR documentation
|
2013-08-01 15:34:03 +04:00 |
|
Fedor Morozov
|
302bf23f82
|
All hdr functions as Algorithms
|
2013-08-01 03:24:47 +04:00 |
|
Fedor Morozov
|
4d2ea847fa
|
Tonemap as 3.0 algorithm
|
2013-07-31 16:05:31 +04:00 |
|
Andrey Pavlenko
|
6a40067424
|
Merge pull request #1206 from StevenPuttemans:feature_3169
|
2013-07-31 14:31:21 +04:00 |
|
StevenPuttemans
|
0c5244103f
|
Added all *.cpp samples reference to the 2.4.6 documentation as discussed in feature #3169
- Used lunix style slashes - works on most systems
- Removed all trailing whitespaces
|
2013-07-31 11:20:05 +02:00 |
|
Fedor Morozov
|
258b98d15b
|
Tonemap as Algorithm
|
2013-07-29 21:35:10 +04:00 |
|
Fedor Morozov
|
af2c9077f7
|
Calibration, various changes
|
2013-07-21 13:56:20 +04:00 |
|
Fedor Morozov
|
703cf8cef7
|
Calibration, various changes
|
2013-07-21 13:48:57 +04:00 |
|