diff -Nru mrpt-1.9.9~snapshot20190220-1046-git-f9a86b4d-disco/apps/SceneViewer3D/CAboutBox.cpp mrpt-1.9.9~snapshot20190220-1340-git-d6315f02-disco/apps/SceneViewer3D/CAboutBox.cpp --- mrpt-1.9.9~snapshot20190220-1046-git-f9a86b4d-disco/apps/SceneViewer3D/CAboutBox.cpp 2019-02-20 09:46:29.000000000 +0000 +++ mrpt-1.9.9~snapshot20190220-1340-git-d6315f02-disco/apps/SceneViewer3D/CAboutBox.cpp 2019-02-20 12:40:11.000000000 +0000 @@ -70,7 +70,7 @@ this, ID_STATICTEXT1, _("Title"), wxDefaultPosition, wxDefaultSize, 0, _T("ID_STATICTEXT1")); wxFont lbProgNameFont( - 22, wxSWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, + 22, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, _T("Times New Roman"), wxFONTENCODING_DEFAULT); lbProgName->SetFont(lbProgNameFont); FlexGridSizer2->Add( @@ -113,24 +113,24 @@ wxTE_MULTILINE | wxTE_READONLY | wxTE_AUTO_URL, wxDefaultValidator, _T("ID_TEXTCTRL4")); wxFont TextCtrl2Font( - 10, wxSWISS, wxFONTSTYLE_NORMAL, wxNORMAL, false, _T("Courier New"), - wxFONTENCODING_DEFAULT); + 10, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, + _T("Courier New"), wxFONTENCODING_DEFAULT); TextCtrl2->SetFont(TextCtrl2Font); lbInfo = new wxTextCtrl( Notebook1, ID_TEXTCTRL1, wxEmptyString, wxPoint(4, 24), wxSize(545, 222), wxTE_MULTILINE | wxTE_READONLY | wxTE_AUTO_URL, wxDefaultValidator, _T("ID_TEXTCTRL1")); wxFont lbInfoFont( - 10, wxSWISS, wxFONTSTYLE_NORMAL, wxNORMAL, false, _T("Courier New"), - wxFONTENCODING_DEFAULT); + 10, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, + _T("Courier New"), wxFONTENCODING_DEFAULT); lbInfo->SetFont(lbInfoFont); lbLicense = new wxTextCtrl( Notebook1, ID_TEXTCTRL2, _(""), wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE | wxTE_READONLY | wxTE_AUTO_URL, wxDefaultValidator, _T("ID_TEXTCTRL2")); wxFont lbLicenseFont( - 10, wxSWISS, wxFONTSTYLE_NORMAL, wxNORMAL, false, _T("Courier New"), - wxFONTENCODING_DEFAULT); + 10, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, + _T("Courier New"), wxFONTENCODING_DEFAULT); lbLicense->SetFont(lbLicenseFont); TextCtrl1 = new wxTextCtrl( Notebook1, ID_TEXTCTRL3, @@ -140,8 +140,8 @@ wxTE_MULTILINE | wxTE_READONLY | wxTE_AUTO_URL, wxDefaultValidator, _T("ID_TEXTCTRL3")); wxFont TextCtrl1Font( - 10, wxSWISS, wxFONTSTYLE_NORMAL, wxNORMAL, false, _T("Courier New"), - wxFONTENCODING_DEFAULT); + 10, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, + _T("Courier New"), wxFONTENCODING_DEFAULT); TextCtrl1->SetFont(TextCtrl1Font); Notebook1->AddPage(TextCtrl2, _("Keyboard and mouse commands"), false); Notebook1->AddPage(lbInfo, _("Information"), false); diff -Nru mrpt-1.9.9~snapshot20190220-1046-git-f9a86b4d-disco/apps/SceneViewer3D/CMakeLists.txt mrpt-1.9.9~snapshot20190220-1340-git-d6315f02-disco/apps/SceneViewer3D/CMakeLists.txt --- mrpt-1.9.9~snapshot20190220-1046-git-f9a86b4d-disco/apps/SceneViewer3D/CMakeLists.txt 2019-02-20 09:46:29.000000000 +0000 +++ mrpt-1.9.9~snapshot20190220-1340-git-d6315f02-disco/apps/SceneViewer3D/CMakeLists.txt 2019-02-20 12:40:11.000000000 +0000 @@ -18,7 +18,6 @@ _DSceneViewerApp.cpp _DSceneViewerApp.h _DSceneViewerMain.cpp _DSceneViewerMain.h CDialogOptions.cpp CDialogOptions.h - CAboutBox.cpp CAboutBox.h CDlgCamTracking.cpp CDlgCamTracking.h CDlgPLYOptions.cpp CDlgPLYOptions.h ) @@ -35,7 +34,7 @@ include_directories( ${wxWidgets_INCLUDE_DIRS} ) target_link_libraries(${PROJECT_NAME} ${wxWidgets_LIBRARIES} ) - target_link_libraries(${PROJECT_NAME} ${MRPT_LINKER_LIBS}) + target_link_libraries(${PROJECT_NAME} ${MRPT_LINKER_LIBS} ${MRPT_OPENGL_LIBS}) target_link_libraries(${PROJECT_NAME} mrptwxthings) add_dependencies(${PROJECT_NAME} mrptwxthings) diff -Nru mrpt-1.9.9~snapshot20190220-1046-git-f9a86b4d-disco/apps/SceneViewer3D/_DSceneViewerMain.cpp mrpt-1.9.9~snapshot20190220-1340-git-d6315f02-disco/apps/SceneViewer3D/_DSceneViewerMain.cpp --- mrpt-1.9.9~snapshot20190220-1046-git-f9a86b4d-disco/apps/SceneViewer3D/_DSceneViewerMain.cpp 2019-02-20 09:46:29.000000000 +0000 +++ mrpt-1.9.9~snapshot20190220-1340-git-d6315f02-disco/apps/SceneViewer3D/_DSceneViewerMain.cpp 2019-02-20 12:40:11.000000000 +0000 @@ -1832,7 +1832,6 @@ } struct visitor_export_PLY - : public unary_function { const string& filename; unsigned int& count; diff -Nru mrpt-1.9.9~snapshot20190220-1046-git-f9a86b4d-disco/apps/SceneViewer3D/_DSceneViewerMain.h mrpt-1.9.9~snapshot20190220-1340-git-d6315f02-disco/apps/SceneViewer3D/_DSceneViewerMain.h --- mrpt-1.9.9~snapshot20190220-1046-git-f9a86b4d-disco/apps/SceneViewer3D/_DSceneViewerMain.h 2019-02-20 09:46:29.000000000 +0000 +++ mrpt-1.9.9~snapshot20190220-1340-git-d6315f02-disco/apps/SceneViewer3D/_DSceneViewerMain.h 2019-02-20 12:40:11.000000000 +0000 @@ -28,6 +28,7 @@ #include #include #include +#include class CDlgCamTracking; class CMyGLCanvas : public mrpt::gui::CWxGLCanvasBase diff -Nru mrpt-1.9.9~snapshot20190220-1046-git-f9a86b4d-disco/debian/changelog mrpt-1.9.9~snapshot20190220-1340-git-d6315f02-disco/debian/changelog --- mrpt-1.9.9~snapshot20190220-1046-git-f9a86b4d-disco/debian/changelog 2019-02-20 11:00:54.000000000 +0000 +++ mrpt-1.9.9~snapshot20190220-1340-git-d6315f02-disco/debian/changelog 2019-02-20 13:00:38.000000000 +0000 @@ -1,26 +1,26 @@ -mrpt (1:1.9.9~snapshot20190220-1046-git-f9a86b4d-disco-1~ppa1~disco) disco; urgency=medium +mrpt (1:1.9.9~snapshot20190220-1340-git-d6315f02-disco-1~ppa1~disco) disco; urgency=medium * New version of upstream sources. - -- Jose Luis Blanco (University of Malaga) Wed, 20 Feb 2019 12:00:54 +0100 + -- Jose Luis Blanco (University of Malaga) Wed, 20 Feb 2019 14:00:38 +0100 -mrpt (1:1.9.9~snapshot20190220-1046-git-f9a86b4d-cosmic-1~ppa1~cosmic) cosmic; urgency=medium +mrpt (1:1.9.9~snapshot20190220-1340-git-d6315f02-cosmic-1~ppa1~cosmic) cosmic; urgency=medium * New version of upstream sources. - -- Jose Luis Blanco (University of Malaga) Wed, 20 Feb 2019 12:00:46 +0100 + -- Jose Luis Blanco (University of Malaga) Wed, 20 Feb 2019 14:00:31 +0100 -mrpt (1:1.9.9~snapshot20190220-1046-git-f9a86b4d-bionic-1~ppa1~bionic) bionic; urgency=medium +mrpt (1:1.9.9~snapshot20190220-1340-git-d6315f02-bionic-1~ppa1~bionic) bionic; urgency=medium * New version of upstream sources. - -- Jose Luis Blanco (University of Malaga) Wed, 20 Feb 2019 12:00:39 +0100 + -- Jose Luis Blanco (University of Malaga) Wed, 20 Feb 2019 14:00:23 +0100 -mrpt (1:1.9.9~snapshot20190220-1046-git-f9a86b4d-xenial-1~ppa1~xenial) xenial; urgency=medium +mrpt (1:1.9.9~snapshot20190220-1340-git-d6315f02-xenial-1~ppa1~xenial) xenial; urgency=medium * New version of upstream sources. - -- Jose Luis Blanco (University of Malaga) Wed, 20 Feb 2019 12:00:28 +0100 + -- Jose Luis Blanco (University of Malaga) Wed, 20 Feb 2019 14:00:16 +0100 mrpt (1:1.5.6-1) unstable; urgency=medium Binary files /tmp/tmpZcCQoe/AOxSCHJeCJ/mrpt-1.9.9~snapshot20190220-1046-git-f9a86b4d-disco/doc/graphslam-engine-guide.pdf and /tmp/tmpZcCQoe/Y5b9hUbbfX/mrpt-1.9.9~snapshot20190220-1340-git-d6315f02-disco/doc/graphslam-engine-guide.pdf differ Binary files /tmp/tmpZcCQoe/AOxSCHJeCJ/mrpt-1.9.9~snapshot20190220-1046-git-f9a86b4d-disco/doc/pbmap-guide.pdf and /tmp/tmpZcCQoe/Y5b9hUbbfX/mrpt-1.9.9~snapshot20190220-1340-git-d6315f02-disco/doc/pbmap-guide.pdf differ diff -Nru mrpt-1.9.9~snapshot20190220-1046-git-f9a86b4d-disco/libs/gui/src/CDisplayWindow3D.cpp mrpt-1.9.9~snapshot20190220-1340-git-d6315f02-disco/libs/gui/src/CDisplayWindow3D.cpp --- mrpt-1.9.9~snapshot20190220-1046-git-f9a86b4d-disco/libs/gui/src/CDisplayWindow3D.cpp 2019-02-20 09:46:29.000000000 +0000 +++ mrpt-1.9.9~snapshot20190220-1340-git-d6315f02-disco/libs/gui/src/CDisplayWindow3D.cpp 2019-02-20 12:40:11.000000000 +0000 @@ -244,6 +244,7 @@ auto frame = CImage::Create(w, h, mrpt::img::CH_RGB); glReadBuffer(GL_FRONT); glReadPixels(0, 0, w, h, GL_BGR_EXT, GL_UNSIGNED_BYTE, (*frame)(0, 0)); + frame->flipVertical(); if (!grabFile.empty()) { diff -Nru mrpt-1.9.9~snapshot20190220-1046-git-f9a86b4d-disco/SOURCE_DATE_EPOCH mrpt-1.9.9~snapshot20190220-1340-git-d6315f02-disco/SOURCE_DATE_EPOCH --- mrpt-1.9.9~snapshot20190220-1046-git-f9a86b4d-disco/SOURCE_DATE_EPOCH 2019-02-20 11:00:14.000000000 +0000 +++ mrpt-1.9.9~snapshot20190220-1340-git-d6315f02-disco/SOURCE_DATE_EPOCH 2019-02-20 13:00:08.000000000 +0000 @@ -1 +1 @@ -1550655989 +1550666411