From 2a5a0bde0fa45f86b1fcfbfd50bb779f25337573 Mon Sep 17 00:00:00 2001 From: Justin Berger Date: Sun, 1 Apr 2018 07:28:22 -0600 Subject: Fixed warnings about inline static functions being exported --- redist/minimal_opencv.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'redist') diff --git a/redist/minimal_opencv.c b/redist/minimal_opencv.c index 371d6f8..988dd0f 100644 --- a/redist/minimal_opencv.c +++ b/redist/minimal_opencv.c @@ -10,11 +10,10 @@ #include #include - #ifdef _WIN32 #define SURVIVE_LOCAL_ONLY #else -#define SURVIVE_LOCAL_ONLY __attribute__ ((visibility ("hidden"))) +#define SURVIVE_LOCAL_ONLY __attribute__((visibility("hidden"))) #endif SURVIVE_LOCAL_ONLY int cvRound(float f) { return roundf(f); } @@ -29,10 +28,11 @@ SURVIVE_LOCAL_ONLY void cvCopyTo(const CvMat *srcarr, CvMat *dstarr) { memcpy(dstarr->data.db, srcarr->data.db, sizeof(double) * dstarr->rows * dstarr->cols); } -SURVIVE_LOCAL_ONLY void cvGEMM(const CvMat *src1, const CvMat *src2, double alpha, const CvMat *src3, double beta, CvMat *dst, int tABC) { +SURVIVE_LOCAL_ONLY void cvGEMM(const CvMat *src1, const CvMat *src2, double alpha, const CvMat *src3, double beta, + CvMat *dst, int tABC) { lapack_int rows1 = src1->rows; lapack_int cols1 = src1->cols; - + lapack_int rows2 = src2->rows; lapack_int cols2 = src2->cols; @@ -74,7 +74,7 @@ SURVIVE_LOCAL_ONLY void cvMulTransposed(const CvMat *src, CvMat *dst, int order, SURVIVE_LOCAL_ONLY void *cvAlloc(size_t size) { return malloc(size); } -SURVIVE_LOCAL_ONLY static void icvCheckHuge(CvMat *arr) { +static void icvCheckHuge(CvMat *arr) { if ((int64_t)arr->step * arr->rows > INT_MAX) arr->type &= ~CV_MAT_CONT_FLAG; } @@ -111,12 +111,12 @@ SURVIVE_LOCAL_ONLY CvMat *cvCreateMatHeader(int rows, int cols, int type) { #define CV_DbgAssert assert -SURVIVE_LOCAL_ONLY static inline void *cvAlignPtr(const void *ptr, int align) { +static inline void *cvAlignPtr(const void *ptr, int align) { CV_DbgAssert((align & (align - 1)) == 0); return (void *)(((size_t)ptr + align - 1) & ~(size_t)(align - 1)); } -SURVIVE_LOCAL_ONLY static inline int cvAlign(int size, int align) { +static inline int cvAlign(int size, int align) { CV_DbgAssert((align & (align - 1)) == 0 && size < INT_MAX); return (size + align - 1) & -align; } -- cgit v1.2.3