summaryrefslogtreecommitdiff
path: root/2.3-1/src/c/statisticsFunctions/includes
diff options
context:
space:
mode:
authorsiddhu89902017-04-24 14:08:37 +0530
committersiddhu89902017-04-24 14:08:37 +0530
commit472b2e7ebbd2d8b3ecd00b228128aa8a0bd3f920 (patch)
tree506e85e6c959148c052747d61ffd29d98fa058bf /2.3-1/src/c/statisticsFunctions/includes
parentb9cfdca438347fe4d28f7caff3cb7b382e455d3a (diff)
downloadScilab2C-472b2e7ebbd2d8b3ecd00b228128aa8a0bd3f920.tar.gz
Scilab2C-472b2e7ebbd2d8b3ecd00b228128aa8a0bd3f920.tar.bz2
Scilab2C-472b2e7ebbd2d8b3ecd00b228128aa8a0bd3f920.zip
Fixed float.h issue. OpenCV with built libraries working for linux x64
Diffstat (limited to '2.3-1/src/c/statisticsFunctions/includes')
-rw-r--r--2.3-1/src/c/statisticsFunctions/includes/statMax.h2
-rw-r--r--2.3-1/src/c/statisticsFunctions/includes/statMin.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/2.3-1/src/c/statisticsFunctions/includes/statMax.h b/2.3-1/src/c/statisticsFunctions/includes/statMax.h
index c3f19099..8e5d12b9 100644
--- a/2.3-1/src/c/statisticsFunctions/includes/statMax.h
+++ b/2.3-1/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/2.3-1/src/c/statisticsFunctions/includes/statMin.h b/2.3-1/src/c/statisticsFunctions/includes/statMin.h
index ac732852..f3b8268a 100644
--- a/2.3-1/src/c/statisticsFunctions/includes/statMin.h
+++ b/2.3-1/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]);\