Skip to content

Commit

Permalink
Merge pull request #1447 from fspindle/fix_warnings
Browse files Browse the repository at this point in the history
Fix warnings
  • Loading branch information
fspindle authored Jul 24, 2024
2 parents 1ae3d96 + b6350f6 commit 0be8bb4
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 115 deletions.
89 changes: 0 additions & 89 deletions .github/workflows/macos-ustk.yml

This file was deleted.

2 changes: 2 additions & 0 deletions 3rdparty/pololu/include/RPMSerialInterfaceWindows.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,9 @@
#include "RPMSerialInterface.h"

#define WIN32_LEAN_AND_MEAN
#ifndef NOMINMAX
#define NOMINMAX
#endif
#include <windows.h>

class RPMSerialInterfaceWindows : public RPMSerialInterface
Expand Down
42 changes: 20 additions & 22 deletions example/particle-filter/pf-nonlinear-example.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
/****************************************************************************
*
/*
* ViSP, open source Visual Servoing Platform software.
* Copyright (C) 2005 - 2024 by Inria. All rights reserved.
*
Expand Down Expand Up @@ -27,8 +26,7 @@
*
* This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
* WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
*****************************************************************************/
*/

/** \example pf-nonlinear-example.cpp
* Example on how to use a Particle Filter (PF) on a complex non-linear use-case.
Expand All @@ -38,24 +36,24 @@
* fixed to the ceiling.
*
* The state vector of the PF is:
* \f{eqnarray*}{
\textbf{x}[0] &=& {}^WX_x \\
\textbf{x}[1] &=& {}^WX_y \\
\textbf{x}[2] &=& {}^WX_z \\
\textbf{x}[3] &=& \omega \Delta t
\f}
The measurement \f$ \textbf{z} \f$ corresponds to the coordinates in pixels of the different markers.
Be \f$ u_i \f$ and \f$ v_i \f$ the horizontal and vertical pixel coordinates of the \f$ i^{th} \f$ marker.
The measurement vector can be written as:
\f{eqnarray*}{
\textbf{z}[2i] &=& u_i \\
\textbf{z}[2i+1] &=& v_i
\f}
* \f{eqnarray*}{
* \textbf{x}[0] &=& {}^WX_x \\
* \textbf{x}[1] &=& {}^WX_y \\
* \textbf{x}[2] &=& {}^WX_z \\
* \textbf{x}[3] &=& \omega \Delta t
* \f}
*
* The measurement \f$ \textbf{z} \f$ corresponds to the coordinates in pixels of the different markers.
* Be \f$ u_i \f$ and \f$ v_i \f$ the horizontal and vertical pixel coordinates of the \f$ i^{th} \f$ marker.
* The measurement vector can be written as:
* \f{eqnarray*}{
* \textbf{z}[2i] &=& u_i \\
* \textbf{z}[2i+1] &=& v_i
* \f}
*
* Some noise is added to the measurement vector to simulate measurements which are
* not perfect.
*/
*/

// ViSP includes
#include <visp3/core/vpConfig.h>
Expand Down Expand Up @@ -690,8 +688,6 @@ int main(const int argc, const char *argv[])
// Compute the pose using the noisy markers
vpHomogeneousMatrix cMo_noisy = computePose(markersAsVpPoint, ip, cam);
vpHomogeneousMatrix wMo_noisy = cMw.inverse() * cMo_noisy;
double wXnoisy = wMo_noisy[0][3];
double wYnoisy = wMo_noisy[1][3];
//! [Noisy_pose]

//! [Update_displays]
Expand All @@ -705,6 +701,8 @@ int main(const int argc, const char *argv[])
plot->plot(0, 1, Xest[0], Xest[1]);

// Plot the noisy pose
double wXnoisy = wMo_noisy[0][3];
double wYnoisy = wMo_noisy[1][3];
plot->plot(0, 2, wXnoisy, wYnoisy);
//! [Update_plot]

Expand Down
10 changes: 6 additions & 4 deletions modules/core/include/visp3/core/vpThread.h
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,9 @@ class VP_DEPRECATED vpThread
/*!
Construct a thread object that represents a new joinable thread of
execution. The new thread of execution calls \e fn passing \e args as
arguments. \param fn : A pointer to a function. \param args : Arguments
passed to the call to \e fn (if any).
arguments.
\param fn : A pointer to a function.
\param args : Arguments passed to the call to \e fn (if any).
*/
vpThread(vpThread::Fn fn, vpThread::Args args = nullptr) : m_handle(), m_isCreated(false), m_isJoinable(false)
{
Expand All @@ -98,8 +99,9 @@ class VP_DEPRECATED vpThread

/*!
Creates a thread object that represents a new joinable thread of
execution. \param fn : A pointer to a function. \param args : Arguments
passed to the call to \e fn (if any).
execution.
\param fn : A pointer to a function.
\param args : Arguments passed to the call to \e fn (if any).
*/
void create(vpThread::Fn fn, vpThread::Args args = nullptr)
{
Expand Down

0 comments on commit 0be8bb4

Please sign in to comment.