Merge pull request #11035 from shimat:refactoring_decolor
authorshimat <shimat@users.noreply.github.com>
Mon, 12 Mar 2018 14:22:06 +0000 (23:22 +0900)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Mon, 12 Mar 2018 14:22:06 +0000 (17:22 +0300)
commit5bf7f09ac15398c1f564b19723688d2f05a00ca1
tree016f32ea3908c76aa2fdf17f4e8102a6ba57dc0a
parent2244f1722c3aea4e83e9fbbe44f78ec961df26e5
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
modules/photo/src/contrast_preserve.cpp
modules/photo/src/contrast_preserve.hpp
modules/photo/test/test_decolor.cpp