Skip to content

Commit 5ef2732

Browse files
committed
Merge branch 'develop'
2 parents d1c99a4 + 33c77b0 commit 5ef2732

File tree

256 files changed

+554
-676
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

256 files changed

+554
-676
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,3 +42,4 @@ doc/source/global.rst
4242
doc/source/doxygen-index.rst
4343
.cmake
4444
doc/venv
45+
.pc

3rdparty/freeglut/freeglut_menu.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -719,7 +719,7 @@ void fghCalculateMenuBoxSize( void )
719719

720720
/*
721721
* If the entry is a submenu, then it needs to be wider to
722-
* accomodate the arrow. JCJ 31 July 2003
722+
* accommodate the arrow. JCJ 31 July 2003
723723
*/
724724
if (menuEntry->SubMenu )
725725
menuEntry->Width += glutBitmapLength(

3rdparty/nanoflann

3rdparty/xspublic/xscontroller/xsdevice_def.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3702,7 +3702,7 @@ void XsDevice::removeRef()
37023702
\param data The data buffer
37033703
\param pageNr The page number
37043704
\param bankNr The bank number
3705-
\returns True if succesful
3705+
\returns True if successful
37063706
*/
37073707
bool XsDevice::writeEmtsPage(uint8_t const* data, int pageNr, int bankNr)
37083708
{

3rdparty/xspublic/xstypes/xsfile.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ XsResultValue XsFile_close(struct XsFile *thisPtr)
312312

313313
/*! \relates XsFile
314314
\brief Writes unwritten data to the file
315-
\returns XRV_OK if the flushing was succesful, an XRV_ERROR otherwise
315+
\returns XRV_OK if the flushing was successful, an XRV_ERROR otherwise
316316
317317
*/
318318
XsResultValue XsFile_flush(struct XsFile *thisPtr)
@@ -458,7 +458,7 @@ XsResultValue XsFile_puts(struct XsFile *thisPtr, const char *str)
458458
/*! \relates XsFile
459459
\brief Moves the current file position relative to the start of the file
460460
\param offset Position in the file to move to, relative to the start of the file
461-
\returns XRV_OK if the seek was succesful
461+
\returns XRV_OK if the seek was successful
462462
*/
463463
XsResultValue XsFile_seek(struct XsFile *thisPtr, XsFilePos offset)
464464
{
@@ -472,7 +472,7 @@ XsResultValue XsFile_seek(struct XsFile *thisPtr, XsFilePos offset)
472472
/*! \relates XsFile
473473
\brief Moves the current file position relative to the end of the file
474474
\param offset Position in the file to move to, relative to the end of the file
475-
\returns XRV_OK if the seek was succesful
475+
\returns XRV_OK if the seek was successful
476476
*/
477477
XsResultValue XsFile_seek_r(struct XsFile *thisPtr, XsFilePos offset)
478478
{

apps/DifOdometry-Datasets/DifOdometry_Datasets.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -503,7 +503,7 @@ void CDifodoDatasets::loadFrame()
503503
// quat[3] = w, quat[4] = qx; quat[5] = qy; quat[6] = qz;
504504
// gt.setFromXYZQ(quat);
505505

506-
// Set the initial pose (if appropiate)
506+
// Set the initial pose (if appropriate)
507507
if (first_pose == false)
508508
{
509509
cam_pose = gt + transf;

apps/SceneViewer3D/_DSceneViewerMain.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -820,7 +820,7 @@ void _DSceneViewerFrame::loadFromFile(const std::string& fil, bool isInASequence
820820
const double sceneMaxScale = std::max<double>(1000.0, (sceneBbox.max - sceneBbox.min).norm());
821821
openGLSceneRef->getViewport()->setViewportClipDistances(0.1, 5.0 * sceneMaxScale);
822822

823-
// Change the camera if necesary:
823+
// Change the camera if necessary:
824824
if (openGLSceneRef->followCamera())
825825
{
826826
Viewport::Ptr view = openGLSceneRef->getViewport("main");

apps/ro-localization/CPosePDFParticlesExtended.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ class CPosePDFParticlesExtended :
124124
*/
125125
~CPosePDFParticlesExtended() override;
126126

127-
/** Copy operator, translating if necesary (for example, between particles
127+
/** Copy operator, translating if necessary (for example, between particles
128128
* and gaussian representations)
129129
*/
130130
void copyFrom(const CPosePDF& o) override;

apps/track-video-features/track-video-feats_main.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -453,7 +453,7 @@ int main(int argc, char** argv)
453453
CImage::setImagesPathBase(CRawlog::detectImagesDirectory(fil));
454454

455455
cam->loadConfig(cfg, "CONFIG");
456-
cam->initialize(); // This will raise an exception if neccesary
456+
cam->initialize(); // This will raise an exception if necessary
457457
}
458458
else
459459
{
@@ -465,7 +465,7 @@ int main(int argc, char** argv)
465465
cfg.write("CONFIG", "ffmpeg_url", fil);
466466

467467
cam->loadConfig(cfg, "CONFIG");
468-
cam->initialize(); // This will raise an exception if neccesary
468+
cam->initialize(); // This will raise an exception if necessary
469469
}
470470
}
471471

appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# version format
2-
version: 2.13.7-{branch}-build{build}
2+
version: 2.13.8-{branch}-build{build}
33

44
os: Visual Studio 2019
55

0 commit comments

Comments
 (0)