From 336b4868ff744f13ac9861e6635f4363dd3a9f72 Mon Sep 17 00:00:00 2001 From: cont-integration <CI@iri.upc.edu> Date: Thu, 6 Feb 2025 16:56:44 +0100 Subject: [PATCH] [skip ci] license headers added or modified --- examples/polyline_demo.cpp | 24 +++++++++++++++++++ include/laser_scan_utils/corner_falko_2d.h | 24 +++++++++++++++++++ include/laser_scan_utils/corner_finder.h | 24 +++++++++++++++++++ .../corner_finder_inscribed_angle.h | 24 +++++++++++++++++++ include/laser_scan_utils/corner_point.h | 24 +++++++++++++++++++ include/laser_scan_utils/grid_2d.h | 24 +++++++++++++++++++ include/laser_scan_utils/grid_cluster.h | 24 +++++++++++++++++++ include/laser_scan_utils/icp.h | 24 +++++++++++++++++++ include/laser_scan_utils/laser_scan.h | 24 +++++++++++++++++++ include/laser_scan_utils/laser_scan_utils.h | 24 +++++++++++++++++++ .../laser_scan_utils/laser_scan_with_params.h | 24 +++++++++++++++++++ include/laser_scan_utils/line_finder.h | 24 +++++++++++++++++++ include/laser_scan_utils/line_finder_hough.h | 24 +++++++++++++++++++ .../laser_scan_utils/line_finder_iterative.h | 24 +++++++++++++++++++ .../laser_scan_utils/line_finder_jump_fit.h | 24 +++++++++++++++++++ include/laser_scan_utils/line_segment.h | 24 +++++++++++++++++++ include/laser_scan_utils/loop_closure_base.h | 24 +++++++++++++++++++ include/laser_scan_utils/loop_closure_falko.h | 24 +++++++++++++++++++ .../match_loop_closure_scene.h | 24 +++++++++++++++++++ include/laser_scan_utils/point_set.h | 24 +++++++++++++++++++ include/laser_scan_utils/polyline.h | 24 +++++++++++++++++++ include/laser_scan_utils/scan_segment.h | 24 +++++++++++++++++++ include/laser_scan_utils/scene_base.h | 24 +++++++++++++++++++ include/laser_scan_utils/scene_falko.h | 24 +++++++++++++++++++ include/laser_scan_utils/scene_falko_base.h | 24 +++++++++++++++++++ src/corner_falko_2d.cpp | 24 +++++++++++++++++++ src/corner_finder.cpp | 24 +++++++++++++++++++ src/corner_finder_inscribed_angle.cpp | 24 +++++++++++++++++++ src/corner_point.cpp | 24 +++++++++++++++++++ src/grid_2d.cpp | 24 +++++++++++++++++++ src/grid_cluster.cpp | 24 +++++++++++++++++++ src/icp.cpp | 24 +++++++++++++++++++ src/laser_scan.cpp | 24 +++++++++++++++++++ src/laser_scan_with_params.cpp | 24 +++++++++++++++++++ src/line_finder.cpp | 24 +++++++++++++++++++ src/line_finder_hough.cpp | 24 +++++++++++++++++++ src/line_finder_iterative.cpp | 24 +++++++++++++++++++ src/line_finder_jump_fit.cpp | 24 +++++++++++++++++++ src/line_segment.cpp | 24 +++++++++++++++++++ src/loop_closure_base.cpp | 24 +++++++++++++++++++ src/point_set.cpp | 24 +++++++++++++++++++ src/polyline.cpp | 24 +++++++++++++++++++ src/scan_segment.cpp | 24 +++++++++++++++++++ test/data/scan_data.h | 24 +++++++++++++++++++ test/gtest/utils_gtest.h | 24 +++++++++++++++++++ test/gtest_example.cpp | 24 +++++++++++++++++++ test/gtest_icp.cpp | 24 +++++++++++++++++++ test/gtest_loop_closure_falko.cpp | 24 +++++++++++++++++++ 48 files changed, 1152 insertions(+) diff --git a/examples/polyline_demo.cpp b/examples/polyline_demo.cpp index 7b7e095..175ca82 100644 --- a/examples/polyline_demo.cpp +++ b/examples/polyline_demo.cpp @@ -1,3 +1,27 @@ +<<<<<<<< HEAD:scripts/license_header_2024.txt +// Copyright (C) 2020,2021,2022,2023,2024 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. +// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu) +======== +// LaserScanUtils - Copyright (C) 2020-2025 +// Institut de Robòtica i Informà tica Industrial, CSIC-UPC. +// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), +// Andreu Corominas Murtra (acorominas@iri.upc.edu) +>>>>>>>> origin/HEAD:scripts/license_header_2025.txt +// All rights reserved. +// +// This file is part of gnss_utils +// gnss_utils is free software: you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. // LaserScanUtils - Copyright (C) 2020-2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), diff --git a/include/laser_scan_utils/corner_falko_2d.h b/include/laser_scan_utils/corner_falko_2d.h index 5137712..1951b67 100644 --- a/include/laser_scan_utils/corner_falko_2d.h +++ b/include/laser_scan_utils/corner_falko_2d.h @@ -1,3 +1,27 @@ +<<<<<<<< HEAD:scripts/license_header_2024.txt +// Copyright (C) 2020,2021,2022,2023,2024 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. +// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu) +======== +// LaserScanUtils - Copyright (C) 2020-2025 +// Institut de Robòtica i Informà tica Industrial, CSIC-UPC. +// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), +// Andreu Corominas Murtra (acorominas@iri.upc.edu) +>>>>>>>> origin/HEAD:scripts/license_header_2025.txt +// All rights reserved. +// +// This file is part of gnss_utils +// gnss_utils is free software: you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. // LaserScanUtils - Copyright (C) 2020-2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), diff --git a/include/laser_scan_utils/corner_finder.h b/include/laser_scan_utils/corner_finder.h index 4378459..8dfc1ca 100644 --- a/include/laser_scan_utils/corner_finder.h +++ b/include/laser_scan_utils/corner_finder.h @@ -1,3 +1,27 @@ +<<<<<<<< HEAD:scripts/license_header_2024.txt +// Copyright (C) 2020,2021,2022,2023,2024 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. +// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu) +======== +// LaserScanUtils - Copyright (C) 2020-2025 +// Institut de Robòtica i Informà tica Industrial, CSIC-UPC. +// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), +// Andreu Corominas Murtra (acorominas@iri.upc.edu) +>>>>>>>> origin/HEAD:scripts/license_header_2025.txt +// All rights reserved. +// +// This file is part of gnss_utils +// gnss_utils is free software: you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. // LaserScanUtils - Copyright (C) 2020-2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), diff --git a/include/laser_scan_utils/corner_finder_inscribed_angle.h b/include/laser_scan_utils/corner_finder_inscribed_angle.h index db4f778..a239259 100644 --- a/include/laser_scan_utils/corner_finder_inscribed_angle.h +++ b/include/laser_scan_utils/corner_finder_inscribed_angle.h @@ -1,3 +1,27 @@ +<<<<<<<< HEAD:scripts/license_header_2024.txt +// Copyright (C) 2020,2021,2022,2023,2024 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. +// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu) +======== +// LaserScanUtils - Copyright (C) 2020-2025 +// Institut de Robòtica i Informà tica Industrial, CSIC-UPC. +// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), +// Andreu Corominas Murtra (acorominas@iri.upc.edu) +>>>>>>>> origin/HEAD:scripts/license_header_2025.txt +// All rights reserved. +// +// This file is part of gnss_utils +// gnss_utils is free software: you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. // LaserScanUtils - Copyright (C) 2020-2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), diff --git a/include/laser_scan_utils/corner_point.h b/include/laser_scan_utils/corner_point.h index 4a7599f..d4c2a0f 100644 --- a/include/laser_scan_utils/corner_point.h +++ b/include/laser_scan_utils/corner_point.h @@ -1,3 +1,27 @@ +<<<<<<<< HEAD:scripts/license_header_2024.txt +// Copyright (C) 2020,2021,2022,2023,2024 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. +// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu) +======== +// LaserScanUtils - Copyright (C) 2020-2025 +// Institut de Robòtica i Informà tica Industrial, CSIC-UPC. +// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), +// Andreu Corominas Murtra (acorominas@iri.upc.edu) +>>>>>>>> origin/HEAD:scripts/license_header_2025.txt +// All rights reserved. +// +// This file is part of gnss_utils +// gnss_utils is free software: you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. // LaserScanUtils - Copyright (C) 2020-2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), diff --git a/include/laser_scan_utils/grid_2d.h b/include/laser_scan_utils/grid_2d.h index 92479fe..7a1979b 100644 --- a/include/laser_scan_utils/grid_2d.h +++ b/include/laser_scan_utils/grid_2d.h @@ -1,3 +1,27 @@ +<<<<<<<< HEAD:scripts/license_header_2024.txt +// Copyright (C) 2020,2021,2022,2023,2024 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. +// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu) +======== +// LaserScanUtils - Copyright (C) 2020-2025 +// Institut de Robòtica i Informà tica Industrial, CSIC-UPC. +// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), +// Andreu Corominas Murtra (acorominas@iri.upc.edu) +>>>>>>>> origin/HEAD:scripts/license_header_2025.txt +// All rights reserved. +// +// This file is part of gnss_utils +// gnss_utils is free software: you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. // LaserScanUtils - Copyright (C) 2020-2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), diff --git a/include/laser_scan_utils/grid_cluster.h b/include/laser_scan_utils/grid_cluster.h index 44551f6..3857b36 100644 --- a/include/laser_scan_utils/grid_cluster.h +++ b/include/laser_scan_utils/grid_cluster.h @@ -1,3 +1,27 @@ +<<<<<<<< HEAD:scripts/license_header_2024.txt +// Copyright (C) 2020,2021,2022,2023,2024 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. +// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu) +======== +// LaserScanUtils - Copyright (C) 2020-2025 +// Institut de Robòtica i Informà tica Industrial, CSIC-UPC. +// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), +// Andreu Corominas Murtra (acorominas@iri.upc.edu) +>>>>>>>> origin/HEAD:scripts/license_header_2025.txt +// All rights reserved. +// +// This file is part of gnss_utils +// gnss_utils is free software: you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. // LaserScanUtils - Copyright (C) 2020-2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), diff --git a/include/laser_scan_utils/icp.h b/include/laser_scan_utils/icp.h index f50bf39..75bd686 100644 --- a/include/laser_scan_utils/icp.h +++ b/include/laser_scan_utils/icp.h @@ -1,3 +1,27 @@ +<<<<<<<< HEAD:scripts/license_header_2024.txt +// Copyright (C) 2020,2021,2022,2023,2024 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. +// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu) +======== +// LaserScanUtils - Copyright (C) 2020-2025 +// Institut de Robòtica i Informà tica Industrial, CSIC-UPC. +// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), +// Andreu Corominas Murtra (acorominas@iri.upc.edu) +>>>>>>>> origin/HEAD:scripts/license_header_2025.txt +// All rights reserved. +// +// This file is part of gnss_utils +// gnss_utils is free software: you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. // LaserScanUtils - Copyright (C) 2020-2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), diff --git a/include/laser_scan_utils/laser_scan.h b/include/laser_scan_utils/laser_scan.h index 397aec1..7964882 100644 --- a/include/laser_scan_utils/laser_scan.h +++ b/include/laser_scan_utils/laser_scan.h @@ -1,3 +1,27 @@ +<<<<<<<< HEAD:scripts/license_header_2024.txt +// Copyright (C) 2020,2021,2022,2023,2024 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. +// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu) +======== +// LaserScanUtils - Copyright (C) 2020-2025 +// Institut de Robòtica i Informà tica Industrial, CSIC-UPC. +// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), +// Andreu Corominas Murtra (acorominas@iri.upc.edu) +>>>>>>>> origin/HEAD:scripts/license_header_2025.txt +// All rights reserved. +// +// This file is part of gnss_utils +// gnss_utils is free software: you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. // LaserScanUtils - Copyright (C) 2020-2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), diff --git a/include/laser_scan_utils/laser_scan_utils.h b/include/laser_scan_utils/laser_scan_utils.h index a7270d8..277fc8c 100644 --- a/include/laser_scan_utils/laser_scan_utils.h +++ b/include/laser_scan_utils/laser_scan_utils.h @@ -1,3 +1,27 @@ +<<<<<<<< HEAD:scripts/license_header_2024.txt +// Copyright (C) 2020,2021,2022,2023,2024 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. +// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu) +======== +// LaserScanUtils - Copyright (C) 2020-2025 +// Institut de Robòtica i Informà tica Industrial, CSIC-UPC. +// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), +// Andreu Corominas Murtra (acorominas@iri.upc.edu) +>>>>>>>> origin/HEAD:scripts/license_header_2025.txt +// All rights reserved. +// +// This file is part of gnss_utils +// gnss_utils is free software: you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. // LaserScanUtils - Copyright (C) 2020-2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), diff --git a/include/laser_scan_utils/laser_scan_with_params.h b/include/laser_scan_utils/laser_scan_with_params.h index c0144f5..7d08f46 100644 --- a/include/laser_scan_utils/laser_scan_with_params.h +++ b/include/laser_scan_utils/laser_scan_with_params.h @@ -1,3 +1,27 @@ +<<<<<<<< HEAD:scripts/license_header_2024.txt +// Copyright (C) 2020,2021,2022,2023,2024 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. +// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu) +======== +// LaserScanUtils - Copyright (C) 2020-2025 +// Institut de Robòtica i Informà tica Industrial, CSIC-UPC. +// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), +// Andreu Corominas Murtra (acorominas@iri.upc.edu) +>>>>>>>> origin/HEAD:scripts/license_header_2025.txt +// All rights reserved. +// +// This file is part of gnss_utils +// gnss_utils is free software: you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. // LaserScanUtils - Copyright (C) 2020-2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), diff --git a/include/laser_scan_utils/line_finder.h b/include/laser_scan_utils/line_finder.h index 73d0077..0302f03 100644 --- a/include/laser_scan_utils/line_finder.h +++ b/include/laser_scan_utils/line_finder.h @@ -1,3 +1,27 @@ +<<<<<<<< HEAD:scripts/license_header_2024.txt +// Copyright (C) 2020,2021,2022,2023,2024 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. +// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu) +======== +// LaserScanUtils - Copyright (C) 2020-2025 +// Institut de Robòtica i Informà tica Industrial, CSIC-UPC. +// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), +// Andreu Corominas Murtra (acorominas@iri.upc.edu) +>>>>>>>> origin/HEAD:scripts/license_header_2025.txt +// All rights reserved. +// +// This file is part of gnss_utils +// gnss_utils is free software: you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. // LaserScanUtils - Copyright (C) 2020-2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), diff --git a/include/laser_scan_utils/line_finder_hough.h b/include/laser_scan_utils/line_finder_hough.h index ae4fbc7..5ef52f9 100644 --- a/include/laser_scan_utils/line_finder_hough.h +++ b/include/laser_scan_utils/line_finder_hough.h @@ -1,3 +1,27 @@ +<<<<<<<< HEAD:scripts/license_header_2024.txt +// Copyright (C) 2020,2021,2022,2023,2024 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. +// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu) +======== +// LaserScanUtils - Copyright (C) 2020-2025 +// Institut de Robòtica i Informà tica Industrial, CSIC-UPC. +// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), +// Andreu Corominas Murtra (acorominas@iri.upc.edu) +>>>>>>>> origin/HEAD:scripts/license_header_2025.txt +// All rights reserved. +// +// This file is part of gnss_utils +// gnss_utils is free software: you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. // LaserScanUtils - Copyright (C) 2020-2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), diff --git a/include/laser_scan_utils/line_finder_iterative.h b/include/laser_scan_utils/line_finder_iterative.h index d52b423..5a928c9 100644 --- a/include/laser_scan_utils/line_finder_iterative.h +++ b/include/laser_scan_utils/line_finder_iterative.h @@ -1,3 +1,27 @@ +<<<<<<<< HEAD:scripts/license_header_2024.txt +// Copyright (C) 2020,2021,2022,2023,2024 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. +// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu) +======== +// LaserScanUtils - Copyright (C) 2020-2025 +// Institut de Robòtica i Informà tica Industrial, CSIC-UPC. +// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), +// Andreu Corominas Murtra (acorominas@iri.upc.edu) +>>>>>>>> origin/HEAD:scripts/license_header_2025.txt +// All rights reserved. +// +// This file is part of gnss_utils +// gnss_utils is free software: you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. // LaserScanUtils - Copyright (C) 2020-2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), diff --git a/include/laser_scan_utils/line_finder_jump_fit.h b/include/laser_scan_utils/line_finder_jump_fit.h index c60c28a..c925016 100644 --- a/include/laser_scan_utils/line_finder_jump_fit.h +++ b/include/laser_scan_utils/line_finder_jump_fit.h @@ -1,3 +1,27 @@ +<<<<<<<< HEAD:scripts/license_header_2024.txt +// Copyright (C) 2020,2021,2022,2023,2024 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. +// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu) +======== +// LaserScanUtils - Copyright (C) 2020-2025 +// Institut de Robòtica i Informà tica Industrial, CSIC-UPC. +// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), +// Andreu Corominas Murtra (acorominas@iri.upc.edu) +>>>>>>>> origin/HEAD:scripts/license_header_2025.txt +// All rights reserved. +// +// This file is part of gnss_utils +// gnss_utils is free software: you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. // LaserScanUtils - Copyright (C) 2020-2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), diff --git a/include/laser_scan_utils/line_segment.h b/include/laser_scan_utils/line_segment.h index 7951f67..73912f7 100644 --- a/include/laser_scan_utils/line_segment.h +++ b/include/laser_scan_utils/line_segment.h @@ -1,3 +1,27 @@ +<<<<<<<< HEAD:scripts/license_header_2024.txt +// Copyright (C) 2020,2021,2022,2023,2024 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. +// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu) +======== +// LaserScanUtils - Copyright (C) 2020-2025 +// Institut de Robòtica i Informà tica Industrial, CSIC-UPC. +// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), +// Andreu Corominas Murtra (acorominas@iri.upc.edu) +>>>>>>>> origin/HEAD:scripts/license_header_2025.txt +// All rights reserved. +// +// This file is part of gnss_utils +// gnss_utils is free software: you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. // LaserScanUtils - Copyright (C) 2020-2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), diff --git a/include/laser_scan_utils/loop_closure_base.h b/include/laser_scan_utils/loop_closure_base.h index 644d55b..28597fe 100644 --- a/include/laser_scan_utils/loop_closure_base.h +++ b/include/laser_scan_utils/loop_closure_base.h @@ -1,3 +1,27 @@ +<<<<<<<< HEAD:scripts/license_header_2024.txt +// Copyright (C) 2020,2021,2022,2023,2024 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. +// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu) +======== +// LaserScanUtils - Copyright (C) 2020-2025 +// Institut de Robòtica i Informà tica Industrial, CSIC-UPC. +// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), +// Andreu Corominas Murtra (acorominas@iri.upc.edu) +>>>>>>>> origin/HEAD:scripts/license_header_2025.txt +// All rights reserved. +// +// This file is part of gnss_utils +// gnss_utils is free software: you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. // LaserScanUtils - Copyright (C) 2020-2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), diff --git a/include/laser_scan_utils/loop_closure_falko.h b/include/laser_scan_utils/loop_closure_falko.h index 942ce53..f6e0f80 100644 --- a/include/laser_scan_utils/loop_closure_falko.h +++ b/include/laser_scan_utils/loop_closure_falko.h @@ -1,3 +1,27 @@ +<<<<<<<< HEAD:scripts/license_header_2024.txt +// Copyright (C) 2020,2021,2022,2023,2024 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. +// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu) +======== +// LaserScanUtils - Copyright (C) 2020-2025 +// Institut de Robòtica i Informà tica Industrial, CSIC-UPC. +// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), +// Andreu Corominas Murtra (acorominas@iri.upc.edu) +>>>>>>>> origin/HEAD:scripts/license_header_2025.txt +// All rights reserved. +// +// This file is part of gnss_utils +// gnss_utils is free software: you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. // LaserScanUtils - Copyright (C) 2020-2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), diff --git a/include/laser_scan_utils/match_loop_closure_scene.h b/include/laser_scan_utils/match_loop_closure_scene.h index 8e7607c..b7b060b 100644 --- a/include/laser_scan_utils/match_loop_closure_scene.h +++ b/include/laser_scan_utils/match_loop_closure_scene.h @@ -1,3 +1,27 @@ +<<<<<<<< HEAD:scripts/license_header_2024.txt +// Copyright (C) 2020,2021,2022,2023,2024 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. +// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu) +======== +// LaserScanUtils - Copyright (C) 2020-2025 +// Institut de Robòtica i Informà tica Industrial, CSIC-UPC. +// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), +// Andreu Corominas Murtra (acorominas@iri.upc.edu) +>>>>>>>> origin/HEAD:scripts/license_header_2025.txt +// All rights reserved. +// +// This file is part of gnss_utils +// gnss_utils is free software: you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. // LaserScanUtils - Copyright (C) 2020-2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), diff --git a/include/laser_scan_utils/point_set.h b/include/laser_scan_utils/point_set.h index 1c3d8c0..82c133e 100644 --- a/include/laser_scan_utils/point_set.h +++ b/include/laser_scan_utils/point_set.h @@ -1,3 +1,27 @@ +<<<<<<<< HEAD:scripts/license_header_2024.txt +// Copyright (C) 2020,2021,2022,2023,2024 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. +// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu) +======== +// LaserScanUtils - Copyright (C) 2020-2025 +// Institut de Robòtica i Informà tica Industrial, CSIC-UPC. +// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), +// Andreu Corominas Murtra (acorominas@iri.upc.edu) +>>>>>>>> origin/HEAD:scripts/license_header_2025.txt +// All rights reserved. +// +// This file is part of gnss_utils +// gnss_utils is free software: you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. // LaserScanUtils - Copyright (C) 2020-2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), diff --git a/include/laser_scan_utils/polyline.h b/include/laser_scan_utils/polyline.h index 1770249..e1db522 100644 --- a/include/laser_scan_utils/polyline.h +++ b/include/laser_scan_utils/polyline.h @@ -1,3 +1,27 @@ +<<<<<<<< HEAD:scripts/license_header_2024.txt +// Copyright (C) 2020,2021,2022,2023,2024 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. +// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu) +======== +// LaserScanUtils - Copyright (C) 2020-2025 +// Institut de Robòtica i Informà tica Industrial, CSIC-UPC. +// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), +// Andreu Corominas Murtra (acorominas@iri.upc.edu) +>>>>>>>> origin/HEAD:scripts/license_header_2025.txt +// All rights reserved. +// +// This file is part of gnss_utils +// gnss_utils is free software: you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. // LaserScanUtils - Copyright (C) 2020-2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), diff --git a/include/laser_scan_utils/scan_segment.h b/include/laser_scan_utils/scan_segment.h index f4c0ef8..9a73e52 100644 --- a/include/laser_scan_utils/scan_segment.h +++ b/include/laser_scan_utils/scan_segment.h @@ -1,3 +1,27 @@ +<<<<<<<< HEAD:scripts/license_header_2024.txt +// Copyright (C) 2020,2021,2022,2023,2024 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. +// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu) +======== +// LaserScanUtils - Copyright (C) 2020-2025 +// Institut de Robòtica i Informà tica Industrial, CSIC-UPC. +// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), +// Andreu Corominas Murtra (acorominas@iri.upc.edu) +>>>>>>>> origin/HEAD:scripts/license_header_2025.txt +// All rights reserved. +// +// This file is part of gnss_utils +// gnss_utils is free software: you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. // LaserScanUtils - Copyright (C) 2020-2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), diff --git a/include/laser_scan_utils/scene_base.h b/include/laser_scan_utils/scene_base.h index 21ae351..b0dc80f 100644 --- a/include/laser_scan_utils/scene_base.h +++ b/include/laser_scan_utils/scene_base.h @@ -1,3 +1,27 @@ +<<<<<<<< HEAD:scripts/license_header_2024.txt +// Copyright (C) 2020,2021,2022,2023,2024 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. +// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu) +======== +// LaserScanUtils - Copyright (C) 2020-2025 +// Institut de Robòtica i Informà tica Industrial, CSIC-UPC. +// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), +// Andreu Corominas Murtra (acorominas@iri.upc.edu) +>>>>>>>> origin/HEAD:scripts/license_header_2025.txt +// All rights reserved. +// +// This file is part of gnss_utils +// gnss_utils is free software: you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. // LaserScanUtils - Copyright (C) 2020-2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), diff --git a/include/laser_scan_utils/scene_falko.h b/include/laser_scan_utils/scene_falko.h index 2fcb5cf..7e7ad4e 100644 --- a/include/laser_scan_utils/scene_falko.h +++ b/include/laser_scan_utils/scene_falko.h @@ -1,3 +1,27 @@ +<<<<<<<< HEAD:scripts/license_header_2024.txt +// Copyright (C) 2020,2021,2022,2023,2024 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. +// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu) +======== +// LaserScanUtils - Copyright (C) 2020-2025 +// Institut de Robòtica i Informà tica Industrial, CSIC-UPC. +// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), +// Andreu Corominas Murtra (acorominas@iri.upc.edu) +>>>>>>>> origin/HEAD:scripts/license_header_2025.txt +// All rights reserved. +// +// This file is part of gnss_utils +// gnss_utils is free software: you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. // LaserScanUtils - Copyright (C) 2020-2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), diff --git a/include/laser_scan_utils/scene_falko_base.h b/include/laser_scan_utils/scene_falko_base.h index 8b78e73..b5a2f0e 100644 --- a/include/laser_scan_utils/scene_falko_base.h +++ b/include/laser_scan_utils/scene_falko_base.h @@ -1,3 +1,27 @@ +<<<<<<<< HEAD:scripts/license_header_2024.txt +// Copyright (C) 2020,2021,2022,2023,2024 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. +// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu) +======== +// LaserScanUtils - Copyright (C) 2020-2025 +// Institut de Robòtica i Informà tica Industrial, CSIC-UPC. +// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), +// Andreu Corominas Murtra (acorominas@iri.upc.edu) +>>>>>>>> origin/HEAD:scripts/license_header_2025.txt +// All rights reserved. +// +// This file is part of gnss_utils +// gnss_utils is free software: you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. // LaserScanUtils - Copyright (C) 2020-2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), diff --git a/src/corner_falko_2d.cpp b/src/corner_falko_2d.cpp index b501a99..36e47f3 100644 --- a/src/corner_falko_2d.cpp +++ b/src/corner_falko_2d.cpp @@ -1,3 +1,27 @@ +<<<<<<<< HEAD:scripts/license_header_2024.txt +// Copyright (C) 2020,2021,2022,2023,2024 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. +// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu) +======== +// LaserScanUtils - Copyright (C) 2020-2025 +// Institut de Robòtica i Informà tica Industrial, CSIC-UPC. +// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), +// Andreu Corominas Murtra (acorominas@iri.upc.edu) +>>>>>>>> origin/HEAD:scripts/license_header_2025.txt +// All rights reserved. +// +// This file is part of gnss_utils +// gnss_utils is free software: you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. // LaserScanUtils - Copyright (C) 2020-2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), diff --git a/src/corner_finder.cpp b/src/corner_finder.cpp index 68aaf99..164914a 100644 --- a/src/corner_finder.cpp +++ b/src/corner_finder.cpp @@ -1,3 +1,27 @@ +<<<<<<<< HEAD:scripts/license_header_2024.txt +// Copyright (C) 2020,2021,2022,2023,2024 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. +// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu) +======== +// LaserScanUtils - Copyright (C) 2020-2025 +// Institut de Robòtica i Informà tica Industrial, CSIC-UPC. +// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), +// Andreu Corominas Murtra (acorominas@iri.upc.edu) +>>>>>>>> origin/HEAD:scripts/license_header_2025.txt +// All rights reserved. +// +// This file is part of gnss_utils +// gnss_utils is free software: you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. // LaserScanUtils - Copyright (C) 2020-2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), diff --git a/src/corner_finder_inscribed_angle.cpp b/src/corner_finder_inscribed_angle.cpp index 2fabede..b4311be 100644 --- a/src/corner_finder_inscribed_angle.cpp +++ b/src/corner_finder_inscribed_angle.cpp @@ -1,3 +1,27 @@ +<<<<<<<< HEAD:scripts/license_header_2024.txt +// Copyright (C) 2020,2021,2022,2023,2024 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. +// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu) +======== +// LaserScanUtils - Copyright (C) 2020-2025 +// Institut de Robòtica i Informà tica Industrial, CSIC-UPC. +// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), +// Andreu Corominas Murtra (acorominas@iri.upc.edu) +>>>>>>>> origin/HEAD:scripts/license_header_2025.txt +// All rights reserved. +// +// This file is part of gnss_utils +// gnss_utils is free software: you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. // LaserScanUtils - Copyright (C) 2020-2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), diff --git a/src/corner_point.cpp b/src/corner_point.cpp index 6b82c68..d969551 100644 --- a/src/corner_point.cpp +++ b/src/corner_point.cpp @@ -1,3 +1,27 @@ +<<<<<<<< HEAD:scripts/license_header_2024.txt +// Copyright (C) 2020,2021,2022,2023,2024 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. +// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu) +======== +// LaserScanUtils - Copyright (C) 2020-2025 +// Institut de Robòtica i Informà tica Industrial, CSIC-UPC. +// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), +// Andreu Corominas Murtra (acorominas@iri.upc.edu) +>>>>>>>> origin/HEAD:scripts/license_header_2025.txt +// All rights reserved. +// +// This file is part of gnss_utils +// gnss_utils is free software: you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. // LaserScanUtils - Copyright (C) 2020-2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), diff --git a/src/grid_2d.cpp b/src/grid_2d.cpp index 49282c0..a832084 100644 --- a/src/grid_2d.cpp +++ b/src/grid_2d.cpp @@ -1,3 +1,27 @@ +<<<<<<<< HEAD:scripts/license_header_2024.txt +// Copyright (C) 2020,2021,2022,2023,2024 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. +// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu) +======== +// LaserScanUtils - Copyright (C) 2020-2025 +// Institut de Robòtica i Informà tica Industrial, CSIC-UPC. +// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), +// Andreu Corominas Murtra (acorominas@iri.upc.edu) +>>>>>>>> origin/HEAD:scripts/license_header_2025.txt +// All rights reserved. +// +// This file is part of gnss_utils +// gnss_utils is free software: you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. // LaserScanUtils - Copyright (C) 2020-2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), diff --git a/src/grid_cluster.cpp b/src/grid_cluster.cpp index 288a5d6..b21e43d 100644 --- a/src/grid_cluster.cpp +++ b/src/grid_cluster.cpp @@ -1,3 +1,27 @@ +<<<<<<<< HEAD:scripts/license_header_2024.txt +// Copyright (C) 2020,2021,2022,2023,2024 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. +// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu) +======== +// LaserScanUtils - Copyright (C) 2020-2025 +// Institut de Robòtica i Informà tica Industrial, CSIC-UPC. +// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), +// Andreu Corominas Murtra (acorominas@iri.upc.edu) +>>>>>>>> origin/HEAD:scripts/license_header_2025.txt +// All rights reserved. +// +// This file is part of gnss_utils +// gnss_utils is free software: you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. // LaserScanUtils - Copyright (C) 2020-2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), diff --git a/src/icp.cpp b/src/icp.cpp index 14f5c01..2953237 100644 --- a/src/icp.cpp +++ b/src/icp.cpp @@ -1,3 +1,27 @@ +<<<<<<<< HEAD:scripts/license_header_2024.txt +// Copyright (C) 2020,2021,2022,2023,2024 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. +// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu) +======== +// LaserScanUtils - Copyright (C) 2020-2025 +// Institut de Robòtica i Informà tica Industrial, CSIC-UPC. +// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), +// Andreu Corominas Murtra (acorominas@iri.upc.edu) +>>>>>>>> origin/HEAD:scripts/license_header_2025.txt +// All rights reserved. +// +// This file is part of gnss_utils +// gnss_utils is free software: you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. // LaserScanUtils - Copyright (C) 2020-2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), diff --git a/src/laser_scan.cpp b/src/laser_scan.cpp index 317452f..c137787 100644 --- a/src/laser_scan.cpp +++ b/src/laser_scan.cpp @@ -1,3 +1,27 @@ +<<<<<<<< HEAD:scripts/license_header_2024.txt +// Copyright (C) 2020,2021,2022,2023,2024 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. +// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu) +======== +// LaserScanUtils - Copyright (C) 2020-2025 +// Institut de Robòtica i Informà tica Industrial, CSIC-UPC. +// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), +// Andreu Corominas Murtra (acorominas@iri.upc.edu) +>>>>>>>> origin/HEAD:scripts/license_header_2025.txt +// All rights reserved. +// +// This file is part of gnss_utils +// gnss_utils is free software: you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. // LaserScanUtils - Copyright (C) 2020-2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), diff --git a/src/laser_scan_with_params.cpp b/src/laser_scan_with_params.cpp index 5f8c026..bc279da 100644 --- a/src/laser_scan_with_params.cpp +++ b/src/laser_scan_with_params.cpp @@ -1,3 +1,27 @@ +<<<<<<<< HEAD:scripts/license_header_2024.txt +// Copyright (C) 2020,2021,2022,2023,2024 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. +// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu) +======== +// LaserScanUtils - Copyright (C) 2020-2025 +// Institut de Robòtica i Informà tica Industrial, CSIC-UPC. +// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), +// Andreu Corominas Murtra (acorominas@iri.upc.edu) +>>>>>>>> origin/HEAD:scripts/license_header_2025.txt +// All rights reserved. +// +// This file is part of gnss_utils +// gnss_utils is free software: you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. // LaserScanUtils - Copyright (C) 2020-2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), diff --git a/src/line_finder.cpp b/src/line_finder.cpp index 8df6687..f2b13c8 100644 --- a/src/line_finder.cpp +++ b/src/line_finder.cpp @@ -1,3 +1,27 @@ +<<<<<<<< HEAD:scripts/license_header_2024.txt +// Copyright (C) 2020,2021,2022,2023,2024 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. +// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu) +======== +// LaserScanUtils - Copyright (C) 2020-2025 +// Institut de Robòtica i Informà tica Industrial, CSIC-UPC. +// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), +// Andreu Corominas Murtra (acorominas@iri.upc.edu) +>>>>>>>> origin/HEAD:scripts/license_header_2025.txt +// All rights reserved. +// +// This file is part of gnss_utils +// gnss_utils is free software: you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. // LaserScanUtils - Copyright (C) 2020-2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), diff --git a/src/line_finder_hough.cpp b/src/line_finder_hough.cpp index 143c96a..42e5cde 100644 --- a/src/line_finder_hough.cpp +++ b/src/line_finder_hough.cpp @@ -1,3 +1,27 @@ +<<<<<<<< HEAD:scripts/license_header_2024.txt +// Copyright (C) 2020,2021,2022,2023,2024 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. +// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu) +======== +// LaserScanUtils - Copyright (C) 2020-2025 +// Institut de Robòtica i Informà tica Industrial, CSIC-UPC. +// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), +// Andreu Corominas Murtra (acorominas@iri.upc.edu) +>>>>>>>> origin/HEAD:scripts/license_header_2025.txt +// All rights reserved. +// +// This file is part of gnss_utils +// gnss_utils is free software: you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. // LaserScanUtils - Copyright (C) 2020-2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), diff --git a/src/line_finder_iterative.cpp b/src/line_finder_iterative.cpp index b59a3ae..d7a1a74 100644 --- a/src/line_finder_iterative.cpp +++ b/src/line_finder_iterative.cpp @@ -1,3 +1,27 @@ +<<<<<<<< HEAD:scripts/license_header_2024.txt +// Copyright (C) 2020,2021,2022,2023,2024 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. +// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu) +======== +// LaserScanUtils - Copyright (C) 2020-2025 +// Institut de Robòtica i Informà tica Industrial, CSIC-UPC. +// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), +// Andreu Corominas Murtra (acorominas@iri.upc.edu) +>>>>>>>> origin/HEAD:scripts/license_header_2025.txt +// All rights reserved. +// +// This file is part of gnss_utils +// gnss_utils is free software: you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. // LaserScanUtils - Copyright (C) 2020-2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), diff --git a/src/line_finder_jump_fit.cpp b/src/line_finder_jump_fit.cpp index 9e284db..71c2797 100644 --- a/src/line_finder_jump_fit.cpp +++ b/src/line_finder_jump_fit.cpp @@ -1,3 +1,27 @@ +<<<<<<<< HEAD:scripts/license_header_2024.txt +// Copyright (C) 2020,2021,2022,2023,2024 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. +// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu) +======== +// LaserScanUtils - Copyright (C) 2020-2025 +// Institut de Robòtica i Informà tica Industrial, CSIC-UPC. +// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), +// Andreu Corominas Murtra (acorominas@iri.upc.edu) +>>>>>>>> origin/HEAD:scripts/license_header_2025.txt +// All rights reserved. +// +// This file is part of gnss_utils +// gnss_utils is free software: you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. // LaserScanUtils - Copyright (C) 2020-2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), diff --git a/src/line_segment.cpp b/src/line_segment.cpp index 90971f6..03860fb 100644 --- a/src/line_segment.cpp +++ b/src/line_segment.cpp @@ -1,3 +1,27 @@ +<<<<<<<< HEAD:scripts/license_header_2024.txt +// Copyright (C) 2020,2021,2022,2023,2024 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. +// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu) +======== +// LaserScanUtils - Copyright (C) 2020-2025 +// Institut de Robòtica i Informà tica Industrial, CSIC-UPC. +// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), +// Andreu Corominas Murtra (acorominas@iri.upc.edu) +>>>>>>>> origin/HEAD:scripts/license_header_2025.txt +// All rights reserved. +// +// This file is part of gnss_utils +// gnss_utils is free software: you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. // LaserScanUtils - Copyright (C) 2020-2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), diff --git a/src/loop_closure_base.cpp b/src/loop_closure_base.cpp index 26632d3..ee7a31d 100644 --- a/src/loop_closure_base.cpp +++ b/src/loop_closure_base.cpp @@ -1,3 +1,27 @@ +<<<<<<<< HEAD:scripts/license_header_2024.txt +// Copyright (C) 2020,2021,2022,2023,2024 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. +// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu) +======== +// LaserScanUtils - Copyright (C) 2020-2025 +// Institut de Robòtica i Informà tica Industrial, CSIC-UPC. +// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), +// Andreu Corominas Murtra (acorominas@iri.upc.edu) +>>>>>>>> origin/HEAD:scripts/license_header_2025.txt +// All rights reserved. +// +// This file is part of gnss_utils +// gnss_utils is free software: you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. // LaserScanUtils - Copyright (C) 2020-2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), diff --git a/src/point_set.cpp b/src/point_set.cpp index b281710..acb1774 100644 --- a/src/point_set.cpp +++ b/src/point_set.cpp @@ -1,3 +1,27 @@ +<<<<<<<< HEAD:scripts/license_header_2024.txt +// Copyright (C) 2020,2021,2022,2023,2024 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. +// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu) +======== +// LaserScanUtils - Copyright (C) 2020-2025 +// Institut de Robòtica i Informà tica Industrial, CSIC-UPC. +// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), +// Andreu Corominas Murtra (acorominas@iri.upc.edu) +>>>>>>>> origin/HEAD:scripts/license_header_2025.txt +// All rights reserved. +// +// This file is part of gnss_utils +// gnss_utils is free software: you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. // LaserScanUtils - Copyright (C) 2020-2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), diff --git a/src/polyline.cpp b/src/polyline.cpp index 59fee5e..d7a0dd2 100644 --- a/src/polyline.cpp +++ b/src/polyline.cpp @@ -1,3 +1,27 @@ +<<<<<<<< HEAD:scripts/license_header_2024.txt +// Copyright (C) 2020,2021,2022,2023,2024 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. +// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu) +======== +// LaserScanUtils - Copyright (C) 2020-2025 +// Institut de Robòtica i Informà tica Industrial, CSIC-UPC. +// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), +// Andreu Corominas Murtra (acorominas@iri.upc.edu) +>>>>>>>> origin/HEAD:scripts/license_header_2025.txt +// All rights reserved. +// +// This file is part of gnss_utils +// gnss_utils is free software: you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. // LaserScanUtils - Copyright (C) 2020-2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), diff --git a/src/scan_segment.cpp b/src/scan_segment.cpp index e19bc7e..37b373e 100644 --- a/src/scan_segment.cpp +++ b/src/scan_segment.cpp @@ -1,3 +1,27 @@ +<<<<<<<< HEAD:scripts/license_header_2024.txt +// Copyright (C) 2020,2021,2022,2023,2024 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. +// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu) +======== +// LaserScanUtils - Copyright (C) 2020-2025 +// Institut de Robòtica i Informà tica Industrial, CSIC-UPC. +// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), +// Andreu Corominas Murtra (acorominas@iri.upc.edu) +>>>>>>>> origin/HEAD:scripts/license_header_2025.txt +// All rights reserved. +// +// This file is part of gnss_utils +// gnss_utils is free software: you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. // LaserScanUtils - Copyright (C) 2020-2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), diff --git a/test/data/scan_data.h b/test/data/scan_data.h index 9b5805d..802a8d2 100644 --- a/test/data/scan_data.h +++ b/test/data/scan_data.h @@ -1,3 +1,27 @@ +<<<<<<<< HEAD:scripts/license_header_2024.txt +// Copyright (C) 2020,2021,2022,2023,2024 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. +// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu) +======== +// LaserScanUtils - Copyright (C) 2020-2025 +// Institut de Robòtica i Informà tica Industrial, CSIC-UPC. +// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), +// Andreu Corominas Murtra (acorominas@iri.upc.edu) +>>>>>>>> origin/HEAD:scripts/license_header_2025.txt +// All rights reserved. +// +// This file is part of gnss_utils +// gnss_utils is free software: you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. // LaserScanUtils - Copyright (C) 2020-2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), diff --git a/test/gtest/utils_gtest.h b/test/gtest/utils_gtest.h index 0c39d4d..b37aa10 100644 --- a/test/gtest/utils_gtest.h +++ b/test/gtest/utils_gtest.h @@ -1,3 +1,27 @@ +<<<<<<<< HEAD:scripts/license_header_2024.txt +// Copyright (C) 2020,2021,2022,2023,2024 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. +// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu) +======== +// LaserScanUtils - Copyright (C) 2020-2025 +// Institut de Robòtica i Informà tica Industrial, CSIC-UPC. +// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), +// Andreu Corominas Murtra (acorominas@iri.upc.edu) +>>>>>>>> origin/HEAD:scripts/license_header_2025.txt +// All rights reserved. +// +// This file is part of gnss_utils +// gnss_utils is free software: you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. // LaserScanUtils - Copyright (C) 2020-2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), diff --git a/test/gtest_example.cpp b/test/gtest_example.cpp index 5c5c860..6458e8d 100644 --- a/test/gtest_example.cpp +++ b/test/gtest_example.cpp @@ -1,3 +1,27 @@ +<<<<<<<< HEAD:scripts/license_header_2024.txt +// Copyright (C) 2020,2021,2022,2023,2024 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. +// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu) +======== +// LaserScanUtils - Copyright (C) 2020-2025 +// Institut de Robòtica i Informà tica Industrial, CSIC-UPC. +// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), +// Andreu Corominas Murtra (acorominas@iri.upc.edu) +>>>>>>>> origin/HEAD:scripts/license_header_2025.txt +// All rights reserved. +// +// This file is part of gnss_utils +// gnss_utils is free software: you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. // LaserScanUtils - Copyright (C) 2020-2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), diff --git a/test/gtest_icp.cpp b/test/gtest_icp.cpp index d4b9e66..8a0139c 100644 --- a/test/gtest_icp.cpp +++ b/test/gtest_icp.cpp @@ -1,3 +1,27 @@ +<<<<<<<< HEAD:scripts/license_header_2024.txt +// Copyright (C) 2020,2021,2022,2023,2024 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. +// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu) +======== +// LaserScanUtils - Copyright (C) 2020-2025 +// Institut de Robòtica i Informà tica Industrial, CSIC-UPC. +// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), +// Andreu Corominas Murtra (acorominas@iri.upc.edu) +>>>>>>>> origin/HEAD:scripts/license_header_2025.txt +// All rights reserved. +// +// This file is part of gnss_utils +// gnss_utils is free software: you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. // LaserScanUtils - Copyright (C) 2020-2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), diff --git a/test/gtest_loop_closure_falko.cpp b/test/gtest_loop_closure_falko.cpp index 31d7289..add9221 100644 --- a/test/gtest_loop_closure_falko.cpp +++ b/test/gtest_loop_closure_falko.cpp @@ -1,3 +1,27 @@ +<<<<<<<< HEAD:scripts/license_header_2024.txt +// Copyright (C) 2020,2021,2022,2023,2024 Institut de Robòtica i Informà tica Industrial, CSIC-UPC. +// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu) +======== +// LaserScanUtils - Copyright (C) 2020-2025 +// Institut de Robòtica i Informà tica Industrial, CSIC-UPC. +// Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), +// Andreu Corominas Murtra (acorominas@iri.upc.edu) +>>>>>>>> origin/HEAD:scripts/license_header_2025.txt +// All rights reserved. +// +// This file is part of gnss_utils +// gnss_utils is free software: you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. // LaserScanUtils - Copyright (C) 2020-2025 // Institut de Robòtica i Informà tica Industrial, CSIC-UPC. // Authors: Joan Vallvé Navarro (jvallve@iri.upc.edu), -- GitLab