generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Normalize line endings and whitespace

Browse Source
This commit is contained in:
OpenCV Buildbot
2012-10-17 11:12:04 +04:00
committed by Andrey Kamaev
parent 0442bca235
commit 81f826db2b
1511 changed files with 258678 additions and 258624 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
modules/legacy/include/opencv2/legacy/blobtrack.hpp
View File

@@ -294,7 +294,7 @@ protected:
class CV_EXPORTS CvBlobDetector: public CvVSModule
{
public:
CvBlobDetector(){SetTypeName("BlobDetector");};
CvBlobDetector(){SetTypeName("BlobDetector");};
/* Try to detect new blob entrance based on foreground mask. */
/* pFGMask - image of foreground mask */
/* pNewBlob - pointer to CvBlob structure which will be filled if new blob entrance detected */
@@ -410,7 +410,7 @@ protected:
class CV_EXPORTS CvBlobTrackGen: public CvVSModule
{
public:
CvBlobTrackGen(){SetTypeName("BlobTrackGen");};
CvBlobTrackGen(){SetTypeName("BlobTrackGen");};
virtual void SetFileName(char* pFileName) = 0;
virtual void AddBlob(CvBlob* pBlob) = 0;
virtual void Process(IplImage* pImg = NULL, IplImage* pFG = NULL) = 0;
@@ -597,7 +597,7 @@ CV_EXPORTS CvBlobTracker* cvCreateBlobTrackerMSPF();
class CV_EXPORTS CvBlobTrackPostProc: public CvVSModule
{
public:
CvBlobTrackPostProc(){SetTypeName("BlobTrackPostProc");};
CvBlobTrackPostProc(){SetTypeName("BlobTrackPostProc");};
virtual void AddBlob(CvBlob* pBlob) = 0;
virtual void Process() = 0;
virtual int GetBlobNum() = 0;
@@ -628,7 +628,7 @@ inline void cvReleaseBlobTrackPostProc(CvBlobTrackPostProc** pBTPP)
class CV_EXPORTS CvBlobTrackPostProcOne: public CvVSModule
{
public:
CvBlobTrackPostProcOne(){SetTypeName("BlobTrackPostOne");};
CvBlobTrackPostProcOne(){SetTypeName("BlobTrackPostOne");};
virtual CvBlob* Process(CvBlob* pBlob) = 0;
virtual void Release() = 0;
};
@@ -648,7 +648,7 @@ CV_EXPORTS CvBlobTrackPostProc* cvCreateModuleBlobTrackPostProcTimeAverExp();
class CvBlobTrackPredictor: public CvVSModule
{
public:
CvBlobTrackPredictor(){SetTypeName("BlobTrackPredictor");};
CvBlobTrackPredictor(){SetTypeName("BlobTrackPredictor");};
virtual CvBlob* Predict() = 0;
virtual void Update(CvBlob* pBlob) = 0;
virtual void Release() = 0;
@@ -661,7 +661,7 @@ CV_EXPORTS CvBlobTrackPredictor* cvCreateModuleBlobTrackPredictKalman();
class CV_EXPORTS CvBlobTrackAnalysis: public CvVSModule
{
public:
CvBlobTrackAnalysis(){SetTypeName("BlobTrackAnalysis");};
CvBlobTrackAnalysis(){SetTypeName("BlobTrackAnalysis");};
virtual void AddBlob(CvBlob* pBlob) = 0;
virtual void Process(IplImage* pImg, IplImage* pFG) = 0;
virtual float GetState(int BlobID) = 0;
@@ -684,7 +684,7 @@ inline void cvReleaseBlobTrackAnalysis(CvBlobTrackAnalysis** pBTPP)
class CV_EXPORTS CvBlobTrackFVGen : public CvVSModule
{
public:
CvBlobTrackFVGen(){SetTypeName("BlobTrackFVGen");};
CvBlobTrackFVGen(){SetTypeName("BlobTrackFVGen");};
virtual void AddBlob(CvBlob* pBlob) = 0;
virtual void Process(IplImage* pImg, IplImage* pFG) = 0;
virtual void Release() = 0;
@@ -762,7 +762,7 @@ public:
class CV_EXPORTS CvBlobTrackerAuto: public CvVSModule
{
public:
CvBlobTrackerAuto(){SetTypeName("BlobTrackerAuto");};
CvBlobTrackerAuto(){SetTypeName("BlobTrackerAuto");};
virtual void Process(IplImage* pImg, IplImage* pMask = NULL) = 0;
virtual CvBlob* GetBlob(int index) = 0;
virtual CvBlob* GetBlobByID(int ID) = 0;

22
modules/legacy/include/opencv2/legacy/compat.hpp
View File

@@ -525,7 +525,7 @@ CV_EXPORTS void cvUnDistortInit( const CvArr* src,
CV_EXPORTS void cvUnDistort( const CvArr* src, CvArr* dst,
const CvArr* undistortion_map,
int interpolate );
/* Find fundamental matrix */
CV_EXPORTS void cvFindFundamentalMatrix( int* points1, int* points2,
int numpoints, int method, float* matrix );
@@ -600,18 +600,18 @@ CV_EXPORTS void cvProjectPointsSimple( int point_count, CvPoint3D64f* _object_p
#define cvConvertPointsHomogenious cvConvertPointsHomogeneous
//////////////////////////////////// feature extractors: obsolete API //////////////////////////////////
typedef struct CvSURFPoint
{
CvPoint2D32f pt;
int laplacian;
int size;
float dir;
float hessian;
} CvSURFPoint;
CV_INLINE CvSURFPoint cvSURFPoint( CvPoint2D32f pt, int laplacian,
@@ -619,13 +619,13 @@ CV_INLINE CvSURFPoint cvSURFPoint( CvPoint2D32f pt, int laplacian,
float hessian CV_DEFAULT(0))
{
CvSURFPoint kp;
kp.pt = pt;
kp.laplacian = laplacian;
kp.size = size;
kp.dir = dir;
kp.hessian = hessian;
return kp;
}
@@ -634,10 +634,10 @@ typedef struct CvSURFParams
int extended;
int upright;
double hessianThreshold;
int nOctaves;
int nOctaveLayers;
} CvSURFParams;
CVAPI(CvSURFParams) cvSURFParams( double hessianThreshold, int extended CV_DEFAULT(0) );
@@ -664,9 +664,9 @@ typedef struct CvMSERParams
float maxVariation;
//! trace back to cut off mser with diversity < min_diversity
float minDiversity;
/////// the next few params for MSER of color image
//! for color image, the evolution steps
int maxEvolution;
//! the area threshold to cause re-initialize
@@ -726,7 +726,7 @@ CV_INLINE CvStarDetectorParams cvStarDetectorParams(
params.lineThresholdProjected = lineThresholdProjected;
params.lineThresholdBinarized = lineThresholdBinarized;
params.suppressNonmaxSize = suppressNonmaxSize;
return params;
}

4
modules/legacy/include/opencv2/legacy/streams.hpp
View File

@@ -63,7 +63,7 @@ and DirectX SDK (2006 April or later).
See <PlatformSDKInstallFolder>\samples\multimedia\directshow\readme.txt.
4. Copy the built libraries (called strmbase.lib and strmbasd.lib
in Release and Debug versions, respectively) to
in Release and Debug versions, respectively) to
<PlatformSDKInstallFolder>\lib.
5. In Developer Studio add the following paths:
@@ -81,7 +81,7 @@ and DirectX SDK (2006 April or later).
NOTE: PUT THE ADDED LINES ON THE VERY TOP OF THE LISTS, OTHERWISE YOU MAY STILL GET
COMPILER OR LINKER ERRORS. This is necessary, because Visual Studio
may include older versions of the same headers and libraries.
may include older versions of the same headers and libraries.
6. Now you can build OpenCV DirectShow filters.