Skip to content

Commit 1ec6a14

Browse files
committed
progress porting vision lgpl
1 parent 197dab0 commit 1ec6a14

File tree

8 files changed

+27
-30
lines changed

8 files changed

+27
-30
lines changed

modules/mrpt_vision-lgpl/CMakeLists.txt

Lines changed: 0 additions & 28 deletions
This file was deleted.
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
2+
cmake_minimum_required(VERSION 3.16)
3+
project(mrpt_vision_lgpl LANGUAGES C CXX)
4+
5+
find_package(mrpt_common REQUIRED)
6+
find_package(mrpt_vision REQUIRED)
7+
8+
set(LIB_SOURCES
9+
src/ba_common.cpp
10+
src/ba_full.cpp
11+
)
12+
13+
set(LIB_PUBLIC_HEADERS
14+
include/mrpt/vision/bundle_adjustment.h
15+
src/ba_internals.h
16+
)
17+
18+
mrpt_add_library(
19+
TARGET ${PROJECT_NAME}
20+
SOURCES ${LIB_SOURCES} ${LIB_PUBLIC_HEADERS}
21+
PUBLIC_LINK_LIBRARIES
22+
mrpt::mrpt_vision
23+
CMAKE_DEPENDENCIES
24+
mrpt_vision
25+
)

modules/mrpt_vision-lgpl/include/mrpt/vision/bundle_adjustment.h renamed to modules/mrpt_vision_lgpl/include/mrpt/vision/bundle_adjustment.h

File renamed without changes.

modules/mrpt_vision-lgpl/src/ba_common.cpp renamed to modules/mrpt_vision_lgpl/src/ba_common.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
#include <mrpt/math/robust_kernels.h>
2525
#include <mrpt/poses/Lie/SE.h>
2626
#include <mrpt/vision/bundle_adjustment.h>
27-
#include <mrpt/vision/pinhole.h>
27+
#include <mrpt/img/camera_geometry.h>
2828

2929
#include "ba_internals.h"
3030

@@ -126,7 +126,7 @@ inline void reprojectionResidualsElement(
126126
double* out_kernel_1st_deriv)
127127
{
128128
const TPixelCoordf z_pred =
129-
mrpt::vision::pinhole::projectPoint_no_distortion<POSES_INVERSE>(camera_params, frame, point);
129+
mrpt::img::camera_geometry::projectPoint<POSES_INVERSE>(camera_params, frame, point);
130130
const TPixelCoordf& z_meas = OBS.px;
131131

132132
out_residual[0] = z_meas.x - z_pred.x;
File renamed without changes.

0 commit comments

Comments
 (0)