diff options
| author | siddhu8990 | 2017-04-24 14:08:37 +0530 |
|---|---|---|
| committer | siddhu8990 | 2017-04-24 14:08:37 +0530 |
| commit | c7e9597db39140c1d982f796a8e1f03bb54e7905 (patch) | |
| tree | f5f44081aeba7a00bb69b1ec71f93c31eac12863 /src/c/statisticsFunctions/includes | |
| parent | 1fd0dce8d72c4d5869ce5ff4025ac09af603bc0f (diff) | |
| download | scilab2c-c7e9597db39140c1d982f796a8e1f03bb54e7905.tar.gz scilab2c-c7e9597db39140c1d982f796a8e1f03bb54e7905.tar.bz2 scilab2c-c7e9597db39140c1d982f796a8e1f03bb54e7905.zip | |
Fixed float.h issue. OpenCV with built libraries working for linux x64
Diffstat (limited to 'src/c/statisticsFunctions/includes')
| -rw-r--r-- | src/c/statisticsFunctions/includes/statMax.h | 2 | ||||
| -rw-r--r-- | src/c/statisticsFunctions/includes/statMin.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/c/statisticsFunctions/includes/statMax.h b/src/c/statisticsFunctions/includes/statMax.h index c3f19099..8e5d12b9 100644 --- a/src/c/statisticsFunctions/includes/statMax.h +++ b/src/c/statisticsFunctions/includes/statMax.h @@ -20,7 +20,7 @@ extern "C" { #endif -#define max(a,b) (a>=b?a:b) +//#define max(a,b) (a>=b?a:b) #define maxa(a,size1,b,size2,out) {int i;\ for (i=0;i<size1[0]*size2[1];i++) out[i]=max(a[i],b[i]);\ diff --git a/src/c/statisticsFunctions/includes/statMin.h b/src/c/statisticsFunctions/includes/statMin.h index ac732852..f3b8268a 100644 --- a/src/c/statisticsFunctions/includes/statMin.h +++ b/src/c/statisticsFunctions/includes/statMin.h @@ -20,7 +20,7 @@ extern "C" { #endif -#define min(a,b) (a<=b?a:b) +//#define min(a,b) (a<=b?a:b) #define mina(a,size1,b,size2,out) {int i;\ for (i=0;i<size1[0]*size2[1];i++) out[i]=min(a[i],b[i]);\ |