Skip to content

Commit

Permalink
Remove empty lines
Browse files Browse the repository at this point in the history
  • Loading branch information
fspindle committed Oct 4, 2024
1 parent 32a571c commit 62a372f
Show file tree
Hide file tree
Showing 41 changed files with 68 additions and 112 deletions.
1 change: 0 additions & 1 deletion modules/core/include/visp3/core/vpRGBa.h
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,5 @@ static_assert(std::is_trivially_assignable_v<vpRGBa, vpRGBa>);
static_assert(std::is_trivially_copyable_v<vpRGBa>);
#endif


END_VISP_NAMESPACE
#endif
3 changes: 0 additions & 3 deletions modules/core/include/visp3/core/vpRGBf.h
Original file line number Diff line number Diff line change
Expand Up @@ -154,9 +154,6 @@ static_assert(std::is_trivially_assignable_v<vpRGBf, vpRGBf>);
static_assert(std::is_trivially_copyable_v<vpRGBf>);
#endif


END_VISP_NAMESPACE



#endif
2 changes: 0 additions & 2 deletions modules/tracker/klt/include/visp3/klt/vpKltOpencv.h
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@
#include <nlohmann/json.hpp>
#endif


BEGIN_VISP_NAMESPACE
/*!
* \class vpKltOpencv
Expand Down Expand Up @@ -389,7 +388,6 @@ class VISP_EXPORT vpKltOpencv
void suppressFeature(const int &index);

#ifdef VISP_HAVE_NLOHMANN_JSON

friend void to_json(nlohmann::json &j, const vpKltOpencv &array);
friend void from_json(const nlohmann::json &j, vpKltOpencv &array);
#endif
Expand Down
8 changes: 1 addition & 7 deletions modules/tracker/rbt/include/visp3/rbt/vpColorHistogram.h
Original file line number Diff line number Diff line change
Expand Up @@ -40,18 +40,13 @@

#include <vector>



BEGIN_VISP_NAMESPACE

template<typename T>
class vpImage;

class vpRGBa;

class vpRect;


class VISP_EXPORT vpColorHistogram
{
public:
Expand Down Expand Up @@ -109,8 +104,7 @@ class VISP_EXPORT vpColorHistogram
std::vector<float> m_probas;
unsigned int m_numPixels;
};
END_VISP_NAMESPACE


END_VISP_NAMESPACE

#endif
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ class VISP_EXPORT vpColorHistogramMask : public vpObjectMask
const vpRBFeatureTrackerInput &previousFrame,
vpImage<float> &mask) VP_OVERRIDE;


/**
* \name Histogram settings
* @{
Expand Down
4 changes: 1 addition & 3 deletions modules/tracker/rbt/include/visp3/rbt/vpDynamicFactory.h
Original file line number Diff line number Diff line change
Expand Up @@ -75,19 +75,17 @@ class VISP_EXPORT vpDynamicFactory
{
m_keyFinder = finderFn;
}

#endif

protected:
vpDynamicFactory() = default;


#if defined(VISP_HAVE_NLOHMANN_JSON)
std::map<std::string, std::function<std::shared_ptr<T>(const nlohmann::json &)>> m_jsonBuilders;
std::function<std::string(const nlohmann::json &)> m_keyFinder; //! Function to retrieve the key from a json object
#endif

};

END_VISP_NAMESPACE

#endif
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@ class VISP_EXPORT vpObjectCentricRenderer : public vpPanda3DRendererSet

vpRect computeBoundingBox();


template <typename T>
void placeRenderInto(const vpImage<T> &render, vpImage<T> &target, const T &clearValue)
{
Expand Down Expand Up @@ -116,8 +115,9 @@ class VISP_EXPORT vpObjectCentricRenderer : public vpPanda3DRendererSet
std::vector<vpColVector> m_bb3DPoints;
bool m_shouldComputeBBPoints;
vpPanda3DRenderParameters m_subRenderParams;

};

END_VISP_NAMESPACE

#endif
#endif
6 changes: 1 addition & 5 deletions modules/tracker/rbt/include/visp3/rbt/vpObjectMask.h
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@

#include <visp3/core/vpConfig.h>


#if defined(VISP_HAVE_NLOHMANN_JSON)
#include <nlohmann/json_fwd.hpp>
#endif
Expand All @@ -46,7 +45,6 @@ BEGIN_VISP_NAMESPACE

template <typename T>
class vpImage;

class vpRBFeatureTrackerInput;

/**
Expand All @@ -66,10 +64,8 @@ class VISP_EXPORT vpObjectMask
#if defined(VISP_HAVE_NLOHMANN_JSON)
virtual void loadJsonConfiguration(const nlohmann::json &j) = 0;
#endif


};
END_VISP_NAMESPACE

END_VISP_NAMESPACE

#endif
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ class VISP_EXPORT vpObjectMaskFactory : public vpDynamicFactory<vpObjectMask>
return factory;
}
};

END_VISP_NAMESPACE

#endif
5 changes: 3 additions & 2 deletions modules/tracker/rbt/include/visp3/rbt/vpPanda3DDepthFilters.h
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@ class VISP_EXPORT vpPanda3DDepthGaussianBlur : public vpPanda3DPostProcessFilter
*
* The results of the canny are filtered based on a threshold value (defined between 0 and 255), checking whether there is enough gradient information.
* The output of this image is a floating RGB image containing:
* - In the red channel, the value of the convolution with the sobel horizontal kernel
* - In the green channel, the value of the convolution with the sobel vertical kernel
* - In the red channel, the value of the convolution with the Sobel horizontal kernel
* - In the green channel, the value of the convolution with the Sobel vertical kernel
* - In the blue channel, the angle (in radians) of the edge normal.
*/
class VISP_EXPORT vpPanda3DDepthCannyFilter : public vpPanda3DPostProcessFilter
Expand All @@ -86,6 +86,7 @@ class VISP_EXPORT vpPanda3DDepthCannyFilter : public vpPanda3DPostProcessFilter
static const char *FRAGMENT_SHADER;
float m_edgeThreshold;
};

END_VISP_NAMESPACE

#endif
Expand Down
7 changes: 2 additions & 5 deletions modules/tracker/rbt/include/visp3/rbt/vpRBDenseDepthTracker.h
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@

BEGIN_VISP_NAMESPACE
/**
* @brief A tracker based on dense depth point-plane alignement
* @brief A tracker based on dense depth point-plane alignment.
*
* \ingroup group_rbt_trackers
*
Expand Down Expand Up @@ -132,11 +132,8 @@ class VISP_EXPORT vpRBDenseDepthTracker : public vpRBFeatureTracker

struct vpDepthPoint
{

vpDepthPoint() : currentPoint(3), cameraNormal(3), objectNormal(3)
{

}
{ }

inline void update(const vpHomogeneousMatrix &cMo, const vpRotationMatrix &cRo)
{
Expand Down
2 changes: 1 addition & 1 deletion modules/tracker/rbt/include/visp3/rbt/vpRBDriftDetector.h
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ class VISP_EXPORT vpRBDriftDetector
virtual double getScore() const = 0;

/**
* \brief Returns whether the tracking has diverged and should be reinitialised.
* \brief Returns whether the tracking has diverged and should be reinitialized.
* This function should be called after update.
*
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,5 +58,7 @@ class VISP_EXPORT vpRBDriftDetectorFactory : public vpDynamicFactory<vpRBDriftDe
return factory;
}
};

END_VISP_NAMESPACE

#endif
2 changes: 1 addition & 1 deletion modules/tracker/rbt/include/visp3/rbt/vpRBFeatureTracker.h
Original file line number Diff line number Diff line change
Expand Up @@ -227,8 +227,8 @@ class VISP_EXPORT vpRBFeatureTracker
double m_userVvsWeight; //! User-defined weight for this specific type of feature

bool m_vvsConverged; //! Whether VVS has converged, should be updated every VVS iteration

};

END_VISP_NAMESPACE

#endif
Original file line number Diff line number Diff line change
Expand Up @@ -58,5 +58,7 @@ class VISP_EXPORT vpRBFeatureTrackerFactory : public vpDynamicFactory<vpRBFeatur
return factory;
}
};

END_VISP_NAMESPACE

#endif
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,6 @@ struct VISP_EXPORT vpRBRenderData
boundingBox = std::move(o.boundingBox);
return *this;
}

};

/**
Expand Down Expand Up @@ -134,10 +133,12 @@ class VISP_EXPORT vpRBFeatureTrackerInput
renders = o.renders;
return *this;
}

vpRBFeatureTrackerInput(const vpRBFeatureTrackerInput &other)
{
*this = other;
}

vpRBFeatureTrackerInput &operator=(vpRBFeatureTrackerInput &&o)
{
I = std::move(o.I);
Expand All @@ -149,11 +150,13 @@ class VISP_EXPORT vpRBFeatureTrackerInput
renders = std::move(o.renders);
return *this;
}

vpRBFeatureTrackerInput(vpRBFeatureTrackerInput &&other)
{
*this = std::move(other);
}
};

END_VISP_NAMESPACE

#endif
Original file line number Diff line number Diff line change
Expand Up @@ -40,5 +40,7 @@ class VISP_EXPORT vpRBInitializationHelper
vpHomogeneousMatrix m_cMo;
vpCameraParameters m_cam;
};

END_VISP_NAMESPACE

#endif
2 changes: 1 addition & 1 deletion modules/tracker/rbt/include/visp3/rbt/vpRBKltTracker.h
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,6 @@ class VISP_EXPORT vpRBKltTracker : public vpRBFeatureTracker
* @}
*
*/

struct vpTrackedKltPoint
{
public:
Expand Down Expand Up @@ -262,5 +261,6 @@ class VISP_EXPORT vpRBKltTracker : public vpRBFeatureTracker
};

END_VISP_NAMESPACE

#endif
#endif
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,6 @@ template <typename T> class vpImage;
*/
class VISP_EXPORT vpRBProbabilistic3DDriftDetector : public vpRBDriftDetector
{

private:

struct vpStored3DSurfaceColorPoint
Expand Down Expand Up @@ -317,7 +316,6 @@ class VISP_EXPORT vpRBProbabilistic3DDriftDetector : public vpRBDriftDetector
void loadJsonConfiguration(const nlohmann::json &) VP_OVERRIDE;
#endif


/**
* @}
* End settings
Expand All @@ -333,7 +331,8 @@ class VISP_EXPORT vpRBProbabilistic3DDriftDetector : public vpRBDriftDetector
double m_score;

std::vector<vpStored3DSurfaceColorPoint> m_points;

};

END_VISP_NAMESPACE

#endif
Original file line number Diff line number Diff line change
Expand Up @@ -275,5 +275,7 @@ class VISP_EXPORT vpRBSilhouetteCCDTracker : public vpRBFeatureTracker
vpMatrix m_hessian; //! Sum of local hessians
double m_temporalSmoothingFac; //! Smoothing factor used to integrate data from the previous frame.
};

END_VISP_NAMESPACE

#endif
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,6 @@ class VISP_EXPORT vpRBSilhouetteControlPoint

double xs, ys, nxs, nys, Zs;


public:

void init();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -179,8 +179,8 @@ class VISP_EXPORT vpRBSilhouetteMeTracker : public vpRBFeatureTracker
double m_singlePointConvergedThresholdPixels; //! Whether a single Control point is considered as converged
bool m_useMask;
float m_minMaskConfidence;

};

END_VISP_NAMESPACE

#endif
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ class VISP_EXPORT vpRBSilhouettePoint
{ }

};

END_VISP_NAMESPACE

#endif
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ class VISP_EXPORT vpSilhouettePointsExtractionSettings
bool m_thresholdIsRelative;
bool m_preferPreviousPoints;


void sampleWithoutReplacement(unsigned int count, unsigned int vectorSize, std::vector<size_t> &indices, vpUniRand &random) const
{
count = std::min(count, vectorSize);
Expand Down Expand Up @@ -117,7 +116,6 @@ class VISP_EXPORT vpSilhouettePointsExtractionSettings
const vpCameraParameters &cam, const vpHomogeneousMatrix &cTcp,
const std::vector<vpRBSilhouettePoint> &previousPoints, long randomSeed = 41) const;


#if defined(VISP_HAVE_NLOHMANN_JSON)
inline friend void from_json(const nlohmann::json &j, vpSilhouettePointsExtractionSettings &settings);
#endif
Expand All @@ -136,12 +134,10 @@ inline void from_json(const nlohmann::json &j, vpSilhouettePointsExtractionSetti
settings.m_preferPreviousPoints = samplingSettings.at("reusePreviousPoints");
settings.m_maxNumPoints = samplingSettings.at("numPoints");
settings.setSampleStep(samplingSettings.at("samplingRate"));

}
#endif

END_VISP_NAMESPACE


#endif
#endif
2 changes: 0 additions & 2 deletions modules/tracker/rbt/include/visp3/rbt/vpRBTracker.h
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@

#include <visp3/core/vpDisplay.h>


#include <ostream>

#if defined(VISP_HAVE_NLOHMANN_JSON)
Expand Down Expand Up @@ -168,7 +167,6 @@ class VISP_EXPORT vpRBTracker

void reset();


/**
* \name Tracking
* @{
Expand Down
2 changes: 1 addition & 1 deletion modules/tracker/rbt/include/visp3/rbt/vpRBTrackerLogger.h
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@ class VISP_EXPORT vpRBTrackerLogger
void setSilhouetteTime(double elapsed) { m_silhouetteExtractionTime = elapsed; }
void setMaskTime(double elapsed) { m_maskTime = elapsed; }


void insertTrackerTime(std::map<int, std::vector<double>> &map, int id, double elapsed)
{
if (map.find(id) == map.end()) {
Expand Down Expand Up @@ -174,4 +173,5 @@ std::ostream &operator<<(std::ostream &out, const vpRBTrackerLogger &timer)
}

END_VISP_NAMESPACE

#endif
Loading

0 comments on commit 62a372f

Please sign in to comment.