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

Deleted last remnants of restrict keyword.

Browse Source
This commit is contained in:
Olexa Bilaniuk 2015-03-03 11:40:44 -05:00
parent b229d6b7ac
commit a2affe70d9
2 changed files with 30 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
modules/calib3d/src/rhorefc.cpp
View File

@ -256,14 +256,14 @@ static inline unsigned sacCalcIterBound (double confidence,
unsigned sampleSize, unsigned sampleSize,
unsigned maxIterBound); unsigned maxIterBound);
static inline void hFuncRefC (float* packedPoints, float* H); static inline void hFuncRefC (float* packedPoints, float* H);
static inline void sacCalcJacobianErrors(const float* restrict H, static inline void sacCalcJacobianErrors(const float* H,
const float* restrict src, const float* src,
const float* restrict dst, const float* dst,
const char* restrict inl, const char* inl,
unsigned N, unsigned N,
float (* restrict JtJ)[8], float (* JtJ)[8],
float* restrict Jte, float* Jte,
float* restrict Sp); float* Sp);
static inline float sacLMGain (const float* dH, static inline float sacLMGain (const float* dH,
const float* Jte, const float* Jte,
const float S, const float S,
@ -1935,14 +1935,14 @@ inline void RHO_HEST_REFC::refine(void){
* nevertheless be vectorized if need be. * nevertheless be vectorized if need be.
*/ */
static inline void sacCalcJacobianErrors(const float* restrict H, static inline void sacCalcJacobianErrors(const float* H,
const float* restrict src, const float* src,
const float* restrict dst, const float* dst,
const char* restrict inl, const char* inl,
unsigned N, unsigned N,
float (* restrict JtJ)[8], float (* JtJ)[8],
float* restrict Jte, float* Jte,
float* restrict Sp){ float* Sp){
unsigned i; unsigned i;
float S; float S;

34
modules/calib3d/src/rhorefc.h
View File

@ -57,12 +57,6 @@
/* Defines */ /* Defines */
/* C++ does not have the restrict keyword. */
#ifdef restrict
#undef restrict
#endif
#define restrict
/* Flags */ /* Flags */
#ifndef RHO_FLAG_NONE #ifndef RHO_FLAG_NONE
@ -256,20 +250,20 @@ void rhoRefCFini(RHO_HEST_REFC* p);
* inliers for acceptance was reached; 0 otherwise. * inliers for acceptance was reached; 0 otherwise.
*/ */
unsigned rhoRefC(RHO_HEST_REFC* restrict p, /* Homography estimation context. */ unsigned rhoRefC(RHO_HEST_REFC* p, /* Homography estimation context. */
const float* restrict src, /* Source points */ const float* src, /* Source points */
const float* restrict dst, /* Destination points */ const float* dst, /* Destination points */
char* restrict inl, /* Inlier mask */ char* inl, /* Inlier mask */
unsigned N, /* = src.length = dst.length = inl.length */ unsigned N, /* = src.length = dst.length = inl.length */
float maxD, /* 3.0 */ float maxD, /* 3.0 */
unsigned maxI, /* 2000 */ unsigned maxI, /* 2000 */
unsigned rConvg, /* 2000 */ unsigned rConvg, /* 2000 */
double cfd, /* 0.995 */ double cfd, /* 0.995 */
unsigned minInl, /* 4 */ unsigned minInl, /* 4 */
double beta, /* 0.35 */ double beta, /* 0.35 */
unsigned flags, /* 0 */ unsigned flags, /* 0 */
const float* guessH, /* Extrinsic guess, NULL if none provided */ const float* guessH, /* Extrinsic guess, NULL if none provided */
float* finalH); /* Final result. */ float* finalH); /* Final result. */