From eae4d787485d9b267b354ecf1bbaebcdf504e858 Mon Sep 17 00:00:00 2001 From: Alexander Alekhin Date: Fri, 16 Dec 2016 17:12:18 +0300 Subject: [PATCH 1/2] misc: minor fix in license header --- modules/optflow/perf/perf_deepflow.cpp | 2 +- modules/optflow/perf/perf_disflow.cpp | 2 +- modules/optflow/perf/perf_variational_refinement.cpp | 2 +- modules/ximgproc/include/opencv2/ximgproc.hpp | 2 +- modules/ximgproc/include/opencv2/ximgproc/disparity_filter.hpp | 2 +- modules/ximgproc/include/opencv2/ximgproc/edge_filter.hpp | 2 +- modules/ximgproc/include/opencv2/ximgproc/paillou_filter.hpp | 2 +- .../include/opencv2/ximgproc/sparse_match_interpolator.hpp | 2 +- modules/ximgproc/perf/perf_adaptive_manifold.cpp | 2 +- modules/ximgproc/perf/perf_bilateral_texture_filter.cpp | 2 +- modules/ximgproc/perf/perf_disparity_wls_filter.cpp | 2 +- modules/ximgproc/perf/perf_domain_transform.cpp | 2 +- modules/ximgproc/perf/perf_fgs_filter.cpp | 2 +- modules/ximgproc/perf/perf_guided_filter.cpp | 2 +- modules/ximgproc/perf/perf_l0_smooth.cpp | 2 +- modules/ximgproc/perf/perf_rolling_guidance_filter.cpp | 2 +- modules/ximgproc/perf/perf_weighted_median_filter.cpp | 2 +- modules/ximgproc/perf/pref_joint_bilateral_filter.cpp | 2 +- modules/ximgproc/samples/live_demo.cpp | 2 +- modules/ximgproc/samples/paillou_demo.cpp | 2 +- modules/ximgproc/src/adaptive_manifold_filter_n.cpp | 2 +- modules/ximgproc/src/disparity_filters.cpp | 2 +- modules/ximgproc/src/domain_transform.cpp | 2 +- modules/ximgproc/src/dtfilter_cpu.cpp | 2 +- modules/ximgproc/src/dtfilter_cpu.hpp | 2 +- modules/ximgproc/src/dtfilter_cpu.inl.hpp | 2 +- modules/ximgproc/src/edgeaware_filters_common.cpp | 2 +- modules/ximgproc/src/edgeaware_filters_common.hpp | 2 +- modules/ximgproc/src/fgs_filter.cpp | 2 +- modules/ximgproc/src/guided_filter.cpp | 2 +- modules/ximgproc/src/joint_bilateral_filter.cpp | 2 +- modules/ximgproc/src/l0_smooth.cpp | 2 +- modules/ximgproc/src/precomp.hpp | 2 +- modules/ximgproc/src/rolling_guidance_filter.cpp | 2 +- modules/ximgproc/src/sparse_match_interpolators.cpp | 2 +- modules/ximgproc/src/weighted_median_filter.cpp | 2 +- modules/ximgproc/test/test_adaptive_manifold.cpp | 2 +- modules/ximgproc/test/test_adaptive_manifold_ref_impl.cpp | 2 +- modules/ximgproc/test/test_bilateral_texture_filter.cpp | 2 +- modules/ximgproc/test/test_disparity_wls_filter.cpp | 2 +- modules/ximgproc/test/test_domain_transform.cpp | 2 +- modules/ximgproc/test/test_fgs_filter.cpp | 2 +- modules/ximgproc/test/test_guided_filter.cpp | 2 +- modules/ximgproc/test/test_joint_bilateral_filter.cpp | 2 +- modules/ximgproc/test/test_l0_smooth.cpp | 2 +- modules/ximgproc/test/test_rolling_guidance_filter.cpp | 2 +- modules/ximgproc/test/test_sparse_match_interpolator.cpp | 2 +- modules/ximgproc/test/test_weighted_median_filter.cpp | 2 +- modules/xphoto/perf/perf_learning_based_color_balance.cpp | 2 +- 49 files changed, 49 insertions(+), 49 deletions(-) diff --git a/modules/optflow/perf/perf_deepflow.cpp b/modules/optflow/perf/perf_deepflow.cpp index 7df5bb2ae..e52dcd731 100644 --- a/modules/optflow/perf/perf_deepflow.cpp +++ b/modules/optflow/perf/perf_deepflow.cpp @@ -11,7 +11,7 @@ * Redistribution and use in source and binary forms, with or without modification, * are permitted provided that the following conditions are met : * - * *Redistributions of source code must retain the above copyright notice, + * * Redistributions of source code must retain the above copyright notice, * this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright notice, diff --git a/modules/optflow/perf/perf_disflow.cpp b/modules/optflow/perf/perf_disflow.cpp index ad05420be..12a620310 100644 --- a/modules/optflow/perf/perf_disflow.cpp +++ b/modules/optflow/perf/perf_disflow.cpp @@ -11,7 +11,7 @@ * Redistribution and use in source and binary forms, with or without modification, * are permitted provided that the following conditions are met : * - * *Redistributions of source code must retain the above copyright notice, + * * Redistributions of source code must retain the above copyright notice, * this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright notice, diff --git a/modules/optflow/perf/perf_variational_refinement.cpp b/modules/optflow/perf/perf_variational_refinement.cpp index e9a4ca1b8..613d698ec 100644 --- a/modules/optflow/perf/perf_variational_refinement.cpp +++ b/modules/optflow/perf/perf_variational_refinement.cpp @@ -11,7 +11,7 @@ * Redistribution and use in source and binary forms, with or without modification, * are permitted provided that the following conditions are met : * -* *Redistributions of source code must retain the above copyright notice, +* * Redistributions of source code must retain the above copyright notice, * this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright notice, diff --git a/modules/ximgproc/include/opencv2/ximgproc.hpp b/modules/ximgproc/include/opencv2/ximgproc.hpp index 11b32cdeb..bf666f243 100644 --- a/modules/ximgproc/include/opencv2/ximgproc.hpp +++ b/modules/ximgproc/include/opencv2/ximgproc.hpp @@ -11,7 +11,7 @@ * Redistribution and use in source and binary forms, with or without modification, * are permitted provided that the following conditions are met : * - * *Redistributions of source code must retain the above copyright notice, + * * Redistributions of source code must retain the above copyright notice, * this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright notice, diff --git a/modules/ximgproc/include/opencv2/ximgproc/disparity_filter.hpp b/modules/ximgproc/include/opencv2/ximgproc/disparity_filter.hpp index 07bcf6d9a..b73843684 100644 --- a/modules/ximgproc/include/opencv2/ximgproc/disparity_filter.hpp +++ b/modules/ximgproc/include/opencv2/ximgproc/disparity_filter.hpp @@ -11,7 +11,7 @@ * Redistribution and use in source and binary forms, with or without modification, * are permitted provided that the following conditions are met : * - * *Redistributions of source code must retain the above copyright notice, + * * Redistributions of source code must retain the above copyright notice, * this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright notice, diff --git a/modules/ximgproc/include/opencv2/ximgproc/edge_filter.hpp b/modules/ximgproc/include/opencv2/ximgproc/edge_filter.hpp index 4709798b6..65cff9e4d 100644 --- a/modules/ximgproc/include/opencv2/ximgproc/edge_filter.hpp +++ b/modules/ximgproc/include/opencv2/ximgproc/edge_filter.hpp @@ -11,7 +11,7 @@ * Redistribution and use in source and binary forms, with or without modification, * are permitted provided that the following conditions are met : * - * *Redistributions of source code must retain the above copyright notice, + * * Redistributions of source code must retain the above copyright notice, * this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright notice, diff --git a/modules/ximgproc/include/opencv2/ximgproc/paillou_filter.hpp b/modules/ximgproc/include/opencv2/ximgproc/paillou_filter.hpp index e58b609d5..f7feee312 100644 --- a/modules/ximgproc/include/opencv2/ximgproc/paillou_filter.hpp +++ b/modules/ximgproc/include/opencv2/ximgproc/paillou_filter.hpp @@ -11,7 +11,7 @@ * Redistribution and use in source and binary forms, with or without modification, * are permitted provided that the following conditions are met : * - * *Redistributions of source code must retain the above copyright notice, + * * Redistributions of source code must retain the above copyright notice, * this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright notice, diff --git a/modules/ximgproc/include/opencv2/ximgproc/sparse_match_interpolator.hpp b/modules/ximgproc/include/opencv2/ximgproc/sparse_match_interpolator.hpp index 4821aba25..fffcfd6fa 100644 --- a/modules/ximgproc/include/opencv2/ximgproc/sparse_match_interpolator.hpp +++ b/modules/ximgproc/include/opencv2/ximgproc/sparse_match_interpolator.hpp @@ -11,7 +11,7 @@ * Redistribution and use in source and binary forms, with or without modification, * are permitted provided that the following conditions are met : * - * *Redistributions of source code must retain the above copyright notice, + * * Redistributions of source code must retain the above copyright notice, * this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright notice, diff --git a/modules/ximgproc/perf/perf_adaptive_manifold.cpp b/modules/ximgproc/perf/perf_adaptive_manifold.cpp index a0a5df12e..5702fab68 100644 --- a/modules/ximgproc/perf/perf_adaptive_manifold.cpp +++ b/modules/ximgproc/perf/perf_adaptive_manifold.cpp @@ -11,7 +11,7 @@ * Redistribution and use in source and binary forms, with or without modification, * are permitted provided that the following conditions are met : * - * *Redistributions of source code must retain the above copyright notice, + * * Redistributions of source code must retain the above copyright notice, * this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright notice, diff --git a/modules/ximgproc/perf/perf_bilateral_texture_filter.cpp b/modules/ximgproc/perf/perf_bilateral_texture_filter.cpp index 0da51babe..f49e4e57c 100644 --- a/modules/ximgproc/perf/perf_bilateral_texture_filter.cpp +++ b/modules/ximgproc/perf/perf_bilateral_texture_filter.cpp @@ -11,7 +11,7 @@ * Redistribution and use in source and binary forms, with or without modification, * are permitted provided that the following conditions are met : * - * *Redistributions of source code must retain the above copyright notice, + * * Redistributions of source code must retain the above copyright notice, * this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright notice, diff --git a/modules/ximgproc/perf/perf_disparity_wls_filter.cpp b/modules/ximgproc/perf/perf_disparity_wls_filter.cpp index bd7c8c226..89b9e777a 100644 --- a/modules/ximgproc/perf/perf_disparity_wls_filter.cpp +++ b/modules/ximgproc/perf/perf_disparity_wls_filter.cpp @@ -11,7 +11,7 @@ * Redistribution and use in source and binary forms, with or without modification, * are permitted provided that the following conditions are met : * - * *Redistributions of source code must retain the above copyright notice, + * * Redistributions of source code must retain the above copyright notice, * this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright notice, diff --git a/modules/ximgproc/perf/perf_domain_transform.cpp b/modules/ximgproc/perf/perf_domain_transform.cpp index 9e522dfb4..2d99c7934 100644 --- a/modules/ximgproc/perf/perf_domain_transform.cpp +++ b/modules/ximgproc/perf/perf_domain_transform.cpp @@ -11,7 +11,7 @@ * Redistribution and use in source and binary forms, with or without modification, * are permitted provided that the following conditions are met : * - * *Redistributions of source code must retain the above copyright notice, + * * Redistributions of source code must retain the above copyright notice, * this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright notice, diff --git a/modules/ximgproc/perf/perf_fgs_filter.cpp b/modules/ximgproc/perf/perf_fgs_filter.cpp index b37188fcd..465193b61 100644 --- a/modules/ximgproc/perf/perf_fgs_filter.cpp +++ b/modules/ximgproc/perf/perf_fgs_filter.cpp @@ -11,7 +11,7 @@ * Redistribution and use in source and binary forms, with or without modification, * are permitted provided that the following conditions are met : * - * *Redistributions of source code must retain the above copyright notice, + * * Redistributions of source code must retain the above copyright notice, * this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright notice, diff --git a/modules/ximgproc/perf/perf_guided_filter.cpp b/modules/ximgproc/perf/perf_guided_filter.cpp index 8dd785d05..4f2d74e78 100644 --- a/modules/ximgproc/perf/perf_guided_filter.cpp +++ b/modules/ximgproc/perf/perf_guided_filter.cpp @@ -11,7 +11,7 @@ * Redistribution and use in source and binary forms, with or without modification, * are permitted provided that the following conditions are met : * - * *Redistributions of source code must retain the above copyright notice, + * * Redistributions of source code must retain the above copyright notice, * this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright notice, diff --git a/modules/ximgproc/perf/perf_l0_smooth.cpp b/modules/ximgproc/perf/perf_l0_smooth.cpp index 4ae7820f7..325c70337 100644 --- a/modules/ximgproc/perf/perf_l0_smooth.cpp +++ b/modules/ximgproc/perf/perf_l0_smooth.cpp @@ -11,7 +11,7 @@ * Redistribution and use in source and binary forms, with or without modification, * are permitted provided that the following conditions are met : * - * *Redistributions of source code must retain the above copyright notice, + * * Redistributions of source code must retain the above copyright notice, * this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright notice, diff --git a/modules/ximgproc/perf/perf_rolling_guidance_filter.cpp b/modules/ximgproc/perf/perf_rolling_guidance_filter.cpp index a0bc3d400..89548c1fa 100644 --- a/modules/ximgproc/perf/perf_rolling_guidance_filter.cpp +++ b/modules/ximgproc/perf/perf_rolling_guidance_filter.cpp @@ -11,7 +11,7 @@ * Redistribution and use in source and binary forms, with or without modification, * are permitted provided that the following conditions are met : * - * *Redistributions of source code must retain the above copyright notice, + * * Redistributions of source code must retain the above copyright notice, * this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright notice, diff --git a/modules/ximgproc/perf/perf_weighted_median_filter.cpp b/modules/ximgproc/perf/perf_weighted_median_filter.cpp index b8acfa9ab..7ab4e7066 100644 --- a/modules/ximgproc/perf/perf_weighted_median_filter.cpp +++ b/modules/ximgproc/perf/perf_weighted_median_filter.cpp @@ -11,7 +11,7 @@ * Redistribution and use in source and binary forms, with or without modification, * are permitted provided that the following conditions are met : * - * *Redistributions of source code must retain the above copyright notice, + * * Redistributions of source code must retain the above copyright notice, * this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright notice, diff --git a/modules/ximgproc/perf/pref_joint_bilateral_filter.cpp b/modules/ximgproc/perf/pref_joint_bilateral_filter.cpp index 59ce04605..087308271 100644 --- a/modules/ximgproc/perf/pref_joint_bilateral_filter.cpp +++ b/modules/ximgproc/perf/pref_joint_bilateral_filter.cpp @@ -11,7 +11,7 @@ * Redistribution and use in source and binary forms, with or without modification, * are permitted provided that the following conditions are met : * - * *Redistributions of source code must retain the above copyright notice, + * * Redistributions of source code must retain the above copyright notice, * this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright notice, diff --git a/modules/ximgproc/samples/live_demo.cpp b/modules/ximgproc/samples/live_demo.cpp index 8e16de3a3..a5a09e2a6 100644 --- a/modules/ximgproc/samples/live_demo.cpp +++ b/modules/ximgproc/samples/live_demo.cpp @@ -11,7 +11,7 @@ * Redistribution and use in source and binary forms, with or without modification, * are permitted provided that the following conditions are met : * - * *Redistributions of source code must retain the above copyright notice, + * * Redistributions of source code must retain the above copyright notice, * this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright notice, diff --git a/modules/ximgproc/samples/paillou_demo.cpp b/modules/ximgproc/samples/paillou_demo.cpp index 7ac98b682..bcbb9eea7 100644 --- a/modules/ximgproc/samples/paillou_demo.cpp +++ b/modules/ximgproc/samples/paillou_demo.cpp @@ -11,7 +11,7 @@ * Redistribution and use in source and binary forms, with or without modification, * are permitted provided that the following conditions are met : * - * *Redistributions of source code must retain the above copyright notice, + * * Redistributions of source code must retain the above copyright notice, * this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright notice, diff --git a/modules/ximgproc/src/adaptive_manifold_filter_n.cpp b/modules/ximgproc/src/adaptive_manifold_filter_n.cpp index 3d400a4bc..89a5325c7 100644 --- a/modules/ximgproc/src/adaptive_manifold_filter_n.cpp +++ b/modules/ximgproc/src/adaptive_manifold_filter_n.cpp @@ -11,7 +11,7 @@ * Redistribution and use in source and binary forms, with or without modification, * are permitted provided that the following conditions are met : * - * *Redistributions of source code must retain the above copyright notice, + * * Redistributions of source code must retain the above copyright notice, * this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright notice, diff --git a/modules/ximgproc/src/disparity_filters.cpp b/modules/ximgproc/src/disparity_filters.cpp index 63db08316..77eb6ac7f 100644 --- a/modules/ximgproc/src/disparity_filters.cpp +++ b/modules/ximgproc/src/disparity_filters.cpp @@ -11,7 +11,7 @@ * Redistribution and use in source and binary forms, with or without modification, * are permitted provided that the following conditions are met : * - * *Redistributions of source code must retain the above copyright notice, + * * Redistributions of source code must retain the above copyright notice, * this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright notice, diff --git a/modules/ximgproc/src/domain_transform.cpp b/modules/ximgproc/src/domain_transform.cpp index 9689cbe90..9569fecac 100644 --- a/modules/ximgproc/src/domain_transform.cpp +++ b/modules/ximgproc/src/domain_transform.cpp @@ -11,7 +11,7 @@ * Redistribution and use in source and binary forms, with or without modification, * are permitted provided that the following conditions are met : * - * *Redistributions of source code must retain the above copyright notice, + * * Redistributions of source code must retain the above copyright notice, * this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright notice, diff --git a/modules/ximgproc/src/dtfilter_cpu.cpp b/modules/ximgproc/src/dtfilter_cpu.cpp index a908f4a49..79bad4272 100644 --- a/modules/ximgproc/src/dtfilter_cpu.cpp +++ b/modules/ximgproc/src/dtfilter_cpu.cpp @@ -11,7 +11,7 @@ * Redistribution and use in source and binary forms, with or without modification, * are permitted provided that the following conditions are met : * - * *Redistributions of source code must retain the above copyright notice, + * * Redistributions of source code must retain the above copyright notice, * this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright notice, diff --git a/modules/ximgproc/src/dtfilter_cpu.hpp b/modules/ximgproc/src/dtfilter_cpu.hpp index 7e92b005d..89881f94d 100644 --- a/modules/ximgproc/src/dtfilter_cpu.hpp +++ b/modules/ximgproc/src/dtfilter_cpu.hpp @@ -11,7 +11,7 @@ * Redistribution and use in source and binary forms, with or without modification, * are permitted provided that the following conditions are met : * - * *Redistributions of source code must retain the above copyright notice, + * * Redistributions of source code must retain the above copyright notice, * this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright notice, diff --git a/modules/ximgproc/src/dtfilter_cpu.inl.hpp b/modules/ximgproc/src/dtfilter_cpu.inl.hpp index b8d012bac..73e903ace 100644 --- a/modules/ximgproc/src/dtfilter_cpu.inl.hpp +++ b/modules/ximgproc/src/dtfilter_cpu.inl.hpp @@ -11,7 +11,7 @@ * Redistribution and use in source and binary forms, with or without modification, * are permitted provided that the following conditions are met : * - * *Redistributions of source code must retain the above copyright notice, + * * Redistributions of source code must retain the above copyright notice, * this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright notice, diff --git a/modules/ximgproc/src/edgeaware_filters_common.cpp b/modules/ximgproc/src/edgeaware_filters_common.cpp index 223a244aa..232891435 100644 --- a/modules/ximgproc/src/edgeaware_filters_common.cpp +++ b/modules/ximgproc/src/edgeaware_filters_common.cpp @@ -11,7 +11,7 @@ * Redistribution and use in source and binary forms, with or without modification, * are permitted provided that the following conditions are met : * - * *Redistributions of source code must retain the above copyright notice, + * * Redistributions of source code must retain the above copyright notice, * this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright notice, diff --git a/modules/ximgproc/src/edgeaware_filters_common.hpp b/modules/ximgproc/src/edgeaware_filters_common.hpp index 7ed217b17..e45d397d0 100644 --- a/modules/ximgproc/src/edgeaware_filters_common.hpp +++ b/modules/ximgproc/src/edgeaware_filters_common.hpp @@ -11,7 +11,7 @@ * Redistribution and use in source and binary forms, with or without modification, * are permitted provided that the following conditions are met : * - * *Redistributions of source code must retain the above copyright notice, + * * Redistributions of source code must retain the above copyright notice, * this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright notice, diff --git a/modules/ximgproc/src/fgs_filter.cpp b/modules/ximgproc/src/fgs_filter.cpp index 39307e5b9..f9f17ed4f 100644 --- a/modules/ximgproc/src/fgs_filter.cpp +++ b/modules/ximgproc/src/fgs_filter.cpp @@ -11,7 +11,7 @@ * Redistribution and use in source and binary forms, with or without modification, * are permitted provided that the following conditions are met : * - * *Redistributions of source code must retain the above copyright notice, + * * Redistributions of source code must retain the above copyright notice, * this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright notice, diff --git a/modules/ximgproc/src/guided_filter.cpp b/modules/ximgproc/src/guided_filter.cpp index b94d812f1..1a5f79376 100644 --- a/modules/ximgproc/src/guided_filter.cpp +++ b/modules/ximgproc/src/guided_filter.cpp @@ -11,7 +11,7 @@ * Redistribution and use in source and binary forms, with or without modification, * are permitted provided that the following conditions are met : * - * *Redistributions of source code must retain the above copyright notice, + * * Redistributions of source code must retain the above copyright notice, * this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright notice, diff --git a/modules/ximgproc/src/joint_bilateral_filter.cpp b/modules/ximgproc/src/joint_bilateral_filter.cpp index 5bc7dc62e..433e21aab 100644 --- a/modules/ximgproc/src/joint_bilateral_filter.cpp +++ b/modules/ximgproc/src/joint_bilateral_filter.cpp @@ -11,7 +11,7 @@ * Redistribution and use in source and binary forms, with or without modification, * are permitted provided that the following conditions are met : * - * *Redistributions of source code must retain the above copyright notice, + * * Redistributions of source code must retain the above copyright notice, * this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright notice, diff --git a/modules/ximgproc/src/l0_smooth.cpp b/modules/ximgproc/src/l0_smooth.cpp index 57288ea31..65b1b7e4d 100644 --- a/modules/ximgproc/src/l0_smooth.cpp +++ b/modules/ximgproc/src/l0_smooth.cpp @@ -11,7 +11,7 @@ * Redistribution and use in source and binary forms, with or without modification, * are permitted provided that the following conditions are met : * - * *Redistributions of source code must retain the above copyright notice, + * * Redistributions of source code must retain the above copyright notice, * this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright notice, diff --git a/modules/ximgproc/src/precomp.hpp b/modules/ximgproc/src/precomp.hpp index 74d2c3835..29af094ce 100644 --- a/modules/ximgproc/src/precomp.hpp +++ b/modules/ximgproc/src/precomp.hpp @@ -11,7 +11,7 @@ * Redistribution and use in source and binary forms, with or without modification, * are permitted provided that the following conditions are met : * - * *Redistributions of source code must retain the above copyright notice, + * * Redistributions of source code must retain the above copyright notice, * this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright notice, diff --git a/modules/ximgproc/src/rolling_guidance_filter.cpp b/modules/ximgproc/src/rolling_guidance_filter.cpp index 679b296e0..0786ea026 100644 --- a/modules/ximgproc/src/rolling_guidance_filter.cpp +++ b/modules/ximgproc/src/rolling_guidance_filter.cpp @@ -11,7 +11,7 @@ * Redistribution and use in source and binary forms, with or without modification, * are permitted provided that the following conditions are met : * - * *Redistributions of source code must retain the above copyright notice, + * * Redistributions of source code must retain the above copyright notice, * this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright notice, diff --git a/modules/ximgproc/src/sparse_match_interpolators.cpp b/modules/ximgproc/src/sparse_match_interpolators.cpp index 2ed790e04..5be3c46e5 100644 --- a/modules/ximgproc/src/sparse_match_interpolators.cpp +++ b/modules/ximgproc/src/sparse_match_interpolators.cpp @@ -11,7 +11,7 @@ * Redistribution and use in source and binary forms, with or without modification, * are permitted provided that the following conditions are met : * - * *Redistributions of source code must retain the above copyright notice, + * * Redistributions of source code must retain the above copyright notice, * this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright notice, diff --git a/modules/ximgproc/src/weighted_median_filter.cpp b/modules/ximgproc/src/weighted_median_filter.cpp index 0d03bc1d1..358959cdd 100644 --- a/modules/ximgproc/src/weighted_median_filter.cpp +++ b/modules/ximgproc/src/weighted_median_filter.cpp @@ -11,7 +11,7 @@ * Redistribution and use in source and binary forms, with or without modification, * are permitted provided that the following conditions are met : * - * *Redistributions of source code must retain the above copyright notice, + * * Redistributions of source code must retain the above copyright notice, * this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright notice, diff --git a/modules/ximgproc/test/test_adaptive_manifold.cpp b/modules/ximgproc/test/test_adaptive_manifold.cpp index 6eca621ed..5e175b6f8 100644 --- a/modules/ximgproc/test/test_adaptive_manifold.cpp +++ b/modules/ximgproc/test/test_adaptive_manifold.cpp @@ -11,7 +11,7 @@ * Redistribution and use in source and binary forms, with or without modification, * are permitted provided that the following conditions are met : * - * *Redistributions of source code must retain the above copyright notice, + * * Redistributions of source code must retain the above copyright notice, * this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright notice, diff --git a/modules/ximgproc/test/test_adaptive_manifold_ref_impl.cpp b/modules/ximgproc/test/test_adaptive_manifold_ref_impl.cpp index 8f2db66a3..273daedf4 100644 --- a/modules/ximgproc/test/test_adaptive_manifold_ref_impl.cpp +++ b/modules/ximgproc/test/test_adaptive_manifold_ref_impl.cpp @@ -11,7 +11,7 @@ * Redistribution and use in source and binary forms, with or without modification, * are permitted provided that the following conditions are met : * - * *Redistributions of source code must retain the above copyright notice, + * * Redistributions of source code must retain the above copyright notice, * this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright notice, diff --git a/modules/ximgproc/test/test_bilateral_texture_filter.cpp b/modules/ximgproc/test/test_bilateral_texture_filter.cpp index 2c53e2377..61fa97224 100644 --- a/modules/ximgproc/test/test_bilateral_texture_filter.cpp +++ b/modules/ximgproc/test/test_bilateral_texture_filter.cpp @@ -11,7 +11,7 @@ * Redistribution and use in source and binary forms, with or without modification, * are permitted provided that the following conditions are met : * - * *Redistributions of source code must retain the above copyright notice, + * * Redistributions of source code must retain the above copyright notice, * this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright notice, diff --git a/modules/ximgproc/test/test_disparity_wls_filter.cpp b/modules/ximgproc/test/test_disparity_wls_filter.cpp index a3e0ce6e5..93323b525 100644 --- a/modules/ximgproc/test/test_disparity_wls_filter.cpp +++ b/modules/ximgproc/test/test_disparity_wls_filter.cpp @@ -11,7 +11,7 @@ * Redistribution and use in source and binary forms, with or without modification, * are permitted provided that the following conditions are met : * - * *Redistributions of source code must retain the above copyright notice, + * * Redistributions of source code must retain the above copyright notice, * this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright notice, diff --git a/modules/ximgproc/test/test_domain_transform.cpp b/modules/ximgproc/test/test_domain_transform.cpp index 53bf0103b..86951171b 100644 --- a/modules/ximgproc/test/test_domain_transform.cpp +++ b/modules/ximgproc/test/test_domain_transform.cpp @@ -11,7 +11,7 @@ * Redistribution and use in source and binary forms, with or without modification, * are permitted provided that the following conditions are met : * - * *Redistributions of source code must retain the above copyright notice, + * * Redistributions of source code must retain the above copyright notice, * this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright notice, diff --git a/modules/ximgproc/test/test_fgs_filter.cpp b/modules/ximgproc/test/test_fgs_filter.cpp index 3f3508230..94b4e7dbf 100644 --- a/modules/ximgproc/test/test_fgs_filter.cpp +++ b/modules/ximgproc/test/test_fgs_filter.cpp @@ -11,7 +11,7 @@ * Redistribution and use in source and binary forms, with or without modification, * are permitted provided that the following conditions are met : * - * *Redistributions of source code must retain the above copyright notice, + * * Redistributions of source code must retain the above copyright notice, * this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright notice, diff --git a/modules/ximgproc/test/test_guided_filter.cpp b/modules/ximgproc/test/test_guided_filter.cpp index 89fd9837b..04b185fdb 100644 --- a/modules/ximgproc/test/test_guided_filter.cpp +++ b/modules/ximgproc/test/test_guided_filter.cpp @@ -11,7 +11,7 @@ * Redistribution and use in source and binary forms, with or without modification, * are permitted provided that the following conditions are met : * - * *Redistributions of source code must retain the above copyright notice, + * * Redistributions of source code must retain the above copyright notice, * this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright notice, diff --git a/modules/ximgproc/test/test_joint_bilateral_filter.cpp b/modules/ximgproc/test/test_joint_bilateral_filter.cpp index ccd41de34..9c4de774a 100644 --- a/modules/ximgproc/test/test_joint_bilateral_filter.cpp +++ b/modules/ximgproc/test/test_joint_bilateral_filter.cpp @@ -11,7 +11,7 @@ * Redistribution and use in source and binary forms, with or without modification, * are permitted provided that the following conditions are met : * - * *Redistributions of source code must retain the above copyright notice, + * * Redistributions of source code must retain the above copyright notice, * this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright notice, diff --git a/modules/ximgproc/test/test_l0_smooth.cpp b/modules/ximgproc/test/test_l0_smooth.cpp index dae1b4341..9f006a504 100644 --- a/modules/ximgproc/test/test_l0_smooth.cpp +++ b/modules/ximgproc/test/test_l0_smooth.cpp @@ -11,7 +11,7 @@ * Redistribution and use in source and binary forms, with or without modification, * are permitted provided that the following conditions are met : * - * *Redistributions of source code must retain the above copyright notice, + * * Redistributions of source code must retain the above copyright notice, * this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright notice, diff --git a/modules/ximgproc/test/test_rolling_guidance_filter.cpp b/modules/ximgproc/test/test_rolling_guidance_filter.cpp index 604f8514c..a29f9c4e2 100644 --- a/modules/ximgproc/test/test_rolling_guidance_filter.cpp +++ b/modules/ximgproc/test/test_rolling_guidance_filter.cpp @@ -11,7 +11,7 @@ * Redistribution and use in source and binary forms, with or without modification, * are permitted provided that the following conditions are met : * - * *Redistributions of source code must retain the above copyright notice, + * * Redistributions of source code must retain the above copyright notice, * this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright notice, diff --git a/modules/ximgproc/test/test_sparse_match_interpolator.cpp b/modules/ximgproc/test/test_sparse_match_interpolator.cpp index bb9eb6174..fece6dbf2 100644 --- a/modules/ximgproc/test/test_sparse_match_interpolator.cpp +++ b/modules/ximgproc/test/test_sparse_match_interpolator.cpp @@ -11,7 +11,7 @@ * Redistribution and use in source and binary forms, with or without modification, * are permitted provided that the following conditions are met : * - * *Redistributions of source code must retain the above copyright notice, + * * Redistributions of source code must retain the above copyright notice, * this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright notice, diff --git a/modules/ximgproc/test/test_weighted_median_filter.cpp b/modules/ximgproc/test/test_weighted_median_filter.cpp index 9571e84d5..9dea51fd1 100644 --- a/modules/ximgproc/test/test_weighted_median_filter.cpp +++ b/modules/ximgproc/test/test_weighted_median_filter.cpp @@ -11,7 +11,7 @@ * Redistribution and use in source and binary forms, with or without modification, * are permitted provided that the following conditions are met : * - * *Redistributions of source code must retain the above copyright notice, + * * Redistributions of source code must retain the above copyright notice, * this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright notice, diff --git a/modules/xphoto/perf/perf_learning_based_color_balance.cpp b/modules/xphoto/perf/perf_learning_based_color_balance.cpp index dbffbd79d..6c66d4eb9 100644 --- a/modules/xphoto/perf/perf_learning_based_color_balance.cpp +++ b/modules/xphoto/perf/perf_learning_based_color_balance.cpp @@ -11,7 +11,7 @@ * Redistribution and use in source and binary forms, with or without modification, * are permitted provided that the following conditions are met : * -* *Redistributions of source code must retain the above copyright notice, +* * Redistributions of source code must retain the above copyright notice, * this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright notice, From 629d3910cc7555f09d63a6c2179b3e21bc73f0dd Mon Sep 17 00:00:00 2001 From: Alexander Alekhin Date: Fri, 16 Dec 2016 17:14:35 +0300 Subject: [PATCH 2/2] misc: removed numeration in README to prevent excessive changes --- modules/README.md | 64 +++++++++++++++++++++++------------------------ 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/modules/README.md b/modules/README.md index c79331a5a..8a4249218 100644 --- a/modules/README.md +++ b/modules/README.md @@ -8,66 +8,66 @@ To turn off building one of these module repositories, set the names in bold bel $ cmake -D OPENCV_EXTRA_MODULES_PATH=/modules -D BUILD_opencv_=OFF ``` -1. **aruco**: ArUco and ChArUco Markers -- Augmented reality ArUco marker and "ChARUco" markers where ArUco markers embedded inside the white areas of the checker board. +- **aruco**: ArUco and ChArUco Markers -- Augmented reality ArUco marker and "ChARUco" markers where ArUco markers embedded inside the white areas of the checker board. -2. **bgsegm**: Background Segmentation -- Improved Adaptive Background Mixture Model and use for real time human tracking under Variable-Lighting Conditions. +- **bgsegm**: Background Segmentation -- Improved Adaptive Background Mixture Model and use for real time human tracking under Variable-Lighting Conditions. -3. **bioinspired**: Biological Vision -- Biologically inspired vision model: minimize noise and luminance variance, transient event segmentation, high dynamic range tone mapping methods. +- **bioinspired**: Biological Vision -- Biologically inspired vision model: minimize noise and luminance variance, transient event segmentation, high dynamic range tone mapping methods. -4. **ccalib**: Custom Calibration -- Patterns for 3D reconstruction, omnidirectional camera calibration, random pattern calibration and multi-camera calibration. +- **ccalib**: Custom Calibration -- Patterns for 3D reconstruction, omnidirectional camera calibration, random pattern calibration and multi-camera calibration. -5. **cnn_3dobj**: Deep Object Recognition and Pose -- Uses Caffe Deep Neural Net library to build, train and test a CNN model of visual object recognition and pose. +- **cnn_3dobj**: Deep Object Recognition and Pose -- Uses Caffe Deep Neural Net library to build, train and test a CNN model of visual object recognition and pose. -6. **contrib_world**: opencv_contrib holder -- contrib_world is the module that when built, contains all other opencv_contrib modules. It may be used for the more convenient redistribution of opencv binaries. +- **contrib_world**: opencv_contrib holder -- contrib_world is the module that when built, contains all other opencv_contrib modules. It may be used for the more convenient redistribution of opencv binaries. -7. **cvv**: Computer Vision Debugger -- Simple code that you can add to your program that pops up a GUI allowing you to interactively and visually debug computer vision programs. +- **cvv**: Computer Vision Debugger -- Simple code that you can add to your program that pops up a GUI allowing you to interactively and visually debug computer vision programs. -8. **datasets**: Datasets Reader -- Code for reading existing computer vision databases and samples of using the readers to train, test and run using that dataset's data. +- **datasets**: Datasets Reader -- Code for reading existing computer vision databases and samples of using the readers to train, test and run using that dataset's data. -9. **dnn**: Deep Neural Networks (DNNs) -- This module can read in image recogniton networks trained in the Caffe neural netowrk library and run them efficiently on CPU. +- **dnn**: Deep Neural Networks (DNNs) -- This module can read in image recogniton networks trained in the Caffe neural netowrk library and run them efficiently on CPU. -10. **dnns_easily_fooled**: Subvert DNNs -- This code can use the activations in a network to fool the networks into recognizing something else. +- **dnns_easily_fooled**: Subvert DNNs -- This code can use the activations in a network to fool the networks into recognizing something else. -11. **dpm**: Deformable Part Model -- Felzenszwalb's Cascade with deformable parts object recognition code. +- **dpm**: Deformable Part Model -- Felzenszwalb's Cascade with deformable parts object recognition code. -12. **face**: Face Recognition -- Face recognition techniques: Eigen, Fisher and Local Binary Pattern Histograms LBPH methods. +- **face**: Face Recognition -- Face recognition techniques: Eigen, Fisher and Local Binary Pattern Histograms LBPH methods. -13. **fuzzy**: Fuzzy Logic in Vision -- Fuzzy logic image transform and inverse; Fuzzy image processing. +- **fuzzy**: Fuzzy Logic in Vision -- Fuzzy logic image transform and inverse; Fuzzy image processing. -14. **freetype**: Drawing text using freetype and harfbuzz. +- **freetype**: Drawing text using freetype and harfbuzz. -15. **hdf**: Hierarchical Data Storage -- This module contains I/O routines for Hierarchical Data Format: https://en.m.wikipedia.org/wiki/Hierarchical_Data_Format meant to store large amounts of data. +- **hdf**: Hierarchical Data Storage -- This module contains I/O routines for Hierarchical Data Format: https://en.m.wikipedia.org/wiki/Hierarchical_Data_Format meant to store large amounts of data. -16. **line_descriptor**: Line Segment Extract and Match -- Methods of extracting, describing and latching line segments using binary descriptors. +- **line_descriptor**: Line Segment Extract and Match -- Methods of extracting, describing and latching line segments using binary descriptors. -17. **matlab**: Matlab Interface -- OpenCV Matlab Mex wrapper code generator for certain opencv core modules. +- **matlab**: Matlab Interface -- OpenCV Matlab Mex wrapper code generator for certain opencv core modules. -18. **optflow**: Optical Flow -- Algorithms for running and evaluating deepflow, simpleflow, sparsetodenseflow and motion templates (silhouette flow). +- **optflow**: Optical Flow -- Algorithms for running and evaluating deepflow, simpleflow, sparsetodenseflow and motion templates (silhouette flow). -19. **plot**: Plotting -- The plot module allows you to easily plot data in 1D or 2D. +- **plot**: Plotting -- The plot module allows you to easily plot data in 1D or 2D. -20. **reg**: Image Registration -- Pixels based image registration for precise alignment. Follows the paper "Image Alignment and Stitching: A Tutorial", by Richard Szeliski. +- **reg**: Image Registration -- Pixels based image registration for precise alignment. Follows the paper "Image Alignment and Stitching: A Tutorial", by Richard Szeliski. -21. **rgbd**: RGB-Depth Processing module -- Linemod 3D object recognition; Fast surface normals and 3D plane finding. 3D visual odometry +- **rgbd**: RGB-Depth Processing module -- Linemod 3D object recognition; Fast surface normals and 3D plane finding. 3D visual odometry -22. **saliency**: Saliency API -- Where humans would look in a scene. Has routines for static, motion and "objectness" saliency. +- **saliency**: Saliency API -- Where humans would look in a scene. Has routines for static, motion and "objectness" saliency. -23. **sfm**: Structure from Motion -- This module contains algorithms to perform 3d reconstruction from 2d images. The core of the module is a light version of Libmv. +- **sfm**: Structure from Motion -- This module contains algorithms to perform 3d reconstruction from 2d images. The core of the module is a light version of Libmv. -24. **stereo**: Stereo Correspondence -- Stereo matching done with different descriptors: Census / CS-Census / MCT / BRIEF / MV. +- **stereo**: Stereo Correspondence -- Stereo matching done with different descriptors: Census / CS-Census / MCT / BRIEF / MV. -25. **structured_light**: Structured Light Use -- How to generate and project gray code patterns and use them to find dense depth in a scene. +- **structured_light**: Structured Light Use -- How to generate and project gray code patterns and use them to find dense depth in a scene. -26. **surface_matching**: Point Pair Features -- Implements 3d object detection and localization using multimodal point pair features. +- **surface_matching**: Point Pair Features -- Implements 3d object detection and localization using multimodal point pair features. -27. **text**: Visual Text Matching -- In a visual scene, detect text, segment words and recognise the text. +- **text**: Visual Text Matching -- In a visual scene, detect text, segment words and recognise the text. -28. **tracking**: Vision Based Object Tracking -- Use and/or evaluate one of 5 different visual object tracking techniques. +- **tracking**: Vision Based Object Tracking -- Use and/or evaluate one of 5 different visual object tracking techniques. -29. **xfeatures2d**: Features2D extra -- Extra 2D Features Framework containing experimental and non-free 2D feature detector/descriptor algorithms. SURF, SIFT, BRIEF, Censure, Freak, LUCID, Daisy, Self-similar. +- **xfeatures2d**: Features2D extra -- Extra 2D Features Framework containing experimental and non-free 2D feature detector/descriptor algorithms. SURF, SIFT, BRIEF, Censure, Freak, LUCID, Daisy, Self-similar. -30. **ximgproc**: Extended Image Processing -- Structured Forests / Domain Transform Filter / Guided Filter / Adaptive Manifold Filter / Joint Bilateral Filter / Superpixels. +- **ximgproc**: Extended Image Processing -- Structured Forests / Domain Transform Filter / Guided Filter / Adaptive Manifold Filter / Joint Bilateral Filter / Superpixels. -31. **xobjdetect**: Boosted 2D Object Detection -- Uses a Waldboost cascade and local binary patterns computed as integral features for 2D object detection. +- **xobjdetect**: Boosted 2D Object Detection -- Uses a Waldboost cascade and local binary patterns computed as integral features for 2D object detection. -32. **xphoto**: Extra Computational Photography -- Additional photo processing algorithms: Color balance / Denoising / Inpainting. +- **xphoto**: Extra Computational Photography -- Additional photo processing algorithms: Color balance / Denoising / Inpainting.