diff --git a/examples/polyline_demo.cpp b/examples/polyline_demo.cpp index 175ca825ba0edd7a71bf248563b38d313fc070e8..7b7e095d1daa19b1cd8b8e06f64bb99a31b8ac1b 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 1951b677e42ec8997bdc5d1118a65c7c53d3f1d5..5137712846cc68aadde53602e9a21a5ac800f886 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 8dfc1ca9d1142f14dc7d43c2011a623e7e3b481d..43784596cb6ef4ddb2f9b3bbf54f7d2e0e2fbc36 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 a239259c7b82628011ced21f4a7abc76c05c3f04..db4f778fb120d6a7765ee1676806826df7f72849 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 d4c2a0f5164e6f12fd1185b517edbdfd9bfaf5ef..4a7599fb0988543225ba25c0387d8204d5a67b65 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 7a1979b748ddb315659ad56ac94a89ac2012800a..92479fe8b0bc7312336688ab95b3108bd37b84aa 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 3857b36546623327abb90ded57f2c58d7df87703..44551f6153bfaa1c6276c62993294e110854f52a 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 75bd686915482d1587008940031d8c577d17e583..f50bf39849dad7bc76ed550fb6c863169a8d291b 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 7964882fd3d44775cebdc078cd6baae231f0b911..397aec15e83eb7e615c98e2a05c7e925b4d125ad 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 277fc8c85aca4a9947eb06a0f505c7e622227628..a7270d8d36ac0b8300cf05e8feef149d2edb1b34 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 7d08f46d4b1f615eefe8ada008816d4d1eabcba3..c0144f5ff4782b5881e7dc73be39cb19ab6dfdf7 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 0302f0318fe4f425ba50b49cbba23c38e5266e4c..73d0077b818f5b585d8524d993303322bd6cc84e 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 5ef52f94229dcafe1f115358a736574dfa651a36..ae4fbc727be9edd067695409a3a7580eb01db6f3 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 5a928c98557447726e011efbf3122529223268ba..d52b42396e459a597779682e88dfd6ae88494b6f 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 c925016615901fddc38be07b5e5d293da1d50586..c60c28a7ee98506ce9826494dc94d1ea1f0c738c 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 73912f71606adb9b01c200f6030360f4464f97d8..7951f678c19aeb8e315b9238de667601325f7ed1 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 28597fe7ed2c9698167488a44b20197fb51008f8..644d55b43a05341ba9b211ce24433d7c28b610eb 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 f6e0f806cb15ca80b7b736cf35a9b75f09b69323..942ce53e25670f3459e83559a9a7814e97140205 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 b7b060bfef1757ac922310c8e08460cc1f5b1e9e..8e7607c7001326fe23d36eec376469a47d863bb9 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 82c133eb6f9e525af58f49133a472e466a25541e..1c3d8c0c279a0155444620dce0b8852ba6ec932e 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 e1db5220bc2a23fac1472bd3381ef5601289905b..17702491b9513683e54c189ec3b8d9b9b7930a72 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 9a73e52b85a2e62d10ed2da21a1dc82218eea029..f4c0ef890939eec2465936fd620076aee9e40f68 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 b0dc80f47336c642e0dbf4fc6c7cefd127f4ca52..21ae35149205c59d99cfee8b94edc2563d08022d 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 7e7ad4e2f910633467916eb6d7539d758745810f..2fcb5cfc01bed5e2f781ab8efc99770497098e2a 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 b5a2f0efd11c9835eeca57fe045768db1f2f14ee..8b78e73646e8dac7c4bd0dbcfb9d9718cff71d5e 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 a8d222be67c589cbe37671da1f2d2bef42b8b94f..8ee8def7dedd0f3d517f212085d387b4329c46a0 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 36e47f38d214fddf6e80f40967ae906e24977bee..b501a995c6233e790fddc393046727dc6e654c5d 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 164914acb7b1cb5834770a166353e784c9121637..68aaf99be7a86b43598e210c7123035fec201413 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 b4311be1752d50d63e6f7700c60c9c471b62f9fb..2fabedec12e61ea124373c2eb6e508a172431790 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 d96955172fd690530561c7a675669812c8e3f20f..6b82c682aec69a94ea1047dafd36ddfdc26804ed 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 a83208453ee4dee21afa39c4d15f66657842812d..49282c0d064a044f517b29741e5e8a1b4ac912a2 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 b21e43df7786f1235cb459b0c13851d9b3a5141b..288a5d6289da4b8c44f1f25524162e1f5e31be58 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 29532375d5b425d5ac879c1f2cb6b541604768b5..14f5c0185fe127f9d43095139bd4ce16d27fdec1 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 c137787f817070b49d2e7847f8e6bbb1aa879ec5..317452f46f437728722ac236973d8adfde4e53de 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 bc279dac671f099e3257ab5cad6e41ee9fa30214..5f8c0263b213612b85998567627f3507c3327e62 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 f2b13c80061807faa9a5a7d8678bb53836b66ee0..8df668784f341979715ca43be1243a32bfab2779 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 42e5cdebb54cfa3b7a36c35fdd81c8a79012884c..143c96a663759e0e7c6e6819674c3fc9a10beabd 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 d7a1a74b0eb75bbb0d3097ab45c61eef6381f72c..b59a3ae246ba0ced18fc651f5781daa317082e9d 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 71c2797b7e7f79c8727afb564100301274903913..9e284db4fc922ad25893af272499792050c21a13 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 03860fbc7c2ff3fb0a5b00db824e657c505d2ba7..90971f6815ee298393d1ced7a0a06f17d308f8f0 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 ee7a31d303a370c7949e26b1b27787baf7286f2b..26632d39e0df1c59b804e870b5f6fd2f19a2aa64 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 acb177444c402c2222f3a10f5dcb01c4e8ad8295..b28171017328b749b718c968996d817a76b0e6bd 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 d7a0dd2491067d1113f5927df7a11d513ec8b6e8..59fee5e47ef97d63afad96b783fea0c245d13aa4 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 37b373e4338b3f5b2820afc4e35f5e2c49bc61d8..e19bc7e7471c9a40caad0ba7d63e92d3e9f0056e 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 802a8d2cfb434bbdf1b47835d693e5b5b486ba8b..9b5805dfc651a2df9b66a57226ebaa22ac088c21 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 b37aa10f7e3ea8d1cb8a3a1b64e8a6c7ad255889..0c39d4df9e34502480172d008699eaa14fc106c6 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 6458e8dd1b8aeed254e964caf14e43ed0f23cf7e..5c5c860d4bb5f472c76382eb2b8a42b699eacca9 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 8a0139c76d5cd27f5f44816c7715c9624cade380..d4b9e668810a85e42641b0958e5e5e8bdf64dfd8 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 add9221a1c71f17746ca9b947970efa1b0f07df5..31d72890ba9903d336ad3376d92202b0744d1ceb 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),