mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-29 13:47:32 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
28,436 Commits 6 Branches 126 Tags 3 GiB
9ef41f68fb
Commit Graph

407 Commits

Author SHA1 Message Date
Erik Karlsson
5a7118a88b Merging in master 2015-03-09 22:00:58 +01:00
Erik Karlsson
b471f9ee26 Fixed call to tegra::fastNlMeansDenoising 2015-03-09 18:52:25 +01:00
Erik Karlsson
4b5753daea Corrected documentation 2015-03-09 16:11:18 +01:00
Erik Karlsson
a594a0677a Cleanup 2015-03-09 16:00:24 +01:00
Erik Karlsson
c44488629a Changed parameters of fastNlMeansDenoising[Multi][Abs] from float * to std::vector<float> 2015-03-09 15:52:16 +01:00
Erik Karlsson
21160137d4 Addition of test cases 2015-03-06 20:44:31 +01:00
Erik Karlsson
cc8d94c6fc Addition of per-channel h-values for fastNlMeansDenoising[Multi][Abs] 2015-03-06 20:43:55 +01:00
Erik Karlsson
324fa26848 Refactoring of OpenCL implementation 2015-03-06 19:07:13 +01:00
Erik Karlsson
41ffcc27dd Added support for h = 0.0 2015-03-06 15:06:11 +01:00
Erik Karlsson
1e82a67cc4 Additional refactoring 2015-03-06 14:28:43 +01:00
Erik Karlsson
c41efe4e30 Refactoring in preparation for per-channel h-values 2015-03-05 17:50:52 +01:00
Erik Karlsson
18be52c05b Changed LUTs from IT to int 2015-03-05 13:55:06 +01:00
Erik Karlsson
305cff36e2 Changed from IT to int for distance calculation 2015-03-05 13:36:42 +01:00
Erik Karlsson
69eae13ff3 Changed pointers from sample_t * to uchar *. Rescaling psz accordingly. 2015-03-03 03:02:44 +01:00
Erik Karlsson
d56d04e41b Updated documentation 2015-03-03 01:34:29 +01:00
Erik Karlsson
ac6771f975 Added test cases 2015-03-03 01:20:33 +01:00
Erik Karlsson
ae08884854 Added support for 4-component input for fastNlMeansDenoising[Multi][Abs] 2015-03-03 01:19:34 +01:00
Erik Karlsson
87760d13fb Cleanup and addition of 4-component support for ocl_fastNlMeansDenoising 2015-03-02 22:33:14 +01:00
Maksim Shabunin
37c74e38f4 Python support 2015-03-02 18:13:00 +03:00
Maksim Shabunin
457123027e Modified java wrapping mechanism 2015-03-02 18:12:30 +03:00
Erik Karlsson
50bb14a0a8 Avoiding unnecessary copy by creating borders in place after RGB -> RGBA conversion 2015-03-02 15:48:00 +01:00
Erik Karlsson
73663dcdd1 Added support for 16-bit input 2015-03-02 03:29:17 +01:00
Erik Karlsson
3bde9e9365 Added test cases 2015-03-01 22:22:09 +01:00
Erik Karlsson
a9ff335a89 Added OpenCL support for FastNlMeansDenoisingAbs 2015-03-01 22:21:36 +01:00
Erik Karlsson
9f7cac8c59 Addtion of test cases for CV_8UC3 2015-03-01 21:01:57 +01:00
Erik Karlsson
0fdb95e195 Refactoring and addition of CV_8UC3 to ocl_fastNlMeansDenoising 2015-03-01 20:59:34 +01:00
Vladislav Vinogradov
cda6fed41f move tegra namespace out of cv to prevent conflicts 2015-02-27 12:52:11 +03:00
Vladislav Vinogradov
44e41baffe use new functions before all tegra:: calls 2015-02-26 19:34:58 +03:00
Erik Karlsson
8e7aff4486 Changed fastNlMeansDenoising and fastNlMeansDenoisingMulti back to sum of sq distances. Moved sq sum of abs distances to fastNlMeansDenoisingAbs and fastNlMeansDenoisingMultiAbs 2015-02-18 14:59:52 +01:00
Erik Karlsson
e647b7c7e8 Calculating almost_dist2weight at full size to avoid bounds checking 2015-02-17 23:08:36 +01:00
Erik Karlsson
baf266c29e Changed from sum of squared differences to sum of abs differences 2015-02-17 21:30:52 +01:00
Erik Karlsson
c339720af9 Preparation for 16-bit colored denoising. Currently not working due to cvtColor not supportint 16-bit Lab conversion. 2015-02-13 13:38:37 +01:00
Erik Karlsson
584372bbf2 Fixed bounds checking 2015-02-13 04:33:29 +01:00
Erik Karlsson
d588c717da Using WEIGHT_THRESHOLD to limit table size. Still problematic with 16-bit and big h-values. 2015-02-13 00:11:30 +01:00
Erik Karlsson
42db9e7153 Basic 16-bit implmentation of fastNlMeansDenoising. Table-based exponetiation leads to high memory footprint and loss of precision in 16-bit mode. 2015-02-12 22:14:01 +01:00
Erik Karlsson
8368fb9ea8 Additional refactoring preparing for 16-bit implementation 2015-02-12 18:45:09 +01:00
Erik Karlsson
e178294b49 Refactoring in preparation for 16-bit implementation of fastNlMeansDenoising 2015-02-12 15:23:28 +01:00
Vadim Pisarevsky
03fc3d1ceb Merge pull request #3591 from ilya-lavrenov:sse_avx 2015-01-21 10:46:23 +00:00
Vladislav Vinogradov
14e15fb4f7 fix documentation warnings 2015-01-15 17:15:59 +03:00
Vladislav Vinogradov
f48befc6f0 refactor CUDA part of photo module 2015-01-15 16:46:48 +03:00
Ilya Lavrenov
f2cd65cf1e fixes 2015-01-12 10:59:30 +03:00
Maksim Shabunin
11591b3e9d Added Qt help generation support 2014-12-26 19:17:18 +03:00
Maksim Shabunin
d01bedbc61 Removed Sphinx documentation files 2014-12-26 19:12:19 +03:00
Jiri Drbalek
d71e001736 fix crash when sample point out of image boundaries 2014-12-22 21:01:17 +00:00
Vadim Pisarevsky
d9f159a554 Merge pull request #3513 from mshabunin:compat-30 2014-12-22 11:58:01 +00:00
Maksim Shabunin
c485aee464 Included c-headers for better 2.4 compatibility 2014-12-19 17:05:26 +03:00
Yan Wang
fd2d800c06 Remove unnecessary local variable "size". 
It should also be better for optimizing when compiling kernel.

Signed-off-by: Yan Wang <yan.wang@linux.intel.com>
 2014-12-16 14:25:24 +08:00
Maksim Shabunin
03e213ccae Doxygen documentation: BiB references and fixes 2014-12-01 15:50:55 +03:00
Maksim Shabunin
1523fdcc1c Doxygen documentation: more fixes and cleanups 2014-12-01 15:50:36 +03:00
Maksim Shabunin
472c210687 Doxygen documentation: flann, photo and stitching modules 2014-12-01 15:47:13 +03:00
Yan Wang
a8b4c99ed6 Improve the performance of fast_nlmeans_denoising_opencl. 
1. Remove unnecessary barriers.
2. Adjust CTA_SIZE based on the following cases for Intel platform:
   a) OCL_Photo_DenoisingGrayscale.DenoisingGrayscale
   b) OCL_Photo_DenoisingColored.DenoisingColored
 2014-11-12 22:34:33 +08:00
Adrien BAK
5442de7d99 adjust numerical precision for windows build 2014-10-15 12:47:53 +09:00
Adrien BAK
9972059476 suppress warnings 2014-10-14 19:07:15 +09:00
Adrien BAK
53d11f490d whitespace 2014-10-14 16:45:02 +09:00
Adrien BAK
5c98209127 whitespaces 2014-10-14 16:31:22 +09:00
Adrien BAK
ee210afc44 white space 2014-10-14 16:10:53 +09:00
Adrien BAK
cb76d00f5f precalculate indices 2014-10-14 16:08:45 +09:00
Adrien BAK
419450689b remove unnecessary buffer copies 2014-10-14 16:08:45 +09:00
Adrien BAK
b4504639c8 refactor poisson_solver 2014-10-14 16:08:45 +09:00
Adrien BAK
6bfea73716 move calls to ptr<> 2014-10-14 16:08:45 +09:00
Adrien BAK
4a5ea85094 another useless include 2014-10-14 16:08:45 +09:00
Adrien BAK
df312a4ffa at<> -> ptr<> 2014-10-14 16:08:45 +09:00
Adrien BAK
5a16de2ef6 .size().width -> cols 2014-10-14 16:08:45 +09:00
Adrien BAK
980496bb0e remove useless include 2014-10-14 16:08:45 +09:00
Adrien BAK
d2719ea92f change numerical precision because of architecture discrepancy 2014-10-14 16:08:45 +09:00
Adrien BAK
1c75fa7297 norm -> cvtest::norm 2014-10-14 16:08:45 +09:00
Adrien BAK
c6ffa5059d remove useless includes 2014-10-14 16:08:45 +09:00
Adrien BAK
0f0bda9722 factor conditional save 2014-10-14 16:08:45 +09:00
Adrien BAK
11d89ad7c1 coding guidelines 2014-10-14 16:08:45 +09:00
Adrien BAK
53f4f06a15 remove debugging code 2014-10-14 16:08:45 +09:00
Adrien BAK
c69016467d replace implementation of dst 2014-10-14 16:08:44 +09:00
Adrien BAK
89e7860572 replace double by float 2014-10-14 16:08:44 +09:00
Adrien BAK
ed9f6a3cb4 simplify a line 2014-10-14 16:08:44 +09:00
Adrien BAK
e46810eabe this has been submitted to the daily wtf 2014-10-14 16:08:44 +09:00
Adrien BAK
47b01be0a4 replace 8 loops by 2 2014-10-14 16:08:44 +09:00
Adrien BAK
b04d06938d replace double* by vector<double> 2014-10-14 16:08:44 +09:00
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