i/rtabmap
1
0
Fork 0
mirror of https://github.com/introlab/rtabmap.git synced 2026-09-03 01:50:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed build with OpencV 2.4 and Qt4

Browse Source
This commit is contained in:
matlabbe
2020-05-13 15:15:52 -04:00
parent 00695731fe
commit 55509c6c27
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
guilib/src/DatabaseViewer.cpp
View File

@@ -7321,8 +7321,8 @@ bool DatabaseViewer::addConstraint(int from, int to, bool silent)
"" ""
"\n\nOtherwise, if " "\n\nOtherwise, if "
"the database has images, it is recommended to use %2=2 instead so that " "the database has images, it is recommended to use %2=2 instead so that "
"the guess can be found visually.") "the guess can be found visually.")
.arg(Parameters::kRegStrategy().c_str()).arg(Parameters::kRegStrategy().c_str()), .arg(Parameters::kRegStrategy().c_str()).arg(Parameters::kRegStrategy().c_str()),
QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes | QMessageBox::No,
QMessageBox::Yes) == QMessageBox::Yes) QMessageBox::Yes) == QMessageBox::Yes)
{ {
@@ -7345,8 +7345,8 @@ bool DatabaseViewer::addConstraint(int from, int to, bool silent)
"transform for ICP guess? " "transform for ICP guess? "
"" ""
"\n\nOtherwise, if the database has images, it is recommended to use %2=2 " "\n\nOtherwise, if the database has images, it is recommended to use %2=2 "
"instead so that the guess can be found visually.") "instead so that the guess can be found visually.")
.arg(Parameters::kRegStrategy().c_str()).arg(Parameters::kRegStrategy().c_str()), .arg(Parameters::kRegStrategy().c_str()).arg(Parameters::kRegStrategy().c_str()),
QMessageBox::Yes | QMessageBox::Abort, QMessageBox::Yes | QMessageBox::Abort,
QMessageBox::Abort) == QMessageBox::Yes) QMessageBox::Abort) == QMessageBox::Yes)
{ {

1
guilib/src/utilite/UPlot.cpp
View File

@@ -48,6 +48,7 @@
#include <QtSvg/QSvgGenerator> #include <QtSvg/QSvgGenerator>
#endif #endif
#include <cmath> #include <cmath>
#include <limits>
#define PRINT_DEBUG 0 #define PRINT_DEBUG 0

3
tools/Matcher/main.cpp
View File

@@ -47,8 +47,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <QHBoxLayout> #include <QHBoxLayout>
#include <QMultiMap> #include <QMultiMap>
#include <QString> #include <QString>
#include <opencv2/core.hpp> #include <opencv2/core/core.hpp>
#include <opencv2/imgcodecs.hpp>
using namespace rtabmap; using namespace rtabmap;