12345qiupeng
/
gtsam
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

avoid more warnings on Linux

release/4.3a0
Frank Dellaert 2022-02-16 21:27:28 -05:00
parent bac5d4f120
commit 0167716037
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gtsam/geometry/PinholeCamera.h
View File

@ -230,13 +230,15 @@ public:
Point2 _project2(const POINT& pw, OptionalJacobian<2, dimension> Dcamera, Point2 _project2(const POINT& pw, OptionalJacobian<2, dimension> Dcamera,
OptionalJacobian<2, FixedDimension<POINT>::value> Dpoint) const { OptionalJacobian<2, FixedDimension<POINT>::value> Dpoint) const {
// We just call 3-derivative version in Base // We just call 3-derivative version in Base
Matrix26 Dpose; if (Dcamera){
Eigen::Matrix<double, 2, DimK> Dcal; Matrix26 Dpose;
Point2 pi = Base::project(pw, Dcamera ? &Dpose : 0, Dpoint, Eigen::Matrix<double, 2, DimK> Dcal;
Dcamera ? &Dcal : 0); const Point2 pi = Base::project(pw, Dpose, Dpoint, Dcal);
if (Dcamera)
*Dcamera << Dpose, Dcal; *Dcamera << Dpose, Dcal;
return pi; return pi;
} else {
return Base::project(pw, boost::none, Dpoint, boost::none);
}
} }
/// project a 3D point from world coordinates into the image /// project a 3D point from world coordinates into the image

3
gtsam/nonlinear/tests/testCallRecord.cpp
View File

@ -153,7 +153,7 @@ TEST(CallRecord, virtualReverseAdDispatching) {
} }
{ {
const int Rows = 6; const int Rows = 6;
record.CallRecord::reverseAD2(Eigen::Matrix<double, Rows, Cols>(), NJM); record.CallRecord::reverseAD2(Eigen::Matrix<double, Rows, Cols>::Zero(), NJM);
EXPECT((assert_equal(record.cc, CallConfig(Rows, Cols)))); EXPECT((assert_equal(record.cc, CallConfig(Rows, Cols))));
record.CallRecord::reverseAD2(DynRowMat(Rows, Cols), NJM); record.CallRecord::reverseAD2(DynRowMat(Rows, Cols), NJM);
EXPECT((assert_equal(record.cc, CallConfig(Eigen::Dynamic, Cols, Rows, Cols)))); EXPECT((assert_equal(record.cc, CallConfig(Eigen::Dynamic, Cols, Rows, Cols))));
@ -168,4 +168,3 @@ int main() {
return TestRegistry::runAllTests(tr); return TestRegistry::runAllTests(tr);
} }
/* ************************************************************************* */ /* ************************************************************************* */