From 2243c90e1b475212240d6bedb9ea0a6c1dcdd0f4 Mon Sep 17 00:00:00 2001 From: joanvallve <jvallve@iri.upc.edu> Date: Thu, 6 Feb 2025 17:04:09 +0100 Subject: [PATCH] fixed license headers --- 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 ------------------- scripts/license_header_2025.txt | 5 ---- 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 ------------------- 49 files changed, 1157 deletions(-) diff --git a/examples/polyline_demo.cpp b/examples/polyline_demo.cpp index 175ca82..7b7e095 100644 --- a/examples/polyline_demo.cpp +++ b/examples/polyline_demo.cpp @@ -1,27 +1,3 @@ -<<<<<<<< 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 1951b67..5137712 100644 --- a/include/laser_scan_utils/corner_falko_2d.h +++ b/include/laser_scan_utils/corner_falko_2d.h @@ -1,27 +1,3 @@ -<<<<<<<< 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 8dfc1ca..4378459 100644 --- a/include/laser_scan_utils/corner_finder.h +++ b/include/laser_scan_utils/corner_finder.h @@ -1,27 +1,3 @@ -<<<<<<<< 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 a239259..db4f778 100644 --- a/include/laser_scan_utils/corner_finder_inscribed_angle.h +++ b/include/laser_scan_utils/corner_finder_inscribed_angle.h @@ -1,27 +1,3 @@ -<<<<<<<< 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 d4c2a0f..4a7599f 100644 --- a/include/laser_scan_utils/corner_point.h +++ b/include/laser_scan_utils/corner_point.h @@ -1,27 +1,3 @@ -<<<<<<<< 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 7a1979b..92479fe 100644 --- a/include/laser_scan_utils/grid_2d.h +++ b/include/laser_scan_utils/grid_2d.h @@ -1,27 +1,3 @@ -<<<<<<<< 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 3857b36..44551f6 100644 --- a/include/laser_scan_utils/grid_cluster.h +++ b/include/laser_scan_utils/grid_cluster.h @@ -1,27 +1,3 @@ -<<<<<<<< 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 75bd686..f50bf39 100644 --- a/include/laser_scan_utils/icp.h +++ b/include/laser_scan_utils/icp.h @@ -1,27 +1,3 @@ -<<<<<<<< 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 7964882..397aec1 100644 --- a/include/laser_scan_utils/laser_scan.h +++ b/include/laser_scan_utils/laser_scan.h @@ -1,27 +1,3 @@ -<<<<<<<< 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 277fc8c..a7270d8 100644 --- a/include/laser_scan_utils/laser_scan_utils.h +++ b/include/laser_scan_utils/laser_scan_utils.h @@ -1,27 +1,3 @@ -<<<<<<<< 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 7d08f46..c0144f5 100644 --- a/include/laser_scan_utils/laser_scan_with_params.h +++ b/include/laser_scan_utils/laser_scan_with_params.h @@ -1,27 +1,3 @@ -<<<<<<<< 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 0302f03..73d0077 100644 --- a/include/laser_scan_utils/line_finder.h +++ b/include/laser_scan_utils/line_finder.h @@ -1,27 +1,3 @@ -<<<<<<<< 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 5ef52f9..ae4fbc7 100644 --- a/include/laser_scan_utils/line_finder_hough.h +++ b/include/laser_scan_utils/line_finder_hough.h @@ -1,27 +1,3 @@ -<<<<<<<< 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 5a928c9..d52b423 100644 --- a/include/laser_scan_utils/line_finder_iterative.h +++ b/include/laser_scan_utils/line_finder_iterative.h @@ -1,27 +1,3 @@ -<<<<<<<< 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 c925016..c60c28a 100644 --- a/include/laser_scan_utils/line_finder_jump_fit.h +++ b/include/laser_scan_utils/line_finder_jump_fit.h @@ -1,27 +1,3 @@ -<<<<<<<< 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 73912f7..7951f67 100644 --- a/include/laser_scan_utils/line_segment.h +++ b/include/laser_scan_utils/line_segment.h @@ -1,27 +1,3 @@ -<<<<<<<< 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 28597fe..644d55b 100644 --- a/include/laser_scan_utils/loop_closure_base.h +++ b/include/laser_scan_utils/loop_closure_base.h @@ -1,27 +1,3 @@ -<<<<<<<< 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 f6e0f80..942ce53 100644 --- a/include/laser_scan_utils/loop_closure_falko.h +++ b/include/laser_scan_utils/loop_closure_falko.h @@ -1,27 +1,3 @@ -<<<<<<<< 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 b7b060b..8e7607c 100644 --- a/include/laser_scan_utils/match_loop_closure_scene.h +++ b/include/laser_scan_utils/match_loop_closure_scene.h @@ -1,27 +1,3 @@ -<<<<<<<< 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 82c133e..1c3d8c0 100644 --- a/include/laser_scan_utils/point_set.h +++ b/include/laser_scan_utils/point_set.h @@ -1,27 +1,3 @@ -<<<<<<<< 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 e1db522..1770249 100644 --- a/include/laser_scan_utils/polyline.h +++ b/include/laser_scan_utils/polyline.h @@ -1,27 +1,3 @@ -<<<<<<<< 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 9a73e52..f4c0ef8 100644 --- a/include/laser_scan_utils/scan_segment.h +++ b/include/laser_scan_utils/scan_segment.h @@ -1,27 +1,3 @@ -<<<<<<<< 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 b0dc80f..21ae351 100644 --- a/include/laser_scan_utils/scene_base.h +++ b/include/laser_scan_utils/scene_base.h @@ -1,27 +1,3 @@ -<<<<<<<< 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 7e7ad4e..2fcb5cf 100644 --- a/include/laser_scan_utils/scene_falko.h +++ b/include/laser_scan_utils/scene_falko.h @@ -1,27 +1,3 @@ -<<<<<<<< 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 b5a2f0e..8b78e73 100644 --- a/include/laser_scan_utils/scene_falko_base.h +++ b/include/laser_scan_utils/scene_falko_base.h @@ -1,27 +1,3 @@ -<<<<<<<< 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/scripts/license_header_2025.txt b/scripts/license_header_2025.txt index a8d222b..8ee8def 100644 --- a/scripts/license_header_2025.txt +++ b/scripts/license_header_2025.txt @@ -1,12 +1,7 @@ -<<<<<<<< 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 diff --git a/src/corner_falko_2d.cpp b/src/corner_falko_2d.cpp index 36e47f3..b501a99 100644 --- a/src/corner_falko_2d.cpp +++ b/src/corner_falko_2d.cpp @@ -1,27 +1,3 @@ -<<<<<<<< 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 164914a..68aaf99 100644 --- a/src/corner_finder.cpp +++ b/src/corner_finder.cpp @@ -1,27 +1,3 @@ -<<<<<<<< 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 b4311be..2fabede 100644 --- a/src/corner_finder_inscribed_angle.cpp +++ b/src/corner_finder_inscribed_angle.cpp @@ -1,27 +1,3 @@ -<<<<<<<< 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 d969551..6b82c68 100644 --- a/src/corner_point.cpp +++ b/src/corner_point.cpp @@ -1,27 +1,3 @@ -<<<<<<<< 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 a832084..49282c0 100644 --- a/src/grid_2d.cpp +++ b/src/grid_2d.cpp @@ -1,27 +1,3 @@ -<<<<<<<< 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 b21e43d..288a5d6 100644 --- a/src/grid_cluster.cpp +++ b/src/grid_cluster.cpp @@ -1,27 +1,3 @@ -<<<<<<<< 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 2953237..14f5c01 100644 --- a/src/icp.cpp +++ b/src/icp.cpp @@ -1,27 +1,3 @@ -<<<<<<<< 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 c137787..317452f 100644 --- a/src/laser_scan.cpp +++ b/src/laser_scan.cpp @@ -1,27 +1,3 @@ -<<<<<<<< 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 bc279da..5f8c026 100644 --- a/src/laser_scan_with_params.cpp +++ b/src/laser_scan_with_params.cpp @@ -1,27 +1,3 @@ -<<<<<<<< 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 f2b13c8..8df6687 100644 --- a/src/line_finder.cpp +++ b/src/line_finder.cpp @@ -1,27 +1,3 @@ -<<<<<<<< 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 42e5cde..143c96a 100644 --- a/src/line_finder_hough.cpp +++ b/src/line_finder_hough.cpp @@ -1,27 +1,3 @@ -<<<<<<<< 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 d7a1a74..b59a3ae 100644 --- a/src/line_finder_iterative.cpp +++ b/src/line_finder_iterative.cpp @@ -1,27 +1,3 @@ -<<<<<<<< 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 71c2797..9e284db 100644 --- a/src/line_finder_jump_fit.cpp +++ b/src/line_finder_jump_fit.cpp @@ -1,27 +1,3 @@ -<<<<<<<< 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 03860fb..90971f6 100644 --- a/src/line_segment.cpp +++ b/src/line_segment.cpp @@ -1,27 +1,3 @@ -<<<<<<<< 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 ee7a31d..26632d3 100644 --- a/src/loop_closure_base.cpp +++ b/src/loop_closure_base.cpp @@ -1,27 +1,3 @@ -<<<<<<<< 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 acb1774..b281710 100644 --- a/src/point_set.cpp +++ b/src/point_set.cpp @@ -1,27 +1,3 @@ -<<<<<<<< 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 d7a0dd2..59fee5e 100644 --- a/src/polyline.cpp +++ b/src/polyline.cpp @@ -1,27 +1,3 @@ -<<<<<<<< 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 37b373e..e19bc7e 100644 --- a/src/scan_segment.cpp +++ b/src/scan_segment.cpp @@ -1,27 +1,3 @@ -<<<<<<<< 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 802a8d2..9b5805d 100644 --- a/test/data/scan_data.h +++ b/test/data/scan_data.h @@ -1,27 +1,3 @@ -<<<<<<<< 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 b37aa10..0c39d4d 100644 --- a/test/gtest/utils_gtest.h +++ b/test/gtest/utils_gtest.h @@ -1,27 +1,3 @@ -<<<<<<<< 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 6458e8d..5c5c860 100644 --- a/test/gtest_example.cpp +++ b/test/gtest_example.cpp @@ -1,27 +1,3 @@ -<<<<<<<< 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 8a0139c..d4b9e66 100644 --- a/test/gtest_icp.cpp +++ b/test/gtest_icp.cpp @@ -1,27 +1,3 @@ -<<<<<<<< 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 add9221..31d7289 100644 --- a/test/gtest_loop_closure_falko.cpp +++ b/test/gtest_loop_closure_falko.cpp @@ -1,27 +1,3 @@ -<<<<<<<< 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