Clean includes in lib and modules

This commit is contained in:
jfmcarreira committed 2016-05-17 21:23:16 +01:00
1 parent 2f38234102
commit ca92a35bf2
44 files changed
+76 -67

No files matched your search

+1 -1
View File
@@ -23,7 +23,7 @@
*/
#include "AbsoluteFrameDifference.h"
#include <cstdlib>
AbsoluteFrameDifference::AbsoluteFrameDifference()
{
+1 -1
View File
@@ -25,9 +25,9 @@
#ifndef __ABSOLUTEFRAMEDIFFERENCE_H__
#define __ABSOLUTEFRAMEDIFFERENCE_H__
// PlaYUVerLib
#include "lib/PlaYUVerModuleIf.h"
#include <cassert>
class AbsoluteFrameDifference: public PlaYUVerModuleIf
{
-2
View File
@@ -22,8 +22,6 @@
* \brief Measure the disparity between two images using the Stereo Var method (OpenCV)
*/
#include <cstdio>
#include "DisparityStereoBM.h"
DisparityStereoBM::DisparityStereoBM()
+4 -3
View File
@@ -25,11 +25,12 @@
#ifndef __DISPARITYSTEREOBM_H__
#define __DISPARITYSTEREOBM_H__
#include <iostream>
#include "lib/PlaYUVerModuleIf.h"
// OpenCV
#include <opencv2/opencv.hpp>
#include <cassert>
// PlaYUVerLib
#include "lib/PlaYUVerModuleIf.h"
class DisparityStereoBM: public PlaYUVerModuleIf
{
-2
View File
@@ -22,8 +22,6 @@
* \brief Measure the disparity between two images using the SGBM method (OpenCV)
*/
#include <cstdio>
#include "DisparityStereoSGBM.h"
DisparityStereoSGBM::DisparityStereoSGBM()
+4 -3
View File
@@ -37,11 +37,12 @@
#ifndef __DISPARITYSTEREOSGBM_H__
#define __DISPARITYSTEREOSGBM_H__
#include <iostream>
#include "lib/PlaYUVerModuleIf.h"
// OpenCV
#include <opencv2/opencv.hpp>
#include <cassert>
// PlaYUVerLib
#include "lib/PlaYUVerModuleIf.h"
class DisparityStereoSGBM: public PlaYUVerModuleIf
{
-2
View File
@@ -22,8 +22,6 @@
* \brief Measure the disparity between two images using the Stereo Var method (OpenCV)
*/
#include <cstdio>
#include "DisparityStereoVar.h"
DisparityStereoVar::DisparityStereoVar()
+4 -3
View File
@@ -25,11 +25,12 @@
#ifndef __DISPARITYSTEREOVAR_H__
#define __DISPARITYSTEREOVAR_H__
#include <iostream>
#include "PlaYUVerModuleIf.h"
// OpenCV
#include <opencv2/opencv.hpp>
#include <cassert>
// PlaYUVerLib
#include "PlaYUVerModuleIf.h"
class DisparityStereoVar: public PlaYUVerModuleIf
{
+1
View File
@@ -24,6 +24,7 @@
#include "EightBitsSampling.h"
EightBitsSampling::EightBitsSampling()
{
/* Module Definition */
+2
View File
@@ -25,8 +25,10 @@
#ifndef __EIGHTBITSSAMPLING_H__
#define __EIGHTBITSSAMPLING_H__
// PlaYUVerLib
#include "lib/PlaYUVerModuleIf.h"
class EightBitsSampling: public PlaYUVerModuleIf
{
REGISTER_CLASS_FACTORY( EightBitsSampling )
+2 -2
View File
@@ -22,10 +22,10 @@
* \brief Filter component frame module
*/
#include <cstdio>
#include <cstring>
#include "FilterComponent.h"
#include <cstring>
FilterComponentModule::FilterComponentModule()
{
m_pcFilteredFrame = NULL;
+2
View File
@@ -25,8 +25,10 @@
#ifndef __FILTERCOMPONENT_H__
#define __FILTERCOMPONENT_H__
// PlaYUVerLib
#include "lib/PlaYUVerModuleIf.h"
class FilterComponentModule: public PlaYUVerModuleIf
{
private:
+1
View File
@@ -24,6 +24,7 @@
#include "FrameBinarization.h"
FrameBinarization::FrameBinarization()
{
/* Module Definition */
+2
View File
@@ -25,8 +25,10 @@
#ifndef __FRAMEBINARIZATION_H__
#define __FRAMEBINARIZATION_H__
// PlaYUVerLib
#include "lib/PlaYUVerModuleIf.h"
class FrameBinarization: public PlaYUVerModuleIf
{
REGISTER_CLASS_FACTORY( FrameBinarization )
+1
View File
@@ -24,6 +24,7 @@
#include "FrameCrop.h"
FrameCrop::FrameCrop()
{
/* Module Definition */
+2
View File
@@ -25,8 +25,10 @@
#ifndef __FRAMECROP_H__
#define __FRAMECROP_H__
// PlaYUVerLib
#include "lib/PlaYUVerModuleIf.h"
class FrameCrop: public PlaYUVerModuleIf
{
REGISTER_CLASS_FACTORY( FrameCrop )
+1 -1
View File
@@ -23,7 +23,7 @@
*/
#include "FrameDifference.h"
#include <algorithm>
FrameDifference::FrameDifference()
{
+1 -1
View File
@@ -25,9 +25,9 @@
#ifndef __FRAMEDIFFERENCE_H__
#define __FRAMEDIFFERENCE_H__
// PlaYUVerLib
#include "lib/PlaYUVerModuleIf.h"
#include <cassert>
class FrameDifference: public PlaYUVerModuleIf
{
+1 -2
View File
@@ -23,8 +23,7 @@
*/
#include "FrameMask.h"
#include <algorithm>
class be;
FrameMask::FrameMask()
{
+1 -1
View File
@@ -25,9 +25,9 @@
#ifndef __FRAMEMASK_H__
#define __FRAMEMASK_H__
// PlaYUVerLib
#include "lib/PlaYUVerModuleIf.h"
#include <cassert>
class FrameMask: public PlaYUVerModuleIf
{
+1
View File
@@ -24,6 +24,7 @@
#include "FrameShift.h"
FrameShift::FrameShift()
{
/* Module Definition */
+2
View File
@@ -25,8 +25,10 @@
#ifndef __FRAMESHIFT_H__
#define __FRAMESHIFT_H__
// PlaYUVerLib
#include "lib/PlaYUVerModuleIf.h"
class FrameShift: public PlaYUVerModuleIf
{
REGISTER_CLASS_FACTORY( FrameShift )
+1
View File
@@ -24,6 +24,7 @@
#include "LumaAverage.h"
LumaAverage::LumaAverage()
{
/* Module Definition */
+2
View File
@@ -25,8 +25,10 @@
#ifndef __LUMAAVERAGE_H__
#define __LUMAAVERAGE_H__
// PlaYUVerLib
#include "lib/PlaYUVerModuleIf.h"
class LumaAverage: public PlaYUVerModuleIf
{
REGISTER_CLASS_FACTORY( LumaAverage )
-1
View File
@@ -23,7 +23,6 @@
*/
#include "MeasureOpticalFlowDualTVL1.h"
#include <cstdlib>
using cv::Scalar;
using cv::Mat;
+2
View File
@@ -28,8 +28,10 @@
#include <opencv2/core/core.hpp>
#include <opencv2/video/video.hpp>
// PlaYUVerLib
#include "lib/PlaYUVerModuleIf.h"
class MeasureOpticalFlowDualTVL1: public PlaYUVerModuleIf
{
REGISTER_CLASS_FACTORY( MeasureOpticalFlowDualTVL1 )
+2
View File
@@ -32,6 +32,7 @@
// PlaYUVerLib
#include "lib/PlaYUVerModuleIf.h"
class OpticalFlowModule: public PlaYUVerModuleIf
{
protected:
@@ -77,6 +78,7 @@ public:
Bool create( std::vector<PlaYUVerFrame*> apcFrameList );
};
class OpticalFlowFarneback: public OpticalFlowModule
{
REGISTER_CLASS_FACTORY( OpticalFlowFarneback )
+5 -1
View File
@@ -23,14 +23,18 @@
*/
#include "config.h"
#include "PlaYUVerModuleFactory.h"
#include <functional>
#include <cstring>
#ifdef USE_DYNLOAD
#include <dlfcn.h>
#endif
#include "PlaYUVerModuleFactory.h"
// Generated by cmake
#include "ModulesListHeader.h"
PlaYUVerModuleFactory::PlaYUVerModuleFactory()
{
REGISTER_ALL_MODULES
+2 -1
View File
@@ -25,8 +25,9 @@
#ifndef __PLAYUVERMODULESFACTORY_H__
#define __PLAYUVERMODULESFACTORY_H__
#include <functional>
#include <map>
// PlaYUVerLib
#include "lib/PlaYUVerModuleIf.h"
#define REGISTER_MODULE(X) Register( "X", &(X::Create) );
+1 -1
View File
@@ -19,7 +19,7 @@
/**
* \file SetChromaHalfScale.cpp
* \brief Binarize frame module
* \brief Set chrome value to half scale (gray)
*/
#include "SetChromaHalfScale.h"
+5 -4
View File
@@ -19,12 +19,13 @@
/**
* \file SetChromaHalfScale.h
* \brief Binarize frame module
* \brief Set chrome value to half scale (gray)
*/
#ifndef __CHROMA128_H__
#define __CHROMA128_H__
#ifndef _SETCHROMAHALFSCALE_H_
#define _SETCHROMAHALFSCALE_H_
// PlaYUVerLib
#include "lib/PlaYUVerModuleIf.h"
class SetChromaHalfScale: public PlaYUVerModuleIf
@@ -44,5 +45,5 @@ private:
};
#endif // __CHROMA128_H__
#endif // _SETCHROMAHALFSCALE_H_
-2
View File
@@ -23,8 +23,6 @@
*/
#include "WeightedPSNR.h"
#include <algorithm>
#include <cmath>
WeightedPSNR::WeightedPSNR()
{
+1 -2
View File
@@ -25,10 +25,9 @@
#ifndef __WEIGHTEDPSNR_H__
#define __WEIGHTEDPSNR_H__
// PlaYUVerLib
#include "lib/PlaYUVerModuleIf.h"
#include <cassert>
class WeightedPSNR: public PlaYUVerModuleIf
{
REGISTER_CLASS_FACTORY( WeightedPSNR )