Skip to content

Commit 0be8bb4

Browse files
authored
Merge pull request lagadic#1447 from fspindle/fix_warnings
Fix warnings
2 parents 1ae3d96 + b6350f6 commit 0be8bb4

File tree

4 files changed

+28
-115
lines changed

4 files changed

+28
-115
lines changed

.github/workflows/macos-ustk.yml

-89
This file was deleted.

3rdparty/pololu/include/RPMSerialInterfaceWindows.h

+2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,9 @@
2626
#include "RPMSerialInterface.h"
2727

2828
#define WIN32_LEAN_AND_MEAN
29+
#ifndef NOMINMAX
2930
#define NOMINMAX
31+
#endif
3032
#include <windows.h>
3133

3234
class RPMSerialInterfaceWindows : public RPMSerialInterface

example/particle-filter/pf-nonlinear-example.cpp

+20-22
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
/****************************************************************************
2-
*
1+
/*
32
* ViSP, open source Visual Servoing Platform software.
43
* Copyright (C) 2005 - 2024 by Inria. All rights reserved.
54
*
@@ -27,8 +26,7 @@
2726
*
2827
* This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
2928
* WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
30-
*
31-
*****************************************************************************/
29+
*/
3230

3331
/** \example pf-nonlinear-example.cpp
3432
* Example on how to use a Particle Filter (PF) on a complex non-linear use-case.
@@ -38,24 +36,24 @@
3836
* fixed to the ceiling.
3937
*
4038
* The state vector of the PF is:
41-
* \f{eqnarray*}{
42-
\textbf{x}[0] &=& {}^WX_x \\
43-
\textbf{x}[1] &=& {}^WX_y \\
44-
\textbf{x}[2] &=& {}^WX_z \\
45-
\textbf{x}[3] &=& \omega \Delta t
46-
\f}
47-
48-
The measurement \f$ \textbf{z} \f$ corresponds to the coordinates in pixels of the different markers.
49-
Be \f$ u_i \f$ and \f$ v_i \f$ the horizontal and vertical pixel coordinates of the \f$ i^{th} \f$ marker.
50-
The measurement vector can be written as:
51-
\f{eqnarray*}{
52-
\textbf{z}[2i] &=& u_i \\
53-
\textbf{z}[2i+1] &=& v_i
54-
\f}
55-
39+
* \f{eqnarray*}{
40+
* \textbf{x}[0] &=& {}^WX_x \\
41+
* \textbf{x}[1] &=& {}^WX_y \\
42+
* \textbf{x}[2] &=& {}^WX_z \\
43+
* \textbf{x}[3] &=& \omega \Delta t
44+
* \f}
45+
*
46+
* The measurement \f$ \textbf{z} \f$ corresponds to the coordinates in pixels of the different markers.
47+
* Be \f$ u_i \f$ and \f$ v_i \f$ the horizontal and vertical pixel coordinates of the \f$ i^{th} \f$ marker.
48+
* The measurement vector can be written as:
49+
* \f{eqnarray*}{
50+
* \textbf{z}[2i] &=& u_i \\
51+
* \textbf{z}[2i+1] &=& v_i
52+
* \f}
53+
*
5654
* Some noise is added to the measurement vector to simulate measurements which are
5755
* not perfect.
58-
*/
56+
*/
5957

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

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

707703
// Plot the noisy pose
704+
double wXnoisy = wMo_noisy[0][3];
705+
double wYnoisy = wMo_noisy[1][3];
708706
plot->plot(0, 2, wXnoisy, wYnoisy);
709707
//! [Update_plot]
710708

modules/core/include/visp3/core/vpThread.h

+6-4
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,9 @@ class VP_DEPRECATED vpThread
8888
/*!
8989
Construct a thread object that represents a new joinable thread of
9090
execution. The new thread of execution calls \e fn passing \e args as
91-
arguments. \param fn : A pointer to a function. \param args : Arguments
92-
passed to the call to \e fn (if any).
91+
arguments.
92+
\param fn : A pointer to a function.
93+
\param args : Arguments passed to the call to \e fn (if any).
9394
*/
9495
vpThread(vpThread::Fn fn, vpThread::Args args = nullptr) : m_handle(), m_isCreated(false), m_isJoinable(false)
9596
{
@@ -98,8 +99,9 @@ class VP_DEPRECATED vpThread
9899

99100
/*!
100101
Creates a thread object that represents a new joinable thread of
101-
execution. \param fn : A pointer to a function. \param args : Arguments
102-
passed to the call to \e fn (if any).
102+
execution.
103+
\param fn : A pointer to a function.
104+
\param args : Arguments passed to the call to \e fn (if any).
103105
*/
104106
void create(vpThread::Fn fn, vpThread::Args args = nullptr)
105107
{

0 commit comments

Comments
 (0)