Skip to content

Commit

Permalink
Merge pull request #2671 from riskiest:color-calibration
Browse files Browse the repository at this point in the history
Color Calibration Algorithm Implementation Revised

* Add utils, io helpers, the operations for linearization and distance

* Add the code for color, colorspace, linearization and ccm computation

* Add sample code for color correction

* Add the dependency to opencv_imgcodes in CMakeLists.txt

* Add the color correction tutorial, introducing build steps and
parameters

* Add sample code to color correction tutorial

* Add color correction algorithms introductions

* Update color_correction_model.markdown

* Fix warnings of whitespace, undeclared function, shadow variables.

* Fix the warnings of shadow variables, unused variable in base class.
Fix the error whitespace and 'EOF' on the docs.

* Fix the warnnings on win & macos

* Fix bugs & support Vinyl ColorChecker

* fix shadow variables warning & code style

* update document for sample

* update license

* fix linearize.hpp

* Add basic io, utils, operations helpers.
Implement color distance.

* Implement color, colorspace, linearization and ccm features.

* Add the dependencies to opencv_imgcodecs in CMakeLists.txt

* Add color correction model sample code.
Co-authored-by: Chenqi Shan <[email protected]>

* Add the index markdown of color correction tutorial.

Co-authored-by: Chenqi Shan <[email protected]>

* Add the introduction for color correction sample.

* Split operations into .hpp and .cpp

* Split mcc, color, colorspace and linearize into .cpp & .hpp

* Update test cases

* Split distance, io and utils into cpp & hpp.
Refer ccm.hpp in entrypoint header and update realted refs in sampe & tutorial

* add static method

* fix shared_ptr

* fix markdown for new version

* delete useless include message

* update unittests

* update docs & fix bugs for InitialwhiteBalance()

* update doc for doxygen

* update doc&DigitalSG

* replace whitespace for utils.hpp&color.hpp

* update getilluminants,imgcodes,

* Fix Mat wrapper over data from C arrays, fix doxygen's @snippet instead of direct code.

* remove array from color.h

* remove hpp from include/mcc/

* add hpp to opencv/model/mcc/

* dst unsolved

* remove bugs about dst

* add make passed

* update codes using the structure "impl"

* update documents

* update ccm member for class ColorCorrectionModel

* remove  macro CV_EXPORTS_W for codes in src/*.hpp

* move class Impl private

* remove unnesasary notice

* remove trailing whitespace

* update documents&samples

* move typedef MatFunc into class and move dead codes

* minimize list of required headers, add getCCM() method

* move type: information for parameters

* move underscores _ in public headers

* add @defgroup for ccm

* move <iostream> and add getloss() method for class ColorCorrection Model

* update sample/color_correction_model.cpp

* add getIOs() function for minimize initialization of IO variables

* mcc(ccm): apply clang-format

* mcc(ccm): fix documentation, code style

* remove duplicate enum values

* add prefixes for enum values

* update codes using cv_Error

* update test_ccm file

* update test_ccm file

* update sample --help

* mcc: reduce global initializers

* update function naming style

* update formulas and note for ccm.hpp

* add const value

Co-authored-by: Chenqi Shan <[email protected]>
Co-authored-by: Jinheng Zhang <[email protected]>
Co-authored-by: Zhen Ju <[email protected]>
Co-authored-by: Longbu Wang <[email protected]>
Co-authored-by: shanchenqi <[email protected]>
  • Loading branch information
6 people authored Nov 23, 2020
1 parent d3ade27 commit 478cc12
Show file tree
Hide file tree
Showing 23 changed files with 4,430 additions and 2 deletions.
9 changes: 8 additions & 1 deletion modules/mcc/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,9 @@
set(the_description "Macbeth Chart Detection")
ocv_define_module(mcc opencv_core opencv_imgproc opencv_calib3d opencv_photo opencv_dnn WRAP python)
ocv_define_module(mcc
opencv_core
opencv_imgproc
opencv_calib3d
opencv_dnn
WRAP
python
)
8 changes: 7 additions & 1 deletion modules/mcc/include/opencv2/mcc.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,15 @@

#include "mcc/checker_detector.hpp"
#include "mcc/checker_model.hpp"
#include "mcc/ccm.hpp"

/** @defgroup mcc Macbeth Chart module
@{
@defgroup color_correction Color Correction Model
@}
@addtogroup mcc
Introduction
------------
Expand All @@ -47,7 +54,6 @@ colors that are present in the image, based on this information we can apply any
suitable algorithm to find the actual color of all the objects present in the
image.
*/

#endif
Loading

0 comments on commit 478cc12

Please sign in to comment.