From 1b8e2b5368f0b09ba58ad58d86a9403b4511e3b8 Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Wed, 24 Jun 2020 11:02:14 +0200
Subject: [PATCH] [wip/ros-aicp-mapping] remove forgotten patch
It was applied upstream
---
ros-aicp-mapping/Makefile | 1 +
ros-aicp-mapping/distinfo | 1 -
ros-aicp-mapping/patches/patch-aa | 33 -------------------------------
3 files changed, 1 insertion(+), 34 deletions(-)
delete mode 100644 ros-aicp-mapping/patches/patch-aa
diff --git a/ros-aicp-mapping/Makefile b/ros-aicp-mapping/Makefile
index 99e9cdb3..25affe70 100644
--- a/ros-aicp-mapping/Makefile
+++ b/ros-aicp-mapping/Makefile
@@ -6,6 +6,7 @@ ROS_PKG= aicp_mapping
ROS_METAPKG= yes
ROS_VERSION= 0.1.0
ROS_REPO= gepetto
+PKGREVISION= 1
HOMEPAGE= ${MASTER_SITE_GITHUB:=${ROS_REPO}/${ROS_PKG}}
MASTER_SITES= ${HOMEPAGE}/archive/v
diff --git a/ros-aicp-mapping/distinfo b/ros-aicp-mapping/distinfo
index 55ec4bf1..5f95d374 100644
--- a/ros-aicp-mapping/distinfo
+++ b/ros-aicp-mapping/distinfo
@@ -1,4 +1,3 @@
SHA1 (ros/aicp_mapping/0.1.0.tar.gz) = 2c19bc85668cbc2c9d77d34441e3d5c95d092cbe
RMD160 (ros/aicp_mapping/0.1.0.tar.gz) = 5509f54cea4fe0653dd72b296d54e18bf240bfe2
Size (ros/aicp_mapping/0.1.0.tar.gz) = 7201308 bytes
-SHA1 (patch-aa) = 6b56a225faf9f008a290b21fa2657cda020dc18a
diff --git a/ros-aicp-mapping/patches/patch-aa b/ros-aicp-mapping/patches/patch-aa
deleted file mode 100644
index 586cb39d..00000000
--- a/ros-aicp-mapping/patches/patch-aa
+++ /dev/null
@@ -1,33 +0,0 @@
-create() provides an std::shared_ptr instead of a ptr.
-
---- aicp_core/src/utils/icpMonitor.cpp.orig 2019-05-05 17:52:19.000000000 +0200
-+++ aicp_core/src/utils/icpMonitor.cpp 2020-01-24 19:24:13.338056526 +0100
-@@ -26,7 +26,7 @@
- params["knn"] = toParam(1); // for Hausdorff distance, we only need the first closest point
- params["epsilon"] = toParam(0);
-
-- PM::Matcher* matcherHausdorff = PM::get().MatcherRegistrar.create("KDTreeMatcher", params);
-+ auto matcherHausdorff = PM::get().MatcherRegistrar.create("KDTreeMatcher", params);
-
- float quantile = 0.60;
-
-@@ -102,7 +102,7 @@
- params["knn"] = toParam(1); // for Hausdorff distance, we only need the first closest point
- params["epsilon"] = toParam(0);
-
-- PM::Matcher* matcher = PM::get().MatcherRegistrar.create("KDTreeMatcher", params);
-+ auto matcher = PM::get().MatcherRegistrar.create("KDTreeMatcher", params);
-
- // from reading to reference
- matcher->init(A);
---- aicp_core/src/registration/pointmatcher_registration.cpp.orig 2019-05-05 17:52:19.000000000 +0200
-+++ aicp_core/src/registration/pointmatcher_registration.cpp 2020-01-24 19:24:44.765800055 +0100
-@@ -72,7 +72,7 @@
- {
- PM::TransformationParameters init_transform = parseTransformationDeg(params_.pointmatcher.initialTransform, 3);
-
-- PM::Transformation* rigid_transform = PM::get().REG(Transformation).create("RigidTransformation");
-+ auto rigid_transform = PM::get().REG(Transformation).create("RigidTransformation");
-
- if (!rigid_transform->checkParameters(init_transform)) {
- cerr << endl
--
GitLab