From 3d533a343fbce6049b642a039a33eec1b2c0ef7e Mon Sep 17 00:00:00 2001 From: David Tschumperle Date: Tue, 6 Feb 2024 09:46:12 +0100 Subject: [PATCH 1/4] Auto-commit for release 3.3.4_pre --- html/header.html | 2 +- html/header_doxygen.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/html/header.html b/html/header.html index d229f6a5..73816ebc 100644 --- a/html/header.html +++ b/html/header.html @@ -23,7 +23,7 @@
Logo

- Latest stable version: 3.3.3        Current pre-release: 3.3.4 (2024/02/05) + Latest stable version: 3.3.3        Current pre-release: 3.3.4 (2024/02/06)

diff --git a/html/header_doxygen.html b/html/header_doxygen.html index a7fe82cf..5cd968b2 100644 --- a/html/header_doxygen.html +++ b/html/header_doxygen.html @@ -26,7 +26,7 @@
Logo

- Latest stable version: 3.3.3        Current pre-release: 3.3.4 (2024/02/05) + Latest stable version: 3.3.3        Current pre-release: 3.3.4 (2024/02/06)

From e1b3f3fe89cffd3196ef9acd030aa056da2b933d Mon Sep 17 00:00:00 2001 From: David Tschumperle Date: Wed, 7 Feb 2024 13:07:35 +0100 Subject: [PATCH 2/4] Add CeCILL-C licensing to plug-in 'inpaint.h'. --- plugins/inpaint.h | 48 +++++++++++++++++++++++++++-------------------- 1 file changed, 28 insertions(+), 20 deletions(-) diff --git a/plugins/inpaint.h b/plugins/inpaint.h index d7083f99..93b9f0f5 100644 --- a/plugins/inpaint.h +++ b/plugins/inpaint.h @@ -5,31 +5,39 @@ # # Copyright : David Tschumperlé # - # License : CeCILL v2.0 - # ( http://www.cecill.info/licences/Licence_CeCILL_V2-en.html ) - # # Description : # - # This plug-in implements the patch-based inpainting algorithm for 2d images, as - # described in the two following publications : + # This plug-in implements the patch-based inpainting algorithm for 2d images, as + # described in the two following publications : + # + # "A Smarter Examplar-based Inpainting Algorithm using Local and Global Heuristics + # for more Geometric Coherence." + # (M. Daisy, P. Buyssens, D. Tschumperlé, O. Lezoray). + # IEEE International Conference on Image Processing (ICIP'14), Paris/France, Oct. 2014 + # + # and + # + # "A Fast Spatial Patch Blending Algorithm for Artefact Reduction in Pattern-based + # Image Inpainting." + # (M. Daisy, D. Tschumperlé, O. Lezoray). + # SIGGRAPH Asia 2013 Technical Briefs, Hong-Kong, November 2013. # - # "A Smarter Examplar-based Inpainting Algorithm using Local and Global Heuristics - # for more Geometric Coherence." - # (M. Daisy, P. Buyssens, D. Tschumperlé, O. Lezoray). - # IEEE International Conference on Image Processing (ICIP'14), Paris/France, Oct. 2014 + # License : This file is 'dual-licensed', you have to choose one + # of the two licenses below to apply. # - # and + # CeCILL-C + # The CeCILL-C license is close to the GNU LGPL. + # ( http://cecill.info/licences/Licence_CeCILL-C_V1-en.html ) # - # "A Fast Spatial Patch Blending Algorithm for Artefact Reduction in Pattern-based - # Image Inpainting." - # (M. Daisy, D. Tschumperlé, O. Lezoray). - # SIGGRAPH Asia 2013 Technical Briefs, Hong-Kong, November 2013. + # or CeCILL v2.1 + # The CeCILL license is compatible with the GNU GPL. + # ( http://cecill.info/licences/Licence_CeCILL_V2.1-en.html ) # - # This software is governed by the CeCILL license under French law and - # abiding by the rules of distribution of free software. You can use, - # modify and/ or redistribute the software under the terms of the CeCILL - # license as circulated by CEA, CNRS and INRIA at the following URL - # "http://www.cecill.info". + # This software is governed either by the CeCILL or the CeCILL-C license + # under French law and abiding by the rules of distribution of free software. + # You can use, modify and or redistribute the software under the terms of + # the CeCILL or CeCILL-C licenses as circulated by CEA, CNRS and INRIA + # at the following URL: "http://cecill.info". # # As a counterpart to the access to the source code and rights to copy, # modify and redistribute granted by the license, users are provided only @@ -49,7 +57,7 @@ # same conditions as regards security. # # The fact that you are presently reading this means that you have had - # knowledge of the CeCILL license and that you accept its terms. + # knowledge of the CeCILL and CeCILL-C licenses and that you accept its terms. # */ #ifndef cimg_plugin_inpaint From d66ab2af4619ae6544dd5ba27f81be1ba59b2178 Mon Sep 17 00:00:00 2001 From: David Tschumperle Date: Wed, 7 Feb 2024 13:07:54 +0100 Subject: [PATCH 3/4] Add CeCILL-C licensing to plug-in 'inpaint.h'. --- plugins/inpaint.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/plugins/inpaint.h b/plugins/inpaint.h index 93b9f0f5..7636e81f 100644 --- a/plugins/inpaint.h +++ b/plugins/inpaint.h @@ -5,7 +5,7 @@ # # Copyright : David Tschumperlé # - # Description : + # Description : # # This plug-in implements the patch-based inpainting algorithm for 2d images, as # described in the two following publications : @@ -22,16 +22,16 @@ # (M. Daisy, D. Tschumperlé, O. Lezoray). # SIGGRAPH Asia 2013 Technical Briefs, Hong-Kong, November 2013. # - # License : This file is 'dual-licensed', you have to choose one - # of the two licenses below to apply. + # License : This file is 'dual-licensed', you have to choose one + # of the two licenses below to apply. # - # CeCILL-C - # The CeCILL-C license is close to the GNU LGPL. - # ( http://cecill.info/licences/Licence_CeCILL-C_V1-en.html ) + # CeCILL-C + # The CeCILL-C license is close to the GNU LGPL. + # ( http://cecill.info/licences/Licence_CeCILL-C_V1-en.html ) # - # or CeCILL v2.1 - # The CeCILL license is compatible with the GNU GPL. - # ( http://cecill.info/licences/Licence_CeCILL_V2.1-en.html ) + # or CeCILL v2.1 + # The CeCILL license is compatible with the GNU GPL. + # ( http://cecill.info/licences/Licence_CeCILL_V2.1-en.html ) # # This software is governed either by the CeCILL or the CeCILL-C license # under French law and abiding by the rules of distribution of free software. From 00eb075ad403baa0ef6c352a68a163edf9fe210f Mon Sep 17 00:00:00 2001 From: David Tschumperle Date: Wed, 7 Feb 2024 13:08:34 +0100 Subject: [PATCH 4/4] Add CeCILL-C licensing to plug-in 'inpaint.h'. --- plugins/inpaint.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/inpaint.h b/plugins/inpaint.h index 7636e81f..3742484c 100644 --- a/plugins/inpaint.h +++ b/plugins/inpaint.h @@ -22,7 +22,7 @@ # (M. Daisy, D. Tschumperlé, O. Lezoray). # SIGGRAPH Asia 2013 Technical Briefs, Hong-Kong, November 2013. # - # License : This file is 'dual-licensed', you have to choose one + # Licenses : This file is 'dual-licensed', you have to choose one # of the two licenses below to apply. # # CeCILL-C