Commit Graph

299 Commits

Author SHA1 Message Date
Alexander Alekhin
64f2b1b250 Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2018-06-17 16:26:48 +03:00
Alexander Alekhin
5e2c112697 photo: remove redundant broken check
`dest(roi_d)` operation contains similar check inside.
2018-06-16 11:36:51 +03:00
Alexander Alekhin
0f298a4203 Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2018-05-28 11:22:55 +00:00
Alexander Alekhin
b3ff29fcf5 avoid copyTo(outputarray.getMat()) pattern
- leads to errors due 'const' modifier of getMat() method
- may be non-optimal with non-CPU data storage
2018-05-23 13:56:34 +03:00
Alexander Alekhin
db88cd1b25 Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2018-05-21 16:20:14 +03:00
Alexander Alekhin
491e3627b6 photo: initialize cos() table with double type
This avoids MSVC 19.14.26428.1 to call vectorized __vdecl_cosf4() function with less precision.
2018-05-17 15:30:11 +03:00
Alexander Alekhin
5b17a60dde next: drop HAVE_TEGRA_OPTIMIZATION/TADP 2018-04-10 18:09:54 +03:00
Vadim Pisarevsky
6a15910f0f Merge pull request #11208 from terfendail:seamless_1 2018-04-09 09:52:28 +00:00
Vitaly Tuzov
eb2c9f1519 Fixed mask reduction in seamless_clone 2018-04-04 16:33:28 +03:00
Alexander Alekhin
e741b71dac photo: apply CV_OVERRIDE/CV_FINAL 2018-03-28 18:43:27 +03:00
shimat
5bf7f09ac1 Merge pull request #11035 from shimat:refactoring_decolor
Refactor decolor (#11035)

* decolor: modernize deprecated headers (math.h -> cmath)

* refactor contrast_preserve.cpp

* refactor contrast_preserve.hpp (add static/const)

* refactor contrast_preserve.hpp (join assignment and declaration)

* refactor contrast_preserve.hpp (format)

* refactor test_decolor.cpp (indent)

* refactor contrast_preserve.hpp (const)

* contrast_preserve.hpp : optimize by minMaxLoc

* fix trailing-whitespace

* fix warning C4267 on VC++ x64
(conversion from 'size_t' to 'int', possible loss of data)

* use cvRound instead of round_num

* decrease indentation of test_decolor.cpp

* remove pow() to optimize

* remove redundant Mat initialization
2018-03-12 17:22:06 +03:00
shimat
21d9c47bd0 Optimize decolor in photo (#10997)
* optimized cv::decolor by removing vector.push_back

* restored CV_INSTRUMENT_REGION() and original indent

* fix build warnings in contrast_preserve.hpp

* undo refactoring contrast_preserve.cpp/hpp
2018-03-07 14:20:45 +03:00
cDc
667f5b655a Merge pull request #10933 from cdcseacave:clean_npr
* clean npr functions of useless initializations (speed-up)

* photo: remove unnecessary code
2018-03-02 14:42:28 +03:00
Vitaly Tuzov
e5313246a7 Reverted calls to linear resize back to generic version for floating point matrices 2017-12-22 17:10:03 +03:00
Vitaly Tuzov
51cb56ef2c Implementation of bit-exact resize. Internal calls to linear resize updated to use bit-exact version. (#9468) 2017-12-13 15:00:38 +03:00
stalin18
d343a58580 removed unnecessary line 2017-09-15 17:09:21 +03:00
stalin18
ed3d2cd122 fixed unnecessary reconstruction in seamlessclone
fixed unnecessary reconstruction in seamlessclone by using only the
required rectangular area in input images
2017-09-15 17:09:21 +03:00
Maksim Shabunin
248e2c7d47 Fixed some issues found by static analysis 2017-09-08 12:22:12 +03:00
Alexander Alekhin
9ca39821c8 core: divUp function 2017-08-03 19:51:45 +03:00
Alexander Alekhin
1ff6c758ec photo: crash workaround for MSVC 2015 32-bit 2017-07-18 16:04:35 +03:00
Vladislav Sovrasov
2a2a1dc5b4 Get rid of OPENCV_NOSTL definition 2017-07-04 14:17:02 +03:00
Tony Lian
c8783f3e23 Merge pull request #9075 from TonyLianLong:master
Remove unnecessary Non-ASCII characters from source code (#9075)

* Remove unnecessary Non-ASCII characters from source code

Remove unnecessary Non-ASCII characters and replace them with ASCII
characters

* Remove dashes in the @param statement

Remove dashes and place single space in the @param statement to keep
coding style

* misc: more fixes for non-ASCII symbols

* misc: fix non-ASCII symbol in CMake file
2017-07-03 16:14:17 +00:00
Maksim Shabunin
1f23202ad8 Issues found by static analysis (5th round) 2017-07-01 18:56:24 +03:00
Maksim Shabunin
e0393f8557 Fixed some issues found by static analysis (4th round) 2017-06-30 12:26:53 +03:00
Vladislav Sovrasov
234ad8fbee photo: add assertion on empty image in denoising 2017-06-14 13:57:07 +03:00
Alexander Alekhin
e665be1d70 photo: fix integer overflow
There is no cast to wide integer type:
    std::numeric_limits<ST>::max() * std::numeric_limits<ST>::max()
2017-06-09 00:19:29 +00:00
Vadim Pisarevsky
37b1bc9d58 Merge pull request #8776 from sovrasov:inpaint_adv_formats 2017-05-24 12:17:45 +00:00
Alexander Alekhin
27649de50b Merge pull request #8717 from sovrasov:robertson_weight_change 2017-05-24 11:45:34 +00:00
Vladislav Sovrasov
d9ffc4c83e photo: add support of all types of 1c images in inpaint 2017-05-24 10:24:59 +03:00
Vadzim Piatrou
2ddaaf69fa Inpainting support for any 1-channel input images 2017-05-24 10:20:21 +03:00
Amro
39954cc6af generalize number of channels
plus minor edits and fixes
2017-05-22 17:27:26 +03:00
sovrasov
b87a8a5719 Set LUT for Robertson weights function to zero on borders 2017-05-12 16:33:30 +03:00
Alexander Alekhin
dc31ddc80a photo: fix InputArray -> CvMat 2016-12-22 04:22:47 +03:00
Pavel Vlasov
30a6cee2fe Instrumentation for OpenCV API regions and IPP functions; 2016-08-19 18:10:03 +03:00
Julien Dehos
e072fa8121 fix a bug in MergeDebevec (modify input times) 2016-07-26 18:01:36 +02:00
mvukad
695e33b25b Fix missing format when writing Algorithm-based objects
Added a writeFormat() method to Algorithm which must be called by the
write() method of derived classes.
2016-04-07 13:49:42 -07:00
Vadim Pisarevsky
3bbd22cb63 Merge pull request #5808 from cedrou:hdr.mergemertens.fixalgo 2015-12-16 10:36:29 +00:00
Cédric Rousseau
d19189e80f Fixed the formula to compute the well-exposedness weight map. 2015-12-15 10:30:06 +01:00
Sergey Alexandrov
08b30580b7 Do not modify input parameter in MergeDebevec
MergeDebevec takes camera response function as an optional input
parameter. Despite being clearly marked as input, this matrix is
overwritten during processing.

This commit adds a temporary matrix to store the log response and avoid
modification of the input.
2015-12-14 22:24:27 +01:00
Maksim Shabunin
715887fcd5 Coverity: fixed some negative argument issues 2015-12-09 14:25:08 +03:00
Maksim Shabunin
6e9d0d9a0c Visual Studio 2015 warning and test fixes 2015-10-20 12:48:37 +03:00
Vadim Pisarevsky
3c769edea0 added extra check in CalibrateDebevec to make sure the points are within the image:
http://code.opencv.org/issues/4124
2015-05-14 19:54:48 +03:00
Vadim Pisarevsky
3c7f7de477 avoid possible problems with zero values in tone mapping algorithms (http://code.opencv.org/issues/4020) 2015-05-14 19:32:25 +03:00
Vadim Pisarevsky
b37aaa8303 significantly improved parallel non-local means by using granularity parameter in parallel_for_ loop. Because the algorithm deals with sliding sums, it's essential that each thread has enough work to do, otherwise the algorithm gets higher theoretical complexity and thus there is no speedup comparing to 1-thread code (at best). 2015-05-14 15:39:42 +03:00
Vadim Pisarevsky
ee11a2d266 fully implemented SSE and NEON cases of intrin.hpp; extended the HAL with some basic math functions 2015-04-16 23:00:26 +03:00
Alexander Alekhin
d326c77007 fix build (related to PR #3814) 2015-03-30 16:32:00 +03:00
Alexander Alekhin
32da602bf7 fix build (related to PR #3814) 2015-03-25 19:12:36 +03:00
Erik Karlsson
01d3df0d00 Added normType parameter to fastNlMeansDenoisingMulti 2015-03-24 02:01:31 +01:00
Erik Karlsson
5f8d688664 Added parameter normType to fastNlMeansDenoising 2015-03-24 00:47:11 +01:00
Erik Karlsson
9fff7896c5 Removed fastNlMeansDenoisingColored[Multi]Abs 2015-03-23 23:23:35 +01:00
Erik Karlsson
82c54104d6 Fix warnings on Win x64 2015-03-10 01:39:43 +01:00
Erik Karlsson
812edb5fdc Fixed bug, maxDist() should reurn int, not double 2015-03-10 01:34:02 +01:00
Erik Karlsson
8aa0783995 Changed parameter type of fastNlMeansDenoising[Multi][Abs] from std::vector<float> to const std::vector<float>& 2015-03-09 23:47:49 +01:00
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
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
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
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
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
a9ff335a89 Added OpenCL support for FastNlMeansDenoisingAbs 2015-03-01 22:21:36 +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
Vladislav Vinogradov
f48befc6f0 refactor CUDA part of photo module 2015-01-15 16:46:48 +03:00
Jiri Drbalek
d71e001736 fix crash when sample point out of image boundaries 2014-12-22 21:01:17 +00: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
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
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
c6ffa5059d remove useless includes 2014-10-14 16:08:45 +09:00
Adrien BAK
11d89ad7c1 coding guidelines 2014-10-14 16:08:45 +09:00