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

Android NDK r9 support. x64 NDK support fix for MacOS X.

Browse Source
This commit is contained in:
Alexander Smorkalov
2013-10-01 12:58:39 +04:00
parent 4ce0a8a822
commit ccb48ddee0
6 changed files with 42 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
modules/legacy/src/bgfg_gaussmix.cpp
View File

@@ -413,6 +413,11 @@ CV_INLINE int _icvRemoveShadowGMM(float* data, int nD,
//IEEE Trans. on Pattern Analysis and Machine Intelligence, vol.26, no.5, pages 651-656, 2004
//http://www.zoranz.net/Publications/zivkovic2004PAMI.pdf
#if (__GNUC__ == 4) && (__GNUC_MINOR__ == 8)
# pragma GCC diagnostic push
# pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
#endif
CV_INLINE int _icvUpdateGMM(float* data, int nD,
unsigned char* pModesUsed,
CvPBGMMGaussian* pGMM,
@@ -601,6 +606,10 @@ CV_INLINE int _icvUpdateGMM(float* data, int nD,
return bBackground;
}
#if (__GNUC__ == 4) && (__GNUC_MINOR__ == 8)
# pragma GCC diagnostic pop
#endif
// a bit more efficient implementation for common case of 3 channel (rgb) images
CV_INLINE int _icvUpdateGMM_C3(float r,float g, float b,
unsigned char* pModesUsed,

10
modules/legacy/src/lmeds.cpp
View File

@@ -162,6 +162,12 @@ icvLMedS( int *points1, int *points2, int numPoints, CvMatrix3 * fundamentalMatr
/*===========================================================================*/
/*===========================================================================*/
#if (__GNUC__ == 4) && (__GNUC_MINOR__ == 8)
# pragma GCC diagnostic push
# pragma GCC diagnostic ignored "-Warray-bounds"
#endif
void
icvChoose7( int *ml, int *mr, int num, int *ml7, int *mr7 )
{
@@ -322,6 +328,10 @@ icvCubic( double a2, double a1, double a0, double *squares )
return CV_NO_ERR;
} /* icvCubic */
#if (__GNUC__ == 4) && (__GNUC_MINOR__ == 8)
# pragma GCC diagnostic pop
#endif
/*======================================================================================*/
double
icvDet( double *M )