Split distance, io and utils into cpp & hpp.

Refer ccm.hpp in entrypoint header and update realted refs in sampe & tutorial

Author: ChenqiShan

modules/mcc/include/opencv2/mcc.hpp

@@ -1,37 +1,37 @@
 // This file is part of OpenCV project.
 // It is subject to the license terms in the LICENSE file found in the top-level directory
 // of this distribution and at http://opencv.org/license.html.
-
-/*
- * MIT License
- *
- * Copyright (c) 2018 Pedro Diamel Marrero Fernández
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
+//
+//
+//                       License Agreement
+//              For Open Source Computer Vision Library
+//
+// Copyright(C) 2020, Huawei Technologies Co.,Ltd. All rights reserved.
+// Third party copyrights are property of their respective owners.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//             http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+// Author: Longbu Wang <[email protected]>
+//         Jinheng Zhang <[email protected]>
+//         Chenqi Shan <[email protected]>
 
 #ifndef __OPENCV_MCC_HPP__
 #define __OPENCV_MCC_HPP__
 
 
 #include "mcc/checker_detector.hpp"
 #include "mcc/checker_model.hpp"
+#include "mcc/ccm.hpp"
 
 /** @defgroup mcc Macbeth Chart module
 

modules/mcc/include/opencv2/mcc/distance.hpp

@@ -49,28 +49,12 @@ enum DISTANCE_TYPE
     RGBL
 };
 
-double deltaCIE76(cv::Vec3d lab1, cv::Vec3d lab2);
-double deltaCIE94(cv::Vec3d lab1, cv::Vec3d lab2, double kH = 1.0,
-    double kC = 1.0, double kL = 1.0, double k1 = 0.045,
-    double k2 = 0.015);
-double deltaCIE94GraphicArts(cv::Vec3d lab1, cv::Vec3d lab2);
-double toRad(double degree);
-double deltaCIE94Textiles(cv::Vec3d lab1, cv::Vec3d lab2);
-double deltaCIEDE2000_(cv::Vec3d lab1, cv::Vec3d lab2, double kL = 1.0,
-    double kC = 1.0, double kH = 1.0);
-double deltaCIEDE2000(cv::Vec3d lab1, cv::Vec3d lab2);
-double deltaCMC(cv::Vec3d lab1, cv::Vec3d lab2, double kL = 1, double kC = 1);
-double deltaCMC1To1(cv::Vec3d lab1, cv::Vec3d lab2);
-double deltaCMC2To1(cv::Vec3d lab1, cv::Vec3d lab2);
-cv::Mat distance(cv::Mat src, cv::Mat ref, DISTANCE_TYPE distance_type);
-
-
 /* *\ brief  distance between two points in formula CIE76
    *\ param lab1 a 3D vector
    *\ param lab2 a 3D vector
    *\ return distance between lab1 and lab2
 */
-double deltaCIE76(cv::Vec3d lab1, cv::Vec3d lab2) { return norm(lab1 - lab2); };
+double deltaCIE76(cv::Vec3d lab1, cv::Vec3d lab2);
 
 /* *\ brief  distance between two points in formula CIE94
    *\ param lab1 a 3D vector
@@ -82,36 +66,15 @@ double deltaCIE76(cv::Vec3d lab1, cv::Vec3d lab2) { return norm(lab1 - lab2); };
    *\ param k2 second scale parameter
    *\ return distance between lab1 and lab2
 */
-double deltaCIE94(cv::Vec3d lab1, cv::Vec3d lab2, double kH,
-    double kC, double kL, double k1, double k2)
-{
-    double dl = lab1[0] - lab2[0];
-    double c1 = sqrt(pow(lab1[1], 2) + pow(lab1[2], 2));
-    double c2 = sqrt(pow(lab2[1], 2) + pow(lab2[2], 2));
-    double dc = c1 - c2;
-    double da = lab1[1] - lab2[1];
-    double db = lab1[2] - lab2[2];
-    double dh = pow(da, 2) + pow(db, 2) - pow(dc, 2);
-    double sc = 1.0 + k1 * c1;
-    double sh = 1.0 + k2 * c1;
-    double sl = 1.0;
-    double res =
-        pow(dl / (kL * sl), 2) + pow(dc / (kC * sc), 2) + dh / pow(kH * sh, 2);
-
-    return res > 0 ? sqrt(res) : 0;
-}
+double deltaCIE94(cv::Vec3d lab1, cv::Vec3d lab2, double kH = 1.0,
+    double kC = 1.0, double kL = 1.0, double k1 = 0.045,
+    double k2 = 0.015);
 
-double deltaCIE94GraphicArts(cv::Vec3d lab1, cv::Vec3d lab2)
-{
-    return deltaCIE94(lab1, lab2);
-}
+double deltaCIE94GraphicArts(cv::Vec3d lab1, cv::Vec3d lab2);
 
-double toRad(double degree) { return degree / 180 * CV_PI; };
+double toRad(double degree);
 
-double deltaCIE94Textiles(cv::Vec3d lab1, cv::Vec3d lab2)
-{
-    return deltaCIE94(lab1, lab2, 1.0, 1.0, 2.0, 0.048, 0.014);
-}
+double deltaCIE94Textiles(cv::Vec3d lab1, cv::Vec3d lab2);
 
 /* *\ brief  distance between two points in formula CIE2000
    *\ param lab1 a 3D vector
@@ -121,99 +84,9 @@ double deltaCIE94Textiles(cv::Vec3d lab1, cv::Vec3d lab2)
    *\ param kH Hue scale
    *\ return distance between lab1 and lab2
 */
-double deltaCIEDE2000_(cv::Vec3d lab1, cv::Vec3d lab2, double kL,
-    double kC, double kH)
-{
-    double delta_L_apo = lab2[0] - lab1[0];
-    double l_bar_apo = (lab1[0] + lab2[0]) / 2.0;
-    double C1 = sqrt(pow(lab1[1], 2) + pow(lab1[2], 2));
-    double C2 = sqrt(pow(lab2[1], 2) + pow(lab2[2], 2));
-    double C_bar = (C1 + C2) / 2.0;
-    double G = sqrt(pow(C_bar, 7) / (pow(C_bar, 7) + pow(25, 7)));
-    double a1_apo = lab1[1] + lab1[1] / 2.0 * (1.0 - G);
-    double a2_apo = lab2[1] + lab2[1] / 2.0 * (1.0 - G);
-    double C1_apo = sqrt(pow(a1_apo, 2) + pow(lab1[2], 2));
-    double C2_apo = sqrt(pow(a2_apo, 2) + pow(lab2[2], 2));
-    double C_bar_apo = (C1_apo + C2_apo) / 2.0;
-    double delta_C_apo = C2_apo - C1_apo;
-
-    double h1_apo;
-    if (C1_apo == 0)
-    {
-        h1_apo = 0.0;
-    }
-    else
-    {
-        h1_apo = atan2(lab1[2], a1_apo);
-        if (h1_apo < 0.0) h1_apo += 2. * CV_PI;
-    }
-
-    double h2_apo;
-    if (C2_apo == 0)
-    {
-        h2_apo = 0.0;
-    }
-    else
-    {
-        h2_apo = atan2(lab2[2], a2_apo);
-        if (h2_apo < 0.0) h2_apo += 2. * CV_PI;
-    }
-
-    double delta_h_apo;
-    if (abs(h2_apo - h1_apo) <= CV_PI)
-    {
-        delta_h_apo = h2_apo - h1_apo;
-    }
-    else if (h2_apo <= h1_apo)
-    {
-        delta_h_apo = h2_apo - h1_apo + 2. * CV_PI;
-    }
-    else
-    {
-        delta_h_apo = h2_apo - h1_apo - 2. * CV_PI;
-    }
-
-    double H_bar_apo;
-    if (C1_apo == 0 || C2_apo == 0)
-    {
-        H_bar_apo = h1_apo + h2_apo;
-    }
-    else if (abs(h1_apo - h2_apo) <= CV_PI)
-    {
-        H_bar_apo = (h1_apo + h2_apo) / 2.0;
-    }
-    else if (h1_apo + h2_apo < 2. * CV_PI)
-    {
-        H_bar_apo = (h1_apo + h2_apo + 2. * CV_PI) / 2.0;
-    }
-    else
-    {
-        H_bar_apo = (h1_apo + h2_apo - 2. * CV_PI) / 2.0;
-    }
-
-    double delta_H_apo = 2.0 * sqrt(C1_apo * C2_apo) * sin(delta_h_apo / 2.0);
-    double T = 1.0 - 0.17 * cos(H_bar_apo - toRad(30.)) +
-        0.24 * cos(2.0 * H_bar_apo) +
-        0.32 * cos(3.0 * H_bar_apo + toRad(6.0)) -
-        0.2 * cos(4.0 * H_bar_apo - toRad(63.0));
-    double sC = 1.0 + 0.045 * C_bar_apo;
-    double sH = 1.0 + 0.015 * C_bar_apo * T;
-    double sL = 1.0 + ((0.015 * pow(l_bar_apo - 50.0, 2.0)) /
-        sqrt(20.0 + pow(l_bar_apo - 50.0, 2.0)));
-    double RT = -2.0 * G *
-        sin(toRad(60.0) *
-            exp(-pow((H_bar_apo - toRad(275.0)) / toRad(25.0), 2.0)));
-    double res =
-        (pow(delta_L_apo / (kL * sL), 2.0) + pow(delta_C_apo / (kC * sC), 2.0) +
-            pow(delta_H_apo / (kH * sH), 2.0) +
-            RT * (delta_C_apo / (kC * sC)) * (delta_H_apo / (kH * sH)));
-    return res > 0 ? sqrt(res) : 0;
-}
-
-double deltaCIEDE2000(cv::Vec3d lab1, cv::Vec3d lab2)
-{
-    return deltaCIEDE2000_(lab1, lab2);
-}
+double deltaCIEDE2000_(cv::Vec3d lab1, cv::Vec3d lab2, double kL = 1.0,
+    double kC = 1.0, double kH = 1.0);
+double deltaCIEDE2000(cv::Vec3d lab1, cv::Vec3d lab2);
 
 /* *\ brief  distance between two points in formula CMC
    *\ param lab1 a 3D vector
@@ -222,77 +95,16 @@ double deltaCIEDE2000(cv::Vec3d lab1, cv::Vec3d lab2)
    *\ param kC Chroma scale
    *\ return distance between lab1 and lab2
 */
-double deltaCMC(cv::Vec3d lab1, cv::Vec3d lab2, double kL, double kC)
-{
-    double dL = lab2[0] - lab1[0];
-    double da = lab2[1] - lab1[1];
-    double db = lab2[2] - lab1[2];
-    double C1 = sqrt(pow(lab1[1], 2.0) + pow(lab1[2], 2.0));
-    double C2 = sqrt(pow(lab2[1], 2.0) + pow(lab2[2], 2.0));
-    double dC = C2 - C1;
-    double dH = sqrt(pow(da, 2) + pow(db, 2) - pow(dC, 2));
-
-    double H1;
-    if (C1 == 0.)
-    {
-        H1 = 0.0;
-    }
-    else
-    {
-        H1 = atan2(lab1[2], lab1[1]);
-        if (H1 < 0.0) H1 += 2. * CV_PI;
-    }
-
-    double F = pow(C1, 2) / sqrt(pow(C1, 4) + 1900);
-    double T = (H1 > toRad(164) && H1 <= toRad(345))
-        ? 0.56 + abs(0.2 * cos(H1 + toRad(168)))
-        : 0.36 + abs(0.4 * cos(H1 + toRad(35)));
-    double sL =
-        lab1[0] < 16. ? 0.511 : (0.040975 * lab1[0]) / (1.0 + 0.01765 * lab1[0]);
-    double sC = (0.0638 * C1) / (1.0 + 0.0131 * C1) + 0.638;
-    double sH = sC * (F * T + 1.0 - F);
+double deltaCMC(cv::Vec3d lab1, cv::Vec3d lab2, double kL = 1, double kC = 1);
 
-    return sqrt(pow(dL / (kL * sL), 2.0) + pow(dC / (kC * sC), 2.0) +
-        pow(dH / sH, 2.0));
-}
+double deltaCMC1To1(cv::Vec3d lab1, cv::Vec3d lab2);
 
-double deltaCMC1To1(cv::Vec3d lab1, cv::Vec3d lab2)
-{
-    return deltaCMC(lab1, lab2);
-}
+double deltaCMC2To1(cv::Vec3d lab1, cv::Vec3d lab2);
 
-double deltaCMC2To1(cv::Vec3d lab1, cv::Vec3d lab2)
-{
-    return deltaCMC(lab1, lab2, 2, 1);
-}
+Mat distance(Mat src, Mat ref, DISTANCE_TYPE distance_type);
 
-cv::Mat distance(cv::Mat src, cv::Mat ref, DISTANCE_TYPE distance_type)
-{
-    switch (distance_type)
-    {
-    case cv::ccm::CIE76:
-        return distanceWise(src, ref, deltaCIE76);
-    case cv::ccm::CIE94_GRAPHIC_ARTS:
-        return distanceWise(src, ref, deltaCIE94GraphicArts);
-    case cv::ccm::CIE94_TEXTILES:
-        return distanceWise(src, ref, deltaCIE94Textiles);
-    case cv::ccm::CIE2000:
-        return distanceWise(src, ref, deltaCIEDE2000);
-    case cv::ccm::CMC_1TO1:
-        return distanceWise(src, ref, deltaCMC1To1);
-    case cv::ccm::CMC_2TO1:
-        return distanceWise(src, ref, deltaCMC2To1);
-    case cv::ccm::RGB:
-        return distanceWise(src, ref, deltaCIE76);
-    case cv::ccm::RGBL:
-        return distanceWise(src, ref, deltaCIE76);
-    default:
-        throw std::invalid_argument{ "Wrong distance_type!" };
-        break;
-    }
-};
+} // namespace ccm
+} // namespace cv
 
-}  // namespace ccm
-}  // namespace cv
 
-#endif
+#endif