Remove namespace

This commit is contained in:
jfmcarreira committed 2016-04-30 03:11:11 +01:00
1 parent bb071f2530
commit 42d18a3a09
113 files changed
+58 -420

No files matched your search

+1 -3
View File
@@ -30,8 +30,6 @@
#include <cstdlib>
#include <cstring>
namespace plaYUVer
{
typedef void Void;
typedef char Char;
@@ -233,6 +231,6 @@ Void freeMem3ImageComponents( T*** array3D )
}
}
} // NAMESPACE
#endif // __LIBMEMORY_H__
+1 -3
View File
@@ -30,8 +30,6 @@
#include "PlaYUVerCmdParser.h"
#include "PlaYUVerFrame.h"
namespace plaYUVer
{
PlaYUVerCmdParser::PlaYUVerCmdParser()
{
@@ -139,4 +137,4 @@ Bool PlaYUVerCmdParser::checkListingOpts()
return bRet;
}
} // NAMESPACE
+3 -3
View File
@@ -25,8 +25,8 @@
#include "PlaYUVerDefs.h"
#include "PlaYUVerProgramOptions.h"
namespace plaYUVer
{
#ifndef __PLAYUVERCMDPARSER_H__
#define __PLAYUVERCMDPARSER_H__
class PlaYUVerCmdParser
{
@@ -53,4 +53,4 @@ private:
Void listModules();
};
} // NAMESPACE
#endif // __PLAYUVERCMDPARSER_H__
+1 -3
View File
@@ -29,8 +29,6 @@
#include <string>
#include <algorithm>
namespace plaYUVer
{
// ====================================================================================================================
// Basic type redefinition
@@ -134,6 +132,6 @@ inline std::string uppercase( const std::string& in )
return out;
}
} // NAMESPACE
#endif // __PLAYUVERDEFS_H__
+1 -3
View File
@@ -36,8 +36,6 @@
#include "StreamHandlerOpenCV.h"
#endif
namespace plaYUVer
{
std::vector<std::string> PlaYUVerFrame::supportedColorSpacesListNames()
{
@@ -1172,5 +1170,5 @@ Double PlaYUVerFrame::getSSIM( PlaYUVerFrame* Org, Int component )
return dSSIM;
}
} // NAMESPACE
-4
View File
@@ -39,8 +39,6 @@ namespace cv
class Mat;
}
namespace plaYUVer
{
struct PlaYUVerPixFmtDescriptor;
@@ -339,6 +337,4 @@ private:
Void FrametoRGB8Pixfc();
};
} // NAMESPACE
#endif // __PLAYUVERFRAME_H__
+1 -3
View File
@@ -36,8 +36,6 @@
#endif
#include "PlaYUVerFramePixelFormats.h"
namespace plaYUVer
{
/*
**************************************************************
@@ -319,4 +317,4 @@ PlaYUVerPixFmtDescriptor g_PlaYUVerPixFmtDescriptorsList[PLAYUVER_NUMBER_FORMATS
RGB24,
BGR24,
};
} // NAMESPACE
+1 -3
View File
@@ -30,8 +30,6 @@
#include "PlaYUVerFrame.h"
#include "PlaYUVerPixel.h"
namespace plaYUVer
{
#define CHROMA_RESAMPLING( X ) ( ( ( X + 1 ) >> 1 ) << 1 )
@@ -147,6 +145,6 @@ typedef struct PlaYUVerPixFmtDescriptor
#define PLAYUVER_NUMBER_FORMATS 7
extern PlaYUVerPixFmtDescriptor g_PlaYUVerPixFmtDescriptorsList[PLAYUVER_NUMBER_FORMATS];
} // NAMESPACE
#endif // __PLAYUVERFRAMEPIXELFORMATS_H__
-4
View File
@@ -31,8 +31,6 @@
#include "PlaYUVerProgramOptions.h"
#include <vector>
namespace plaYUVer
{
#define REGISTER_CLASS_MAKER(X) \
extern "C" PlaYUVerModuleIf* Maker() { return new X; }
@@ -156,7 +154,5 @@ public:
};
} // NAMESPACE
#endif // __PLAYUVERMODULESIF_H__
+1 -3
View File
@@ -28,8 +28,6 @@
#include "PlaYUVerFrame.h"
#include "PlaYUVerPixel.h"
namespace plaYUVer
{
PlaYUVerPixel::PlaYUVerPixel()
{
@@ -101,4 +99,4 @@ PlaYUVerPixel PlaYUVerPixel::ConvertPixel( ColorSpace eOutputSpace )
return outPixel;
}
} // NAMESPACE
-4
View File
@@ -32,8 +32,6 @@
#include <vector>
#include "PlaYUVerDefs.h"
namespace plaYUVer
{
#define CLAMP_YUV2RGB(X) X = X < 0 ? 0 : X > 255 ? 255 : X;
#define YUV2RGB( iY, iU, iV, iR, iG, iB ) \
@@ -143,6 +141,4 @@ private:
};
} // NAMESPACE
#endif // __PLAYUVERPIXEL_H__
+1 -3
View File
@@ -48,8 +48,6 @@
using namespace std;
namespace plaYUVer
{
Options::Options( const std::string& name )
{
@@ -491,5 +489,5 @@ Void Options::doHelp( ostream& out, unsigned columns )
}
}
} // NAMESPACE
-4
View File
@@ -47,8 +47,6 @@
#include <vector>
#include "PlaYUVerDefs.h"
namespace plaYUVer
{
struct Options;
@@ -381,6 +379,4 @@ private:
Options& parent;
};
} // NAMESPACE
#endif // __PROGRAMOPTIONS_H__
+1 -3
View File
@@ -39,8 +39,6 @@
#include "StreamHandlerOpenCV.h"
#endif
namespace plaYUVer
{
std::vector<PlaYUVerSupportedFormat> PlaYUVerStream::supportedReadFormats()
{
@@ -605,4 +603,4 @@ Bool PlaYUVerStream::seekInput( UInt64 new_frame_num )
return true;
}
} // NAMESPACE
-4
View File
@@ -32,8 +32,6 @@
#include <cstdio>
#include "PlaYUVerFrame.h"
namespace plaYUVer
{
class LibOpenCVHandler;
class PlaYUVerStreamHandlerIf;
@@ -166,6 +164,4 @@ private:
};
} // NAMESPACE
#endif // __PLAYUVERSTREAM_H__
-5
View File
@@ -29,8 +29,6 @@
#include "PlaYUVerStream.h"
#include "PlaYUVerFrame.h"
namespace plaYUVer
{
#define REGISTER_STREAM_HANDLER(X) \
public: \
@@ -97,8 +95,5 @@ protected:
std::string m_strCodecName;
};
} // NAMESPACE
#endif // __PLAYUVERSTREAMHANDLERIF_H__
+1 -3
View File
@@ -29,8 +29,6 @@
#include "PlaYUVerFramePixelFormats.h"
#include "LibMemory.h"
namespace plaYUVer
{
std::vector<PlaYUVerSupportedFormat> StreamHandlerLibav::supportedReadFormats()
{
@@ -381,4 +379,4 @@ Bool StreamHandlerLibav::seek( UInt64 iFrameNum )
return true;
}
} // NAMESPACE
-4
View File
@@ -51,8 +51,6 @@ extern "C"
#include "PlaYUVerStream.h"
#include "PlaYUVerStreamHandlerIf.h"
namespace plaYUVer
{
class StreamHandlerLibav: public PlaYUVerStreamHandlerIf
{
@@ -103,6 +101,4 @@ private:
Bool decodeVideoPkt();
};
} // NAMESPACE
#endif // __LIBAVCONTEXTHANDLE_H__
+1 -3
View File
@@ -31,8 +31,6 @@
using namespace cv;
namespace plaYUVer
{
std::vector<PlaYUVerSupportedFormat> StreamHandlerOpenCV::supportedReadFormats()
{
@@ -155,4 +153,4 @@ Bool StreamHandlerOpenCV::write( PlaYUVerFrame* pcFrame )
return bRet;
}
} // NAMESPACE
-4
View File
@@ -38,8 +38,6 @@ namespace cv
class VideoCapture;
}
namespace plaYUVer
{
class PlaYUVerFrame;
@@ -70,6 +68,4 @@ private:
cv::Mat* pcMat;
};
} // NAMESPACE
#endif // __STREAMHANDLEROPENCV_H__
+1 -3
View File
@@ -30,8 +30,6 @@
#include "PlaYUVerFramePixelFormats.h"
#include "LibMemory.h"
namespace plaYUVer
{
Bool StreamHandlerPortableMap::openHandler( std::string strFilename, Bool bInput )
{
@@ -141,4 +139,4 @@ Bool StreamHandlerPortableMap::write( PlaYUVerFrame* pcFrame )
return true;
}
} // NAMESPACE
-4
View File
@@ -33,8 +33,6 @@
#include "PlaYUVerStream.h"
#include "PlaYUVerStreamHandlerIf.h"
namespace plaYUVer
{
class PlaYUVerFrame;
@@ -60,6 +58,4 @@ private:
Int m_iMaxValue;
};
} // NAMESPACE
#endif // __STREAMHANDLERPORTABLEMAP_H__
+1 -3
View File
@@ -29,8 +29,6 @@
#include "PlaYUVerFramePixelFormats.h"
#include "LibMemory.h"
namespace plaYUVer
{
Bool PlaYUVerRawHandler::openHandler( std::string strFilename, Bool bInput )
{
@@ -96,4 +94,4 @@ Bool PlaYUVerRawHandler::write( PlaYUVerFrame* pcFrame )
return true;
}
} // NAMESPACE
-5
View File
@@ -28,8 +28,6 @@
#include "PlaYUVerDefs.h"
#include "PlaYUVerStreamHandlerIf.h"
namespace plaYUVer
{
/**
* \class PlaYUVerRawHandler
@@ -58,8 +56,5 @@ public:
};
} // NAMESPACE
#endif // __STREAMHANDLERRAW_H__