Skip to content

Color Calibration Algorithm Implementation Revised #2671

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 92 commits into from
Nov 23, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
92 commits
Select commit Hold shift + click to select a range
7a3d082
Add utils, io helpers, the operations for linearization and distance
Aug 31, 2020
51a8d66
Add the code for color, colorspace, linearization and ccm computation
JinhengZhang Aug 31, 2020
000e0c9
Add sample code for color correction
JinhengZhang Aug 31, 2020
daedbbc
Add the dependency to opencv_imgcodes in CMakeLists.txt
Aug 31, 2020
3987e82
Add the color correction tutorial, introducing build steps and
JinhengZhang Aug 31, 2020
6708cb1
Add sample code to color correction tutorial
Aug 31, 2020
7d4cc94
Add color correction algorithms introductions
JinhengZhang Sep 2, 2020
c0ed149
Update color_correction_model.markdown
JinhengZhang Aug 31, 2020
3131650
Fix warnings of whitespace, undeclared function, shadow variables.
Sep 2, 2020
85fe73b
Fix the warnings of shadow variables, unused variable in base class.
JinhengZhang Sep 1, 2020
40b0d1b
Fix the warnnings on win & macos
Sep 5, 2020
acb3398
Fix bugs & support Vinyl ColorChecker
crystaldust Sep 7, 2020
483400c
fix shadow variables warning & code style
Sep 8, 2020
d607975
update document for sample
Sep 10, 2020
03324c4
update license
Sep 10, 2020
4617f53
fix linearize.hpp
Sep 10, 2020
9b82167
Add basic io, utils, operations helpers.
Sep 10, 2020
02c1d2a
Implement color, colorspace, linearization and ccm features.
JinhengZhang Sep 10, 2020
0492014
Add the dependencies to opencv_imgcodecs in CMakeLists.txt
JinhengZhang Sep 10, 2020
a48a2fd
Add color correction model sample code.
JinhengZhang Sep 10, 2020
c5246fa
Add the index markdown of color correction tutorial.
JinhengZhang Sep 10, 2020
8d20535
Add the introduction for color correction sample.
Sep 10, 2020
3696aec
Split operations into .hpp and .cpp
Sep 17, 2020
e19da0e
Split mcc, color, colorspace and linearize into .cpp & .hpp
JinhengZhang Sep 17, 2020
25d0b8a
Update test cases
JinhengZhang Sep 17, 2020
7d133a0
Split distance, io and utils into cpp & hpp.
Sep 17, 2020
0ee295e
add static method
Sep 22, 2020
a0e637c
resolve conflict
Sep 22, 2020
cb8a7b4
fix shared_ptr
Sep 23, 2020
5c548df
fix markdown for new version
Sep 23, 2020
77bf3cd
Merge pull request #10 from shanchenqi/ccm-pr
riskiest Sep 23, 2020
410f735
delete useless include message
Sep 23, 2020
b8b950a
Merge pull request #11 from shanchenqi/ccm-pr
riskiest Sep 23, 2020
2a67908
update unittests
Sep 23, 2020
36cbcaa
Merge pull request #12 from shanchenqi/ccm-pr
riskiest Sep 23, 2020
c775243
update docs & fix bugs for InitialwhiteBalance()
Sep 27, 2020
13b56f6
update doc for doxygen
Sep 28, 2020
8be1d19
update doc&DigitalSG
Sep 29, 2020
9847d1b
Merge pull request #15 from shanchenqi/ccm-pr
riskiest Sep 29, 2020
d9b7b0a
replace whitespace for utils.hpp&color.hpp
Sep 29, 2020
c66f7b8
Merge pull request #16 from shanchenqi/ccm-pr
riskiest Sep 29, 2020
5312e32
update getilluminants,imgcodes,
Oct 9, 2020
4b77df5
Fix Mat wrapper over data from C arrays, fix doxygen's @snippet inste…
Oct 11, 2020
8010aa3
Merge pull request #17 from shanchenqi/ccm-pr
riskiest Oct 11, 2020
271459c
remove array from color.h
Oct 28, 2020
9877d1a
remove hpp from include/mcc/
Nov 8, 2020
785934c
add hpp to opencv/model/mcc/
Nov 8, 2020
4e1b46c
dst unsolved
Nov 9, 2020
fd8251d
remove bugs about dst
Nov 10, 2020
6903322
add make passed
Nov 10, 2020
85f04d8
update codes using the structure "impl"
Nov 10, 2020
190d155
update documents
Nov 12, 2020
884dc82
Merge pull request #18 from shanchenqi/ccm-pr
riskiest Nov 12, 2020
f1e1eb6
update ccm member for class ColorCorrectionModel
Nov 13, 2020
89d8514
remove macro CV_EXPORTS_W for codes in src/*.hpp
Nov 13, 2020
a156300
move class Impl private
Nov 13, 2020
c035029
Merge pull request #19 from shanchenqi/ccm-pr
riskiest Nov 13, 2020
9d0f417
remove unnesasary notice
Nov 13, 2020
de55846
Merge pull request #20 from shanchenqi/ccm-pr
riskiest Nov 13, 2020
0ea01e6
remove trailing whitespace
Nov 13, 2020
f942007
Merge pull request #21 from shanchenqi/ccm-pr
riskiest Nov 14, 2020
18e544b
update documents&samples
Nov 16, 2020
d3efc33
Merge pull request #22 from shanchenqi/ccm-pr
riskiest Nov 16, 2020
efe5ae7
move typedef MatFunc into class and move dead codes
Nov 16, 2020
1e0cd20
Merge pull request #23 from shanchenqi/ccm-pr
riskiest Nov 16, 2020
a51499f
minimize list of required headers, add getCCM() method
Nov 17, 2020
9b1fa9b
move type: information for parameters
Nov 17, 2020
31d1ea2
move underscores _ in public headers
Nov 17, 2020
2bb35fc
add @defgroup for ccm
Nov 17, 2020
e29d148
Merge pull request #24 from shanchenqi/ccm-pr
riskiest Nov 17, 2020
a29e97a
move <iostream> and add getloss() method for class ColorCorrection Model
Nov 17, 2020
5556e24
Merge pull request #25 from shanchenqi/ccm-pr
riskiest Nov 17, 2020
a11b115
update sample/color_correction_model.cpp
Nov 17, 2020
2aa98ea
Merge pull request #26 from shanchenqi/ccm-pr
riskiest Nov 17, 2020
f60e284
add getIOs() function for minimize initialization of IO variables
Nov 18, 2020
e1f2a8f
Merge pull request #27 from shanchenqi/ccm-pr
riskiest Nov 18, 2020
f97f927
mcc(ccm): apply clang-format
alalek Nov 19, 2020
60c0be8
mcc(ccm): fix documentation, code style
alalek Nov 19, 2020
592fea1
remove duplicate enum values
Nov 20, 2020
4287d41
add prefixes for enum values
Nov 20, 2020
5542747
update codes using cv_Error
Nov 20, 2020
1b35d44
Merge pull request #28 from shanchenqi/ccm-pr
riskiest Nov 20, 2020
f7aabff
update test_ccm file
Nov 20, 2020
ca5c4d5
update test_ccm file
Nov 20, 2020
e5145c8
Merge pull request #30 from shanchenqi/ccm-pr
riskiest Nov 20, 2020
92298dd
update sample --help
shanchenqi Nov 21, 2020
51274aa
Merge pull request #31 from shanchenqi/ccm-pr
riskiest Nov 21, 2020
2d96a30
mcc: reduce global initializers
alalek Nov 22, 2020
6a18da6
update function naming style
shanchenqi Nov 23, 2020
a9f1fb0
update formulas and note for ccm.hpp
shanchenqi Nov 23, 2020
7769198
add const value
Nov 23, 2020
13e267a
Merge pull request #32 from shanchenqi/ccm-pr
riskiest Nov 23, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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