Deleted last remnants of restrict keyword.

modules/calib3d/src/rhorefc.cpp

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

modules/calib3d/src/rhorefc.h

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