Format entire project with clang-format

This commit is contained in:
jfmcarreira committed 2017-09-20 18:34:45 +01:00
1 parent 1833ca12ec
commit a1482370e8
88 files changed
+1910 -1961

No files matched your search

+2 -2
View File
@@ -32,10 +32,10 @@ class AbsoluteFrameDifference : public PlaYUVerModuleIf
{
REGISTER_CLASS_FACTORY( AbsoluteFrameDifference )
private:
private:
PlaYUVerFrame* m_pcFrameDifference;
public:
public:
AbsoluteFrameDifference();
virtual ~AbsoluteFrameDifference() {}
Bool create( std::vector<PlaYUVerFrame*> apcFrameList );
+2 -2
View File
@@ -36,7 +36,7 @@ class DisparityStereoBM : public PlaYUVerModuleIf
{
REGISTER_CLASS_FACTORY( DisparityStereoBM )
private:
private:
PlaYUVerFrame* m_pcDisparityFrame;
Int m_uiNumberOfDisparities;
UInt m_uiBlockSize;
@@ -46,7 +46,7 @@ class DisparityStereoBM : public PlaYUVerModuleIf
cv::Ptr<cv::StereoBM> m_cStereoBM;
#endif
public:
public:
DisparityStereoBM();
virtual ~DisparityStereoBM() {}
Bool create( std::vector<PlaYUVerFrame*> apcFrameList );
+2 -2
View File
@@ -55,7 +55,7 @@ class DisparityStereoSGBM : public PlaYUVerModuleIf
{
REGISTER_CLASS_FACTORY( DisparityStereoSGBM )
private:
private:
PlaYUVerFrame* m_pcDisparityFrame;
Bool m_bUseHH;
Int m_uiNumberOfDisparities;
@@ -66,7 +66,7 @@ class DisparityStereoSGBM : public PlaYUVerModuleIf
cv::StereoSGBM m_cStereoMatch;
#endif
public:
public:
DisparityStereoSGBM();
virtual ~DisparityStereoSGBM() {}
Bool create( std::vector<PlaYUVerFrame*> apcFrameList );
+2 -2
View File
@@ -36,11 +36,11 @@ class DisparityStereoVar : public PlaYUVerModuleIf
{
REGISTER_CLASS_FACTORY( DisparityStereoVar )
private:
private:
PlaYUVerFrame* m_pcDisparityFrame;
cv::StereoVar m_cStereoVar;
public:
public:
DisparityStereoVar();
virtual ~DisparityStereoVar() {}
Bool create( std::vector<PlaYUVerFrame*> apcFrameList );
+2 -2
View File
@@ -32,10 +32,10 @@ class EightBitsSampling : public PlaYUVerModuleIf
{
REGISTER_CLASS_FACTORY( EightBitsSampling )
private:
private:
PlaYUVerFrame* m_pcSubSampledFrame;
public:
public:
EightBitsSampling();
virtual ~EightBitsSampling() {}
Bool create( std::vector<PlaYUVerFrame*> apcFrameList );
+5 -5
View File
@@ -30,10 +30,10 @@
class FilterComponentModule : public PlaYUVerModuleIf
{
private:
private:
PlaYUVerFrame* m_pcFilteredFrame;
public:
public:
FilterComponentModule();
virtual ~FilterComponentModule() {}
Bool create( std::vector<PlaYUVerFrame*> apcFrameList ) = 0;
@@ -47,7 +47,7 @@ class FilterComponentModule : public PlaYUVerModuleIf
class FilterComponentLuma : public FilterComponentModule
{
REGISTER_CLASS_FACTORY( FilterComponentLuma )
public:
public:
FilterComponentLuma();
virtual ~FilterComponentLuma() {}
Bool create( std::vector<PlaYUVerFrame*> apcFrameList );
@@ -57,7 +57,7 @@ class FilterComponentLuma : public FilterComponentModule
class FilterComponentChromaU : public FilterComponentModule
{
REGISTER_CLASS_FACTORY( FilterComponentChromaU )
public:
public:
FilterComponentChromaU();
virtual ~FilterComponentChromaU() {}
Bool create( std::vector<PlaYUVerFrame*> apcFrameList );
@@ -67,7 +67,7 @@ class FilterComponentChromaU : public FilterComponentModule
class FilterComponentChromaV : public FilterComponentModule
{
REGISTER_CLASS_FACTORY( FilterComponentChromaV )
public:
public:
FilterComponentChromaV();
virtual ~FilterComponentChromaV() {}
Bool create( std::vector<PlaYUVerFrame*> apcFrameList );
+2 -2
View File
@@ -32,11 +32,11 @@ class FrameBinarization : public PlaYUVerModuleIf
{
REGISTER_CLASS_FACTORY( FrameBinarization )
private:
private:
PlaYUVerFrame* m_pcBinFrame;
UInt m_uiThreshold;
public:
public:
FrameBinarization();
virtual ~FrameBinarization() {}
Void create( PlaYUVerFrame* );
+2 -2
View File
@@ -32,14 +32,14 @@ class FrameCrop : public PlaYUVerModuleIf
{
REGISTER_CLASS_FACTORY( FrameCrop )
private:
private:
PlaYUVerFrame* m_pcCropedFrame;
UInt m_uiXPosition;
UInt m_uiYPosition;
Int m_iXSize;
Int m_iYSize;
public:
public:
FrameCrop();
virtual ~FrameCrop() {}
Void create( PlaYUVerFrame* );
+2 -2
View File
@@ -32,13 +32,13 @@ class FrameDifference : public PlaYUVerModuleIf
{
REGISTER_CLASS_FACTORY( FrameDifference )
private:
private:
UInt m_uiBitsPixel;
Int m_iDiffBitShift;
Int m_iMaxDiffValue;
PlaYUVerFrame* m_pcFrameDifference;
public:
public:
FrameDifference();
virtual ~FrameDifference() {}
Bool create( std::vector<PlaYUVerFrame*> apcFrameList );
+9 -9
View File
@@ -68,15 +68,15 @@ Bool FrameMask::create( std::vector<PlaYUVerFrame*> apcFrameList )
}
switch( iColorSpace )
{
case PlaYUVerPixel::COLOR_GRAY:
iPelFmt = PlaYUVerFrame::GRAY;
break;
case PlaYUVerPixel::COLOR_YUV:
iPelFmt = PlaYUVerFrame::YUV444p;
break;
case PlaYUVerPixel::COLOR_RGB:
iPelFmt = PlaYUVerFrame::RGB24;
break;
case PlaYUVerPixel::COLOR_GRAY:
iPelFmt = PlaYUVerFrame::GRAY;
break;
case PlaYUVerPixel::COLOR_YUV:
iPelFmt = PlaYUVerFrame::YUV444p;
break;
case PlaYUVerPixel::COLOR_RGB:
iPelFmt = PlaYUVerFrame::RGB24;
break;
}
m_pcFrameProcessed = new PlaYUVerFrame( apcFrameList[0]->getWidth(), apcFrameList[0]->getHeight(),
+2 -2
View File
@@ -32,11 +32,11 @@ class FrameMask : public PlaYUVerModuleIf
{
REGISTER_CLASS_FACTORY( FrameMask )
private:
private:
Int m_iWeight;
PlaYUVerFrame* m_pcFrameProcessed;
public:
public:
FrameMask();
virtual ~FrameMask() {}
Bool create( std::vector<PlaYUVerFrame*> apcFrameList );
+2 -2
View File
@@ -32,12 +32,12 @@ class FrameShift : public PlaYUVerModuleIf
{
REGISTER_CLASS_FACTORY( FrameShift )
private:
private:
PlaYUVerFrame* m_pcProcessedFrame;
Int m_iShiftHor;
Int m_iShiftVer;
public:
public:
FrameShift();
virtual ~FrameShift() {}
Bool create( std::vector<PlaYUVerFrame*> apcFrameList );
+2 -2
View File
@@ -32,11 +32,11 @@ class InterFrameVariance : public PlaYUVerModuleIf
{
REGISTER_CLASS_FACTORY( InterFrameVariance )
private:
private:
PlaYUVerFrame* m_pcFrameVariance;
Double** m_pVariance;
public:
public:
InterFrameVariance();
virtual ~InterFrameVariance() {}
Bool create( std::vector<PlaYUVerFrame*> apcFrameList );
+2 -6
View File
@@ -42,9 +42,7 @@ LumaAverage::LumaAverage()
// Several requirements should be "or" between each others.
}
Void LumaAverage::create( PlaYUVerFrame* frame )
{
}
Void LumaAverage::create( PlaYUVerFrame* frame ) {}
Double LumaAverage::measure( PlaYUVerFrame* frame )
{
@@ -59,6 +57,4 @@ Double LumaAverage::measure( PlaYUVerFrame* frame )
return average / Double( frame->getHeight() * frame->getWidth() );
}
Void LumaAverage::destroy()
{
}
Void LumaAverage::destroy() {}
+2 -2
View File
@@ -32,8 +32,8 @@ class LumaAverage : public PlaYUVerModuleIf
{
REGISTER_CLASS_FACTORY( LumaAverage )
private:
public:
private:
public:
LumaAverage();
virtual ~LumaAverage() {}
Void create( PlaYUVerFrame* );
+2 -2
View File
@@ -24,12 +24,12 @@
#include "MeasureOpticalFlowDualTVL1.h"
using cv::Scalar;
using cv::Mat;
using cv::Mat_;
using cv::Ptr;
using cv::Point;
using cv::Point2f;
using cv::Ptr;
using cv::Scalar;
MeasureOpticalFlowDualTVL1::MeasureOpticalFlowDualTVL1()
{
+2 -2
View File
@@ -35,7 +35,7 @@ class MeasureOpticalFlowDualTVL1 : public PlaYUVerModuleIf
{
REGISTER_CLASS_FACTORY( MeasureOpticalFlowDualTVL1 )
private:
private:
Bool m_bShowReconstruction;
Int m_iStep;
cv::Ptr<cv::DenseOpticalFlow> m_cTvl1;
@@ -47,7 +47,7 @@ class MeasureOpticalFlowDualTVL1 : public PlaYUVerModuleIf
Void drawFlow();
Void compensateFlow();
public:
public:
MeasureOpticalFlowDualTVL1();
virtual ~MeasureOpticalFlowDualTVL1() {}
Bool create( std::vector<PlaYUVerFrame*> apcFrameList );
+2 -2
View File
@@ -31,12 +31,12 @@
// Opencv
#include <opencv2/optflow.hpp>
using cv::Scalar;
using cv::Mat;
using cv::Mat_;
using cv::Ptr;
using cv::Point;
using cv::Point2f;
using cv::Ptr;
using cv::Scalar;
OpticalFlowModule::OpticalFlowModule()
{
+6 -6
View File
@@ -34,7 +34,7 @@
class OpticalFlowModule : public PlaYUVerModuleIf
{
protected:
protected:
Bool m_bShowReconstruction;
Int m_iStep;
cv::Ptr<cv::DenseOpticalFlow> m_cOpticalFlow;
@@ -46,7 +46,7 @@ class OpticalFlowModule : public PlaYUVerModuleIf
Void compensateFlow();
Bool commonCreate( std::vector<PlaYUVerFrame*> apcFrameList );
public:
public:
OpticalFlowModule();
virtual ~OpticalFlowModule() {}
PlaYUVerFrame* process( std::vector<PlaYUVerFrame*> apcFrameList );
@@ -56,7 +56,7 @@ class OpticalFlowModule : public PlaYUVerModuleIf
class OpticalFlowDualTVL1 : public OpticalFlowModule
{
REGISTER_CLASS_FACTORY( OpticalFlowDualTVL1 )
public:
public:
OpticalFlowDualTVL1();
virtual ~OpticalFlowDualTVL1() {}
Bool create( std::vector<PlaYUVerFrame*> apcFrameList );
@@ -65,7 +65,7 @@ class OpticalFlowDualTVL1 : public OpticalFlowModule
class OpticalFlowSparseToDense : public OpticalFlowModule
{
REGISTER_CLASS_FACTORY( OpticalFlowSparseToDense )
public:
public:
OpticalFlowSparseToDense();
virtual ~OpticalFlowSparseToDense() {}
Bool create( std::vector<PlaYUVerFrame*> apcFrameList );
@@ -74,7 +74,7 @@ class OpticalFlowSparseToDense : public OpticalFlowModule
class OpticalFlowFarneback : public OpticalFlowModule
{
REGISTER_CLASS_FACTORY( OpticalFlowFarneback )
public:
public:
OpticalFlowFarneback();
virtual ~OpticalFlowFarneback() {}
Bool create( std::vector<PlaYUVerFrame*> apcFrameList );
@@ -83,7 +83,7 @@ class OpticalFlowFarneback : public OpticalFlowModule
class OpticalDeepFlow : public OpticalFlowModule
{
REGISTER_CLASS_FACTORY( OpticalDeepFlow )
public:
public:
OpticalDeepFlow();
virtual ~OpticalDeepFlow() {}
Bool create( std::vector<PlaYUVerFrame*> apcFrameList );
+1 -4
View File
@@ -34,10 +34,7 @@
// Generated by cmake
#include "ModulesListHeader.h"
PlaYUVerModuleFactory::PlaYUVerModuleFactory()
{
REGISTER_ALL_MODULES
}
PlaYUVerModuleFactory::PlaYUVerModuleFactory(){REGISTER_ALL_MODULES}
PlaYUVerModuleFactory::~PlaYUVerModuleFactory()
{
+2 -2
View File
@@ -38,12 +38,12 @@ typedef std::map<const char*, CreateModuleFn> PlaYUVerModuleFactoryMap;
// Factory for creating instances of PlaYUVerModuleIf
class PlaYUVerModuleFactory
{
private:
private:
PlaYUVerModuleFactory();
PlaYUVerModuleFactory& operator=( const PlaYUVerModuleFactory& ) { return *this; }
PlaYUVerModuleFactoryMap m_FactoryMap;
public:
public:
~PlaYUVerModuleFactory();
static PlaYUVerModuleFactory* Get()
+2 -2
View File
@@ -32,10 +32,10 @@ class SetChromaHalfScale : public PlaYUVerModuleIf
{
REGISTER_CLASS_FACTORY( SetChromaHalfScale )
private:
private:
PlaYUVerFrame* m_pcProcessedFrame;
public:
public:
SetChromaHalfScale();
virtual ~SetChromaHalfScale() {}
Void create( PlaYUVerFrame* );
+1 -3
View File
@@ -111,6 +111,4 @@ Double WeightedPSNR::measure( std::vector<PlaYUVerFrame*> apcFrameList )
return dPSNR;
}
Void WeightedPSNR::destroy()
{
}
Void WeightedPSNR::destroy() {}
+2 -2
View File
@@ -32,10 +32,10 @@ class WeightedPSNR : public PlaYUVerModuleIf
{
REGISTER_CLASS_FACTORY( WeightedPSNR )
private:
private:
UInt m_uiComponent;
public:
public:
WeightedPSNR();
virtual ~WeightedPSNR() {}
Bool create( std::vector<PlaYUVerFrame*> apcFrameList );